Merge branch 'dev'

LoveCards · Feb 5, 2024 · 6cb971f · 6cb971f
2 parents 79b32ef + eda509d
commit 6cb971f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
 
             - name: ❌删除非必要文件
               run: |
-                  rm -rf .gitignore .github .git DOCKER_ENV docker_tag output.log composer.json composer.lock script lock.txt upload.md test.env think
+                  rm -rf .gitignore .github .dev ToDo.md .git DOCKER_ENV docker_tag output.log composer.json composer.lock script lock.txt upload.md test.env think
 
             - name: 📦压缩为zip
               run: zip -r LoveCards-v2.3.0.zip ./  # 记得修改

diff --git a/VerLog.md b/VerLog.md
@@ -35,7 +35,9 @@
 -   2024 年 2 月 6 日 (17)
     --修复. 后台邮箱配置端口无法设置问题
     --修复. 默认主题的Axios的CDN链接
+    --修复. 其他配置文件中的图片格式限制无法修改问题
     --优化. 配置文件更新无权限报错问题
+    --优化. Github自动化删除的文件
 
 -   2024 年 2 月 1 日
     --修复. 后台卡片管理taContact的遗漏

diff --git a/app/common/Config.php b/app/common/Config.php
@@ -104,7 +104,7 @@ public function mBoolCoverConfig($filename = '', $data = [], $free = false, $env
                 }
             } elseif ($free === 'auto') {
                 //自动构建正则匹配
-                if ($value['free'] === true) {
+                if ($value['free'] == true) {
                     if (preg_match($freePattern, $str_file)) {
                         $str_file = preg_replace($freePattern, "env('" . $env . "." . $key . "', " . $value['value'] . ")", $str_file);
                     }

diff --git a/config/master.php b/config/master.php
@@ -6,7 +6,7 @@
     'Upload' => [
         //最大上传图片大小 单位:M
         'UserImageSize' => env('master.UploadUserImageSize', 2),
-        'UserImageExt' => env('master.UploadUserImageSize', 'jpg,png,gif,webp'),
+        'UserImageExt' => env('master.UploadUserImageExt', 'jpg,png,gif,webp'),
     ],
     'UserAuth' => [
         'Captcha' => env('master.UserAuthCaptcha', false),