From a8c23d90a1c584b54df554c93d8fe5f099db0c4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com>
Date: Fri, 10 Jan 2025 13:38:36 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=201=EF=BC=89=E5=90=AF=E7=94=A8=E6=97=A5=E5=BF=97=E5=8E=8B?=
 =?UTF-8?q?=E7=BC=A9=EF=BC=9B2=EF=BC=89=E6=97=A5=E5=BF=97=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=95=B0=E5=92=8C=E4=BF=9D=E5=AD=98=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/config/index.js       |  4 +++
 packages/core/src/utils/util.log.js     |  1 +
 packages/core/src/utils/util.logger.js  | 39 ++++++++++++++++++++-----
 packages/gui/src/view/pages/setting.vue |  7 +++++
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/config/index.js b/packages/core/src/config/index.js
index 37468dd..59ae39b 100644
--- a/packages/core/src/config/index.js
+++ b/packages/core/src/config/index.js
@@ -69,6 +69,10 @@ module.exports = {
 
       // 慢速IP延迟时间：测速超过该值时，则视为延迟高，显示为橙色
       lowSpeedDelay: 200,
+
+      // 日志相关配置
+      logFileSavePath: path.join(getUserBasePath(), '/logs'), // 日志文件保存路径
+      keepLogFileCount: 15, // 保留日志文件数
     },
     compatible: {
       // **** 自定义兼容配置 **** //
diff --git a/packages/core/src/utils/util.log.js b/packages/core/src/utils/util.log.js
index 20e1078..5c73495 100644
--- a/packages/core/src/utils/util.log.js
+++ b/packages/core/src/utils/util.log.js
@@ -1,4 +1,5 @@
 const log4js = require('./util.logger')
 
 const logger = log4js.getLogger('core')
+
 module.exports = logger
diff --git a/packages/core/src/utils/util.logger.js b/packages/core/src/utils/util.logger.js
index 6d15c06..275739b 100644
--- a/packages/core/src/utils/util.logger.js
+++ b/packages/core/src/utils/util.logger.js
@@ -5,19 +5,44 @@ const config = require('../config/index')
 const level = process.env.NODE_ENV === 'development' ? 'debug' : 'info'
 
 function getDefaultConfigBasePath () {
-  return config.server.setting.userBasePath
+  if (config.server.setting.logFileSavePath) {
+    let logFileSavePath = config.server.setting.logFileSavePath
+    if (logFileSavePath.endsWith('/') || logFileSavePath.endsWith('\\')) {
+      logFileSavePath = logFileSavePath.slice(0, -1)
+    }
+    // eslint-disable-next-line no-template-curly-in-string
+    return logFileSavePath.replace('${userBasePath}', config.server.setting.userBasePath)
+  } else {
+    return path.join(config.server.setting.userBasePath, '/logs')
+  }
 }
 
-const coreLogFilename = path.join(getDefaultConfigBasePath(), '/logs/core.log')
-const guiLogFilename = path.join(getDefaultConfigBasePath(), '/logs/gui.log')
-const serverLogFilename = path.join(getDefaultConfigBasePath(), '/logs/server.log')
+// 日志文件名
+const coreLogFilename = path.join(getDefaultConfigBasePath(), '/core.log')
+const guiLogFilename = path.join(getDefaultConfigBasePath(), '/gui.log')
+const serverLogFilename = path.join(getDefaultConfigBasePath(), '/server.log')
 
+// 日志相关配置
+const backups = config.server.setting.keepLogFileCount // 保留日志文件数
+const appenderConfig = {
+  type: 'file',
+  pattern: 'yyyy-MM-dd',
+  keepFileExt: true, // 保留日志文件扩展名
+  compress: true, // 压缩日志文件
+
+  // 以下三个配置都设置，兼容新旧版本
+  backups,
+  numBackups: backups,
+  daysToKeep: backups,
+}
+
+// 设置日志配置
 log4js.configure({
   appenders: {
     std: { type: 'stdout' },
-    core: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: coreLogFilename },
-    gui: { type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: guiLogFilename },
-    server: { level: 'debug', type: 'file', pattern: 'yyyy-MM-dd', daysToKeep: 3, filename: serverLogFilename },
+    core: { ...appenderConfig, filename: coreLogFilename },
+    gui: { ...appenderConfig, filename: guiLogFilename },
+    server: { ...appenderConfig, filename: serverLogFilename },
   },
   categories: {
     default: { appenders: ['std'], level },
diff --git a/packages/gui/src/view/pages/setting.vue b/packages/gui/src/view/pages/setting.vue
index 6cdc518..0942ab1 100644
--- a/packages/gui/src/view/pages/setting.vue
+++ b/packages/gui/src/view/pages/setting.vue
@@ -450,6 +450,13 @@ export default {
           预发布版本号为带有 “<code>-</code>” 的版本。注：该配置只对当前版本为正式版本时有效。
         </div>
       </a-form-item>
+      <hr>
+      <a-form-item label="日志文件保存路径" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-input v-model="config.server.setting.logFileSavePath" />
+      </a-form-item>
+      <a-form-item label="保留日志文件数" :label-col="labelCol" :wrapper-col="wrapperCol">
+        <a-input-number v-model="config.server.setting.keepLogFileCount" :step="1" :min="0" />
+      </a-form-item>
     </div>
     <template slot="footer">
       <div class="footer-bar">