From aa1aef8583c8e6bd088969201989702a5079e15d Mon Sep 17 00:00:00 2001
From: "WIN-VSNMD38DUOC\\Administrator" <admin@qq.com>
Date: Wed, 20 Mar 2024 15:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=94=9F=E6=88=90=E5=8F=8A=E8=AF=BB=E5=8F=96=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81js=E3=80=81css?=
 =?UTF-8?q?=E3=80=81html=E3=80=81vsdx=E3=80=81dmp=E3=80=817z=E3=80=81ppt?=
 =?UTF-8?q?=E3=80=81pptx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/somkit/fmt/config/LogSocketConfig.java | 8 ++++----
 src/main/resources/application.yml                      | 2 +-
 src/main/resources/logback-spring.xml                   | 2 +-
 src/main/resources/templates/upload.html                | 3 ++-
 版本记录/readme.md                                      | 2 ++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/somkit/fmt/config/LogSocketConfig.java b/src/main/java/cn/somkit/fmt/config/LogSocketConfig.java
index 01e25fa..a642174 100644
--- a/src/main/java/cn/somkit/fmt/config/LogSocketConfig.java
+++ b/src/main/java/cn/somkit/fmt/config/LogSocketConfig.java
@@ -7,28 +7,28 @@ import org.springframework.util.StringUtils;
 @Component
 public class LogSocketConfig {
 
-    public static String Log_File_Path = "D:/logs/fmt/fmt-server.log";
+    public static String Log_File_Path = "./logs/fmt-server.log";
 
     public static String Max_Read_Length = "500";
 
     public static String Read_Interval = "1000";
 
     @Value("${somkit.logging.socket.log-file-path}")
-    public static void setLog_File_Path(String log_File_Path) {
+    public void setLog_File_Path(String log_File_Path) {
         if(StringUtils.hasText(log_File_Path)){
             Log_File_Path = log_File_Path;
         }
     }
 
     @Value("${somkit.logging.socket.max-read-length}")
-    public static void setMax_Read_Length(String max_Read_Length) {
+    public void setMax_Read_Length(String max_Read_Length) {
         if(StringUtils.hasText(max_Read_Length)){
             Max_Read_Length = max_Read_Length;
         }
     }
 
     @Value("${somkit.logging.socket.read-interval}")
-    public static void setRead_Interval(String read_Interval) {
+    public void setRead_Interval(String read_Interval) {
         if(StringUtils.hasText(read_Interval)){
             Read_Interval = read_Interval;
         }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea9339e..c111fbf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -30,7 +30,7 @@ somkit:
   logging:
     socket:
       #日志文件地址
-      log-file-path: D:/logs/fmt/fmt-server.log
+      log-file-path: ./logs/fmt-server.log
       #最大读取展示行数
       max-read-length: 500
       #读取间隔时间 毫秒
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index acb3add..04ba28a 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 
     <!-- 定义日志的根目录 -->
-    <property name="LOG_HOME" value="/logs/fmt"/>
+    <property name="LOG_HOME" value="./logs"/>
     <!-- 定义日志文件名称 -->
     <property name="APP_NAME" value="fmt-server"/>
 
diff --git a/src/main/resources/templates/upload.html b/src/main/resources/templates/upload.html
index 90aa45f..d8002ab 100644
--- a/src/main/resources/templates/upload.html
+++ b/src/main/resources/templates/upload.html
@@ -53,7 +53,8 @@
     <script type="text/javascript" charset="utf-8">
         window.onload = () => {
             let accept = "jpg,jpeg,gif,png,svg,doc,docx,xls,xlsx,txt,mp4,mp3,pdf,exe,msi,jar,zip," +
-                "rar,tar,gz,conf,sql,sh,bat,log,out,ico,rpm,deb,dmg,avi,m3u8,ts";
+                "rar,tar,gz,conf,sql,sh,bat,log,out,ico,rpm,deb,dmg,avi,m3u8,ts,js,css,html,vsdx,dmp,7z," +
+                "ppt,pptx";
             let upload = new axUpload('#upload', {
                 type: 'gallery',
                 url: 'execute',
diff --git a/版本记录/readme.md b/版本记录/readme.md
index 8023cb1..f653175 100644
--- a/版本记录/readme.md
+++ b/版本记录/readme.md
@@ -13,4 +13,6 @@
 ```
     AxUI从v2.0.14升级到v2.1.1
     使用Promise封装XMLHttpRequest做异步请求
+    修改日志文件生成及读取位置
+    上传文件格式新增支持js、css、html、vsdx、dmp、7z、ppt、pptx
 ```
\ No newline at end of file