From 7f54960449d920fee0bab41cc6febc0b8c883766 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Tue, 3 Sep 2024 10:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PHP=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Install.php       | 6 +++---
 application/admin/command/Install/zh-cn.php | 2 +-
 composer.json                               | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/admin/command/Install.php b/application/admin/command/Install.php
index 07d35593..83ff9d64 100644
--- a/application/admin/command/Install.php
+++ b/application/admin/command/Install.php
@@ -70,7 +70,7 @@ class Install extends Command
 
         $adminName = $this->installation($hostname, $hostport, $database, $username, $password, $prefix, $adminUsername, $adminPassword, $adminEmail, $siteName);
         if ($adminName) {
-            $output->highlight("Admin url:http://www.yoursite.com/{$adminName}");
+            $output->highlight("Admin url:http://www.example.com/{$adminName}");
         }
 
         $output->highlight("Admin username:{$adminUsername}");
@@ -309,8 +309,8 @@ class Install extends Command
         //数据库配置文件
         $dbConfigFile = APP_PATH . 'database.php';
 
-        if (version_compare(PHP_VERSION, '7.2.0', '<')) {
-            throw new Exception(__("The current version %s is too low, please use PHP 7.2 or higher", PHP_VERSION));
+        if (version_compare(PHP_VERSION, '7.4.0', '<')) {
+            throw new Exception(__("The current version %s is too low, please use PHP 7.4 or higher", PHP_VERSION));
         }
         if (!extension_loaded("PDO")) {
             throw new Exception(__("PDO is not currently installed and cannot be installed"));
diff --git a/application/admin/command/Install/zh-cn.php b/application/admin/command/Install/zh-cn.php
index 46326bbc..0e3658e2 100644
--- a/application/admin/command/Install/zh-cn.php
+++ b/application/admin/command/Install/zh-cn.php
@@ -27,7 +27,7 @@ return [
     'Password is too weak'                                                                                  => '密码太简单，请重新输入',
     'The two passwords you entered did not match'                                                           => '两次输入的密码不一致',
     'Please input correct website'                                                                          => '网站名称输入不正确',
-    'The current version %s is too low, please use PHP 7.1 or higher'                                       => '当前版本%s过低，请使用PHP7.1以上版本',
+    'The current version %s is too low, please use PHP 7.4 or higher'                                       => '当前版本%s过低，请使用PHP7.4及以上版本',
     'PDO is not currently installed and cannot be installed'                                                => '当前未开启PDO，无法进行安装',
     'The current permissions are insufficient to write the file %s'                                         => '当前权限不足，无法写入文件%s',
     'Please go to the official website to download the full package or resource package and try to install' => '当前代码仅包含核心代码，请前往官网下载完整包或资源包覆盖后再尝试安装',
diff --git a/composer.json b/composer.json
index fabc437d..f6e795d7 100755
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2.0",
+        "php": ">=7.4.0",
         "topthink/framework": "dev-master",
         "topthink/think-captcha": "^1.0.9",
         "topthink/think-installer": "^1.0.14",
@@ -38,6 +38,11 @@
             "easywechat-composer/easywechat-composer": true
         }
     },
+    "autoload": {
+        "psr-4": {
+            "addons\\": "addons/"
+        }
+    },
     "repositories": [
         {
             "type": "git",