From 23c76669863b87417933c5d3a7e612bcd88bc913 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 13 Feb 2023 09:56:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9php=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/index.php | 7 ------- crmeb/public/install/index.php | 6 +++--- crmeb/vendor/composer/platform_check.php | 4 ++-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/crmeb/public/index.php b/crmeb/public/index.php index 89276711a..cc3331638 100755 --- a/crmeb/public/index.php +++ b/crmeb/public/index.php @@ -12,13 +12,6 @@ // [ 应用入口文件 ] namespace think; -if ('7.2.0' >= phpversion()) { - exit('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); -} -if (phpversion() > 8.0) { - exit('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); -} - define('DS', DIRECTORY_SEPARATOR); //检测是否已安装CRMEB系统 diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php index 02c3a6ed5..73941e2be 100755 --- a/crmeb/public/install/index.php +++ b/crmeb/public/install/index.php @@ -2,7 +2,7 @@ //文件签名 $fileValue = ''; //最低php版本要求 -define('PHP_EDITION', '7.2.0'); +define('PHP_EDITION', '7.1.0'); //服务环境检测 if (function_exists('saeAutoLoader') || isset($_SERVER['HTTP_BAE_ENV_APPID'])) { showHtml('对不起,当前环境不支持本系统,请使用独立服务或云主机!'); @@ -18,10 +18,10 @@ if (file_exists('../install.lock')) { @set_time_limit(1000); if (PHP_EDITION >= phpversion()) { - showHtml('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + showHtml('您的php版本过低,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } if (phpversion() > 8.0) { - showHtml('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + showHtml('您的php版本太高,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } date_default_timezone_set('PRC'); diff --git a/crmeb/vendor/composer/platform_check.php b/crmeb/vendor/composer/platform_check.php index 589e9e770..6d3407dbb 100644 --- a/crmeb/vendor/composer/platform_check.php +++ b/crmeb/vendor/composer/platform_check.php @@ -4,8 +4,8 @@ $issues = array(); -if (!(PHP_VERSION_ID >= 70200)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.'; +if (!(PHP_VERSION_ID >= 70100)) { + $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.'; } if ($issues) { From 6082e7dbe8251d08e5e4e24d61262f2e6ebc8ee5 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 13 Feb 2023 10:17:45 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/index.php | 7 +++++++ crmeb/public/install/index.php | 12 +++++------ crmeb/vendor/composer/autoload_real.php | 2 -- crmeb/vendor/composer/platform_check.php | 26 ------------------------ crmeb/vendor/services.php | 2 +- 5 files changed, 14 insertions(+), 35 deletions(-) delete mode 100644 crmeb/vendor/composer/platform_check.php diff --git a/crmeb/public/index.php b/crmeb/public/index.php index cc3331638..8ce6b2d20 100755 --- a/crmeb/public/index.php +++ b/crmeb/public/index.php @@ -12,6 +12,13 @@ // [ 应用入口文件 ] namespace think; +if ('7.1.0' > phpversion()) { + exit('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); +} +if (phpversion() >= '8.0.0') { + exit('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); +} + define('DS', DIRECTORY_SEPARATOR); //检测是否已安装CRMEB系统 diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php index 73941e2be..9bf341f7d 100755 --- a/crmeb/public/install/index.php +++ b/crmeb/public/install/index.php @@ -17,11 +17,11 @@ if (file_exists('../install.lock')) { @set_time_limit(1000); -if (PHP_EDITION >= phpversion()) { - showHtml('您的php版本过低,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); +if ('7.1.0' > phpversion()) { + exit('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); } -if (phpversion() > 8.0) { - showHtml('您的php版本太高,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); +if (phpversion() >= '8.0.0') { + exit('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); } date_default_timezone_set('PRC'); @@ -61,8 +61,8 @@ switch ($step) { exit(); case '2': - if (phpversion() <= PHP_EDITION || phpversion() > 8.0) { - die('本系统需要PHP为 7.2~7.4 版本,当前PHP版本为:' . phpversion()); + if (phpversion() < '7.1.0' || phpversion() >= '8.0.0') { + die('本系统需要PHP为 7.1~7.4 版本,当前PHP版本为:' . phpversion()); } $passOne = $passTwo = 'yes'; diff --git a/crmeb/vendor/composer/autoload_real.php b/crmeb/vendor/composer/autoload_real.php index 2127e4a45..917c85aa7 100644 --- a/crmeb/vendor/composer/autoload_real.php +++ b/crmeb/vendor/composer/autoload_real.php @@ -22,8 +22,6 @@ class ComposerAutoloaderInitf16474ac994ccc25392f403933800b79 return self::$loader; } - require __DIR__ . '/platform_check.php'; - spl_autoload_register(array('ComposerAutoloaderInitf16474ac994ccc25392f403933800b79', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); spl_autoload_unregister(array('ComposerAutoloaderInitf16474ac994ccc25392f403933800b79', 'loadClassLoader')); diff --git a/crmeb/vendor/composer/platform_check.php b/crmeb/vendor/composer/platform_check.php deleted file mode 100644 index 6d3407dbb..000000000 --- a/crmeb/vendor/composer/platform_check.php +++ /dev/null @@ -1,26 +0,0 @@ -= 70100)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.1.0". You are running ' . PHP_VERSION . '.'; -} - -if ($issues) { - if (!headers_sent()) { - header('HTTP/1.1 500 Internal Server Error'); - } - if (!ini_get('display_errors')) { - if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') { - fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL); - } elseif (!headers_sent()) { - echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL; - } - } - trigger_error( - 'Composer detected issues in your platform: ' . implode(' ', $issues), - E_USER_ERROR - ); -} diff --git a/crmeb/vendor/services.php b/crmeb/vendor/services.php index e787b6f0f..0b5996593 100644 --- a/crmeb/vendor/services.php +++ b/crmeb/vendor/services.php @@ -1,5 +1,5 @@ 'think\\captcha\\CaptchaService', From ca903161ecc98d820c99360b6f55c48c93400d90 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Mon, 13 Feb 2023 10:22:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E4=BF=AE=E6=94=B9=E5=AE=89=E8=A3=85=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E6=A3=80=E6=B5=8B=E6=95=B0=E6=8D=AE=E5=BA=93=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php index 73941e2be..d47c38812 100755 --- a/crmeb/public/install/index.php +++ b/crmeb/public/install/index.php @@ -254,8 +254,8 @@ switch ($step) { } mysqli_set_charset($conn, "utf8"); //,character_set_client=binary,sql_mode=''; $version = mysqli_get_server_info($conn); - if ($version < 5.7 || $version >= 5.8) { - $arr['msg'] = '数据库版本必须是5.7版本'; + if ($version < 5.1) { + $arr['msg'] = '数据库版本太低! 必须5.1以上'; exit(json_encode($arr)); } From e53e7d635ab2fdfc85eef22fdc7474382d6e3215 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 13 Feb 2023 10:34:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/index.php | 4 ++-- crmeb/public/install/index.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crmeb/public/index.php b/crmeb/public/index.php index 8ce6b2d20..7da91554c 100755 --- a/crmeb/public/index.php +++ b/crmeb/public/index.php @@ -13,10 +13,10 @@ namespace think; if ('7.1.0' > phpversion()) { - exit('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + exit('您的php版本过低,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } if (phpversion() >= '8.0.0') { - exit('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + exit('您的php版本太高,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } define('DS', DIRECTORY_SEPARATOR); diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php index 9bf341f7d..dc2ec3783 100755 --- a/crmeb/public/install/index.php +++ b/crmeb/public/install/index.php @@ -18,10 +18,10 @@ if (file_exists('../install.lock')) { @set_time_limit(1000); if ('7.1.0' > phpversion()) { - exit('您的php版本过低,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + exit('您的php版本过低,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } if (phpversion() >= '8.0.0') { - exit('您的php版本太高,不能安装本软件,兼容php版本7.2~7.4,谢谢!'); + exit('您的php版本太高,不能安装本软件,兼容php版本7.1~7.4,谢谢!'); } date_default_timezone_set('PRC'); From 32762cb12af014f766f8826417ba99de007bf952 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 14 Feb 2023 19:28:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85sql?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BF=BB=E8=AF=91key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/public/install/crmeb.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql index 3f30f4201..46eff0904 100644 --- a/crmeb/public/install/crmeb.sql +++ b/crmeb/public/install/crmeb.sql @@ -33201,8 +33201,8 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config (415, 'pay_weixin_key_v3', 'text', 'input', 4, '', 1, '', 100, 0, '\"\"', 'V3支付Key', 'V3支付秘钥', 0, 1), (416, 'reward_money', 'text', 'number', 105, '', 1, '', 0, 0, '\"0\"', '赠送余额(元)', '新用户奖励金额,必须大于等于0,0为不赠送', 0, 1), (417, 'reward_integral', 'text', 'number', 105, '', 1, '', 0, 0, '\"0\"', '赠送积分', '新用户奖励积分,必须大于等于0,0为不赠送', 0, 1), -(418, 'hs_accesskey', 'text', 'input', 106, '', 1, '', 0, 0, '\"\"', '火山翻译AccessKey', '机器翻译仅支持火山翻译', 1, 1), -(419, 'hs_secretkey', 'text', 'input', 106, '', 1, '', 0, 0, '\"\"', '火山翻译SecretKey', '机器翻译仅支持火山翻译', 0, 1), +(418, 'hs_accesskey', 'text', 'input', 106, '', 1, '', 0, 0, '\"AKLTMzkzZTEzNjg3OTg2NDViM2IwNmFlYzhmNzE4MmI4YmI\"', '火山翻译AccessKey', '机器翻译仅支持火山翻译', 1, 1), +(419, 'hs_secretkey', 'text', 'input', 106, '', 1, '', 0, 0, '\"TVRneU16STFOVFV4WVRkbE5ERTJaV0pqWm1aaU1UaGlNVFppWldZeE1HUQ==\"', '火山翻译SecretKey', '机器翻译仅支持火山翻译', 0, 1), (420, 'fey_user', 'text', 'input', 107, '', 1, '', 0, 0, '\"\"', '飞鹅云USER', '飞鹅云后台注册账号', 10, 1), (421, 'fey_ukey', 'text', 'input', 107, '', 1, '', 0, 0, '\"\"', '飞鹅云UYEK', '飞鹅云后台注册账号后生成的UKEY 【备注:这不是填打印机的KEY】', 7, 1), (422, 'fey_sn', 'text', 'input', 107, '', 1, '', 100, 0, '\"\"', '飞鹅云SN', '打印机标签上的编号,必须要在管理后台里添加打印机或调用API接口添加之后,才能调用API', 0, 1), From d08d74c52513b1aab7cdf80919b657211b9d73b6 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Wed, 15 Feb 2023 08:25:28 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E7=89=88=E6=9D=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/components/copyright/index.vue | 4 ++-- template/admin/src/pages/account/login/index.vue | 2 +- template/admin/src/pages/kefu/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/template/admin/src/components/copyright/index.vue b/template/admin/src/components/copyright/index.vue index fb1b3e5f4..3e61f9729 100644 --- a/template/admin/src/components/copyright/index.vue +++ b/template/admin/src/components/copyright/index.vue @@ -5,7 +5,7 @@ @@ -33,7 +33,7 @@ export default { href: 'http://doc.crmeb.com', }, ], - copyright: 'Copyright © 2014-2022', + copyright: 'Copyright © 2014-2023', version: '', }; }, diff --git a/template/admin/src/pages/account/login/index.vue b/template/admin/src/pages/account/login/index.vue index a747aa143..a3466c1ab 100644 --- a/template/admin/src/pages/account/login/index.vue +++ b/template/admin/src/pages/account/login/index.vue @@ -62,7 +62,7 @@ diff --git a/template/admin/src/pages/kefu/index.vue b/template/admin/src/pages/kefu/index.vue index 099ff1cdc..a074a1d6b 100644 --- a/template/admin/src/pages/kefu/index.vue +++ b/template/admin/src/pages/kefu/index.vue @@ -52,7 +52,7 @@
{{ copyright }}
- Copyright © 2014-2022 {{ version }} + Copyright © 2014-2023 {{ version }}
From 28d88f065810ccef1ea57dda2cf2b9074054aa21 Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Wed, 15 Feb 2023 08:25:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E6=A8=A1=E7=89=88=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E3=80=91=E6=9B=B4=E6=96=B0=E7=89=88=E6=9D=83=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/users/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/users/login/index.vue b/template/uni-app/pages/users/login/index.vue index 749e60ba1..b6ab79ab4 100644 --- a/template/uni-app/pages/users/login/index.vue +++ b/template/uni-app/pages/users/login/index.vue @@ -90,7 +90,7 @@ {{copyRight}} - © 2014-2022 + © 2014-2023 www.crmeb.com