Pārlūkot izejas kodu

配置正式环境

dzk 1 gadu atpakaļ
vecāks
revīzija
5d1eaab686

+ 37 - 0
.run/bailian-admin.run.xml

@@ -0,0 +1,37 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="bailian-admin" type="docker-deploy" factoryName="dockerfile" server-name="192.168.0.14">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="bailian-admin:4.8.0" />
+        <option name="containerName" value="bailian-admin" />
+        <option name="envVars">
+          <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="TZ" />
+              <option name="value" value="Shanghai" />
+            </DockerEnvVarImpl>
+          </list>
+        </option>
+        <option name="commandLineOptions" value="--network host" />
+        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/logs" />
+              <option name="hostPath" value="/data/bailian-admin/logs" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/temp" />
+              <option name="hostPath" value="/data/bailian-admin/temp" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/data/bailian-admin/agent" />
+              <option name="hostPath" value="/data/bailian-admin/agent" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

+ 0 - 29
.run/ruoyi-server.run.xml

@@ -1,29 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-server:4.8.0" />
-        <option name="containerName" value="ruoyi-server" />
-        <option name="envVars">
-          <list>
-            <DockerEnvVarImpl>
-              <option name="name" value="TZ" />
-              <option name="value" value="Shanghai" />
-            </DockerEnvVarImpl>
-          </list>
-        </option>
-        <option name="commandLineOptions" value="--network host" />
-        <option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
-        <option name="volumeBindings">
-          <list>
-            <DockerVolumeBindingImpl>
-              <option name="containerPath" value="/rouyi/server/logs" />
-              <option name="hostPath" value="/rouyi/server/logs" />
-            </DockerVolumeBindingImpl>
-          </list>
-        </option>
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

+ 4 - 4
benyun-core/Dockerfile

@@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER dzk
 
-RUN mkdir -p /saas/modules/integral/logs  \
-    /saas/modules/integral/temp  \
-    /saas/skywalking/agent
+RUN mkdir -p /data/bailian-biz/logs  \
+    /data/bailian-biz/temp  \
+    /data/bailian-biz/agent
 
-WORKDIR /saas/modules/integral
+WORKDIR /data/bailian-biz
 
 #ENV SERVER_PORT=9210
 #

+ 10 - 10
benyun-core/src/main/resources/application-prod.yaml

@@ -49,17 +49,17 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.2.64:3306/bailian-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.0.31:3306/benyun-bailian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: benyun
+          password: LongX@321
         # 从库数据源
         slave:
           lazy: true
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.2.64:3306/bailian-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.0.31:3306/benyun-bailian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: benyun
+          password: LongX@321
       #        oracle:
       #          type: ${spring.datasource.type}
       #          driverClassName: oracle.jdbc.OracleDriver
@@ -103,9 +103,9 @@ spring:
       ds1:
         type: com.zaxxer.hikari.HikariDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbcUrl: jdbc:mysql://192.168.2.64:3306/bailian-ai?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+        jdbcUrl: jdbc:mysql://192.168.0.31:3306/benyun-bailian?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
         username: root
-        password: benyun
+        password: LongX@321
     sharding:
       tables:
         bl_wd_topological:
@@ -154,11 +154,11 @@ spring:
               sharding-column: center_wd_id
               precise-algorithm-class-name: com.benyun.core.utils.sharding.ConsistenceHashAlgorithm
   redis: #redis配置
-    host: 192.168.2.64  #redis服务地址
-    database: 11
+    host: 192.168.0.34  #redis服务地址
+    database: 12
     port: 6379       #redis连接端口
-    timeout: 5000ms  #连接超时时间
-    password: "123456"
+    timeout: 5s  #连接超时时间
+    password: lsf@12345
     pool:
       minIdle: 1   #连接池中的最小空闲连接
       maxIdle: 10  #连接池中的最大空闲连接

+ 1 - 1
pom.xml

@@ -337,7 +337,7 @@
     </dependencyManagement>
 
     <modules>
-<!--        <module>ruoyi-admin</module>-->
+        <module>ruoyi-admin</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-job</module>

+ 4 - 4
ruoyi-admin/Dockerfile

@@ -2,11 +2,11 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
 
 MAINTAINER hst
 
-RUN mkdir -p /ruoyi/server/logs \
-    /ruoyi/server/temp \
-    /ruoyi/skywalking/agent
+RUN mkdir -p /data/bailian-admin/logs \
+    /data/bailian-admin/temp \
+    /data/bailian-admin/agent
 
-WORKDIR /ruoyi/server
+WORKDIR /data/bailian-admin
 
 #ENV SERVER_PORT=8080
 

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

@@ -1,10 +1,10 @@
 --- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: /data/bailian-admin/temp
 
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -16,14 +16,14 @@ xxl.job:
   # 执行器开关
   enabled: true
   # 调度中心地址:如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://localhost:9100/xxl-job-admin
+  admin-addresses: http://192.168.0.26:8080/xxl-job-admin
   # 执行器通讯TOKEN:非空时启用
-  access-token: xxl-job
+  access-token: tokenixuemtuoekpjmixhddlhzssuquvvlxya
   executor:
     # 执行器AppName:执行器心跳注册分组依据;为空则关闭自动注册
-    appname: xxl-job-executor
+    appname: benyun-bailian
     # 执行器端口号 执行器从9101开始往后写
-    port: 9101
+    port: 9106
     # 执行器注册:默认IP:PORT
     address:
     # 执行器IP:默认自动获取IP
@@ -52,18 +52,18 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.2.64:3306/bailian-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.0.31:3306/benyun-bailian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: benyun
+          password: LongX@321
 
         # 从库数据源
         slave:
           lazy: true
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.2.64:3306/bailian-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username:
-          password:
+          url: jdbc:mysql://192.168.0.31:3306/benyun-bailian?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: LongX@321
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver
@@ -106,13 +106,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: 192.168.2.64
+    host: 192.168.0.34
     # 端口,默认为6379
     port: 6379
     # 数据库索引
-    database: 11
+    database: 12
     # 密码(如没有密码请注释掉)
-    password: "123456"
+    password: lsf@12345
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

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

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: RuoYi-Vue-Plus
+  name: benyun-bailian
   # 版本
   version: ${ruoyi-vue-plus.version}
   # 版权年份