Merge remote-tracking branch 'origin/gsw' into gsw

# Conflicts:
#	ruoyi-admin/src/main/resources/application-druid.yml

ruoyi-admin/src/main/resources/application-druid.yml

@@ -3,7 +3,7 @@ spring:
   # redis配置
   redis:
     database: 0
-    host: 47.116.8.180
+    host: 120.24.213.253
     port: 6379
     password: Read-in2023
     timeout: 6000ms           # 连接超时时长（毫秒）
@@ -26,6 +26,7 @@ spring:
         url: jdbc:mysql://120.24.213.253:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://localhost:3306/wancaierpdemo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
         username: root
+#        password: RuiYi2022
         password: Read-in2023
 #        password: RuiYi@2023
 #        username: root

ruoyi-admin/src/main/resources/application.yml

@@ -9,7 +9,8 @@ ruoyi:
   # 实例演示开关
   demoEnabled: false
   # 文件路径 示例（ Windows配置c:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: C:/ruoyi/uploadPath
+#  profile: /Users/xiguniang/Documents/ruoyi/uploadPath
+  profile: /home/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
 

ruoyi-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" />-->
+	<property name="log.path" value="/home/ruoyi/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />