From c8bce7e0249ff2e5a4e85cc3a075265e2da87413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=AB=E6=81=92?= <guolei.sgl@antfin.com>
Date: Thu, 31 Dec 2020 17:37:38 +0800
Subject: [PATCH 1/2] add gitignore

---
 .gitignore | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..186ea45ad
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,21 @@
+target
+bak
+.pmd
+.project
+.settings
+.classpath
+.idea.xml
+.idea
+*.class
+*.bak
+*.iml
+*.ipr
+*.iws
+bak
+null/
+tree.log
+tmp/
+velocity.log
+.DS_Store
+logs
+.m2
-- 
Gitee


From 946459e8583ffd9a666280b2115647dbdc7239c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=AB=E6=81=92?= <guolei.sgl@antfin.com>
Date: Thu, 31 Dec 2020 18:01:07 +0800
Subject: [PATCH 2/2] fix LOG PATH

---
 linkwe-admin/src/main/resources/application.yml |  3 +++
 linkwe-admin/src/main/resources/logback.xml     | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/linkwe-admin/src/main/resources/application.yml b/linkwe-admin/src/main/resources/application.yml
index 8420544f5..975b3382e 100644
--- a/linkwe-admin/src/main/resources/application.yml
+++ b/linkwe-admin/src/main/resources/application.yml
@@ -37,6 +37,9 @@ logging:
   level:
     com.ruoyi: debug
     org.springframework: warn
+  path: ./logs
+path:
+  log: ./logs
 
 # Spring配置
 spring:
diff --git a/linkwe-admin/src/main/resources/logback.xml b/linkwe-admin/src/main/resources/logback.xml
index 6f6bea288..c81093e22 100644
--- a/linkwe-admin/src/main/resources/logback.xml
+++ b/linkwe-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+    <springProperty name="LOG_PATH" source="logging.path" defaultValue="./logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -14,11 +14,11 @@
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+	    <file>${LOG_PATH}/sys-info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<fileNamePattern>${LOG_PATH}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
 		</rollingPolicy>
@@ -36,11 +36,11 @@
 	</appender>
 	
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+	    <file>${LOG_PATH}/sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -59,10 +59,10 @@
 	
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
+		<file>${LOG_PATH}/sys-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
-- 
Gitee