Merge branch 'wangfei' into 'dev'

Wangfei

See merge request !92

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

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.12.48.76:22030/vehicle-quality-review?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: 1qaz@WSX
+                url: ${MYSQL_URL}
+                username: ${MYSQL_USERNAME}
+                password: ${MYSQL_PASSWORD}
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -47,8 +47,8 @@ spring:
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username: ruoyi
-                login-password: 1qaz@WSX
+                login-username: ${CONSOLE_LOGIN_USERNAME}
+                login-password: ${CONSOLE_LOGIN_PASSWORD}
             filter:
                 stat:
                     enabled: true

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

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: /data/docker_volume/2024/secureTest/application/upload
+  profile: /data//upload
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -68,13 +68,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 10.12.48.77
+    host: ${REDIS_IP}
     # 端口，默认为6379
-    port: 22031
+    port: ${REDIS_PORT}
     # 数据库索引
     database: 0
     # 密码
-    password: 1qaz@WSX
+    password: ${REDIS_PWD}
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -93,7 +93,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: ${TOKEN_SECRET}
   # 令牌有效期（默认30分钟）
   expireTime: 30
 
@@ -144,7 +144,7 @@ xss:
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 minio:
-  url: http://10.12.48.79:22038
-  accessKey: lB7WhZYiQwLzhHPutRGn
-  secretKey: 7XMWpLm6p4d20OFe9uXKifEyhF3cp4sTCowI2fhJ
+  url: ${MINIO_URL}
+  accessKey: ${MINIO_ACCESSKEY}
+  secretKey: ${MINIO_SECRETKEY}
   bucketName: vehicle-quality-review-oss
\ No newline at end of file