dzk 1 год назад
Родитель
Сommit
ef662d1391

+ 3 - 3
ruoyi-admin/Dockerfile

@@ -2,9 +2,9 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER hst
 
-RUN mkdir -p /mydata/digital-investment/logs \
-    /mydata/digital-investment/temp \
-    /mydata/digital-investment/agent
+RUN mkdir -p /data/digital-investment/logs \
+    /data/digital-investment/temp \
+    /data/digital-investment/agent
 
 WORKDIR /data/digital-investment
 

+ 1 - 1
ruoyi-admin/src/main/resources/application-lbtest.yml

@@ -1,5 +1,5 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: /data/digital-investment/temp
 server:
   port: 8100
   servlet:

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

@@ -1,5 +1,5 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: /data/digital-investment/temp
 server:
   port: 8100
   servlet:
@@ -19,7 +19,7 @@ spring.boot.admin.client:
 --- # xxl-job 配置
 xxl.job:
   # 执行器开关
-  enabled: true
+  enabled: false
   # 调度中心地址:如调度中心集群部署存在多个地址则用逗号分隔。
   admin-addresses: http://192.168.0.26:8080/xxl-job-admin
   # 执行器通讯TOKEN:非空时启用
@@ -57,18 +57,18 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.0.31:3306/digital-investment?useSSL=true&characterEncoding=utf-8
+          url: jdbc:mysql://172.16.118.1:3306/digital-investment?useSSL=true&characterEncoding=utf-8
           username: root
           password: LongX@321
 
         # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.0.31:3306/digital-investment?useSSL=true&characterEncoding=utf-8
-          username: root
-          password: LongX@321
+#        slave:
+#          lazy: true
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://192.168.0.31:3306/digital-investment?useSSL=true&characterEncoding=utf-8
+#          username: root
+#          password: LongX@321
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver
@@ -111,13 +111,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 192.168.0.34
+    host: 172.16.118.4
     # 端口,默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    password: lsf@12345
+    password: LongX@321
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

+ 1 - 1
ruoyi-admin/src/main/resources/application-test.yml

@@ -1,5 +1,5 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: /data/digital-investment/temp
 server:
   port: 8100
   servlet: