Merge remote-tracking branch 'origin/master'

rouyi-api/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.100.80.192:3306/infrared_remote?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: infrared_remote
-                password: MrDsOE@#9u
+                url: jdbc:mysql://172.21.19.131:3306/infrared_remote?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 8A*X@&EbKeiw
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

rouyi-api/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /home/ruoyi/uploadPath
+  profile: /data/nginx/html/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -70,13 +70,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.100.80.192
+    host: 172.21.19.131
     # 端口，默认为6379
-    port: 6377
+    port: 6379
     # 数据库索引
     database: 3
     # 密码
-    password: fy123#@!
+    password: 8A*X@&EbKeiw
     # 连接超时时间
     timeout: 10s
     lettuce:

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

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

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.100.80.192:3306/infrared_remote?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: infrared_remote
-                password: MrDsOE@#9u
+                url: jdbc:mysql://172.21.19.131:3306/infrared_remote?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
+                password: 8A*X@&EbKeiw
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

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

@@ -10,7 +10,7 @@ ruoyi:
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
 #  profile: /home/ruoyi/uploadPath
-  profile: C:/Users/L.M/Desktop/ruoyi/uploadPath
+  profile: /data/nginx/html/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -71,13 +71,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 47.100.80.192
+    host: 172.21.19.131
     # 端口，默认为6379
-    port: 6377
+    port: 6379
     # 数据库索引
     database: 3
     # 密码
-    password: fy123#@!
+    password: 8A*X@&EbKeiw
     # 连接超时时间
     timeout: 10s
     lettuce:

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