From eda509d58ffac518c0ee211e02f0b0332faa9b92 Mon Sep 17 00:00:00 2001
From: CZG <2635435377@qq.com>
Date: Tue, 6 Feb 2024 01:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=8E=20ci:=20=E4=BC=98=E5=8C=96Github?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E5=88=A0=E9=99=A4=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/main.yml | 2 +-
 VerLog.md                  | 2 ++
 app/common/Config.php      | 2 +-
 config/master.php          | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ffa25fb..58d9d52 100644
--- 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
index 6a32dae..1d88d86 100644
--- 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
index a668d56..9cc530d 100644
--- 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
index 5297a8d..2356d9c 100644
--- 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),