区分正式与测试配置修改

business-service/src/main/resources/application-dev.yml

@@ -20,9 +20,9 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.244:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://1.95.170.86:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
+    username: business_db
-    password: 123456
+    password: zzkj@688737
     druid:
       initialSize: 5
       minIdle: 5
@@ -33,40 +33,25 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 50000ms #连接超时
-    host: 192.168.100.242 #单机
+    host: 1.95.170.86 #单机
     password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    record:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8
         max-idle: 8 #连接池中最大空闲连接 默认8
         min-idle: 1 #连接池中最小空闲连接 默认0
         max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
-
-
-
   boot:
     admin:
       client:
         url: http://localhost:8019/boot
 
 minio:
-  accessKey: admin
+  accessKey: minioadmin
-  secretKey: zzkj@688737
+  secretKey: minioadmin
-  endpoint: http://192.168.0.236:9000
+  endpoint: http://1.95.170.86:9000
-  prefixUrl: http://192.168.0.236:9000
+  prefixUrl: http://1.95.170.86:9000
 
 formula:
   fieldmap:

business-service/src/main/resources/application-prod.yml

@@ -0,0 +1,58 @@
+server:
+  port: 8011
+  servlet:
+    context-path: /api
+
+#swagger2配置
+swagger2:
+  enable: true #开启swagger
+  projectName: 云平台--business-前端接口
+  controllerPath: com.ho.business.controller
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: business-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: zzkj
+    password: zzkj@688737
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 5
+      keepAlive: true #保持长连接
+      connection-error-retry-attempts: 3
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 50000ms #连接超时
+    host: 192.168.0.236 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+  boot:
+    admin:
+      client:
+        url: http://localhost:8019/boot
+
+minio:
+  accessKey: admin
+  secretKey: zzkj@688737
+  endpoint: http://192.168.0.236:9000
+  prefixUrl: http://192.168.0.236:9000
+
+formula:
+  fieldmap:
+    RT_FIELD_BEAN: RT_FIELD_BEAN

data-collect-service/src/main/resources/application-dev.yml

@@ -11,9 +11,9 @@ swagger2:
 
 #mqtt
 mqtt:
-  url: tcp://123.60.190.77:1883  # 线上环境MQTT
+  url: tcp://1.95.170.86:1883
   userName: admin
-  passWord: public
+  passWord: zzkj688737
   timeout: 5000
   keepAlive: 60
 
@@ -37,8 +37,6 @@ topic:
   cloudControlRequest: +/cloud/+/control/request
   edgeControlResponse: +/device/+/control/response
 
-
-
 spring:
   jackson:
     time-zone: GMT+8
@@ -50,12 +48,9 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    #url: jdbc:mysql://1.95.153.121:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://1.95.170.86:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://192.168.100.244:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: business_db
-    #username: zzkj
+    password: zzkj@688737
-    username: root
-    #password: zzkj@688737
-    password: 123456
     druid:
       initialSize: 5
       minIdle: 5
@@ -66,23 +61,9 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    #host: 1.95.153.121 #单机
+    host: 1.95.170.86 #单机
-    host: 192.168.100.242 #单机
-    #password: zzkj@688737
     password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    cluster:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8
@@ -91,10 +72,10 @@ spring:
         max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
 
 minio:
-  accessKey: admin
+  accessKey: minioadmin
-  secretKey: zzkj@688737
+  secretKey: minioadmin
-  endpoint: http://192.168.0.236:9000
+  endpoint: http://1.95.170.86:9000
-  prefixUrl: http://192.168.0.236:9000
+  prefixUrl: http://1.95.170.86:9000
 
 #跳过登录：true ,不跳过：false
 skipLogin: false

data-collect-service/src/main/resources/application-prod.yml

@@ -0,0 +1,83 @@
+server:
+  port: 8010
+  servlet:
+    context-path: /api
+
+#swagger2配置
+swagger2:
+  enable: true #开启swagger
+  projectName: 云平台--business-前端接口
+  controllerPath: com.ho.datacollect.controller
+
+#mqtt
+mqtt:
+  url: tcp://123.60.190.77:1883  # hz线上环境MQTT
+  userName: admin
+  passWord: public
+  timeout: 5000
+  keepAlive: 60
+
+#密钥
+secret:
+  loginSecret: 6131231@#42a765#
+
+#topic
+topic:
+  edgeLoginRequest: +/device/+/login/request
+  cloudLoginResponse: +/cloud/+/login/response
+
+  cloudReadRequest: +/cloud/+/read/request
+  edgeReadResponse: +/device/+/read/response
+  cloudWriteRequest: +/cloud/+/write/request
+  edgeWriteResponse: +/device/+/write/response
+
+  cloudReportPush: +/cloud/+/report/push
+  edgeReportPush: +/device/+/report/push
+
+  cloudControlRequest: +/cloud/+/control/request
+  edgeControlResponse: +/device/+/control/response
+
+
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: datacollect-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.236:3306/business_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: zzkj
+    password: zzkj@688737
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 5
+      keepAlive: true #保持长连接
+      connection-error-retry-attempts: 3
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 3000ms #连接超时
+    host: 1.95.153.121 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+
+minio:
+  accessKey: admin
+  secretKey: zzkj@688737
+  endpoint: http://192.168.0.236:9000
+  prefixUrl: http://192.168.0.236:9000
+
+#跳过登录：true ,不跳过：false
+skipLogin: false

file-center/src/main/resources/application-dev.yml

@@ -7,13 +7,13 @@ server:
 
 #mqtt
 mqtt:
-  url: tcp://123.60.190.77:1883
+  url: tcp://1.95.170.86:1883
   userName: admin
-  passWord: public
+  passWord: zzkj688737
   timeout: 5000
   keepAlive: 60
 
-#主题 todo 先死一个用于测试
+#主题 todo
 topic:
   cloudFileRequest: +/cloud/+/file/request
   cloudFileResponse: +/cloud/+/file/response
@@ -61,9 +61,9 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.244:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    url: jdbc:mysql://1.95.170.86:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
+    username: file_center_db
-    password: 123456
+    password: zzkj@688737
     druid:
       initialSize: 5
       minIdle: 5
@@ -80,22 +80,9 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 192.168.100.244 #单机
+    host: 1.95.170.86 #单机
     password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    cluster:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
-
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8
@@ -104,8 +91,8 @@ spring:
         max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
 
 minio:
-  accessKey: admin
+  accessKey: minioadmin
-  secretKey: zzkj@688737
+  secretKey: minioadmin
-  endpoint: http://192.168.0.236:9000
+  endpoint: http://1.95.170.86:9000
-  prefixUrl: http://192.168.0.236:9000
+  prefixUrl: http://1.95.170.86:9000
 

file-center/src/main/resources/application-prod.yml

@@ -0,0 +1,98 @@
+#文件中心
+server:
+  port: 8017
+  servlet:
+    #上下文统一使用api,屏蔽前端路径差异
+    context-path: /api
+
+#mqtt
+mqtt:
+  url: tcp://1.95.131.171:1883
+  userName: admin
+  passWord: zzkj@688737
+  timeout: 5000
+  keepAlive: 60
+
+#主题 todo
+topic:
+  cloudFileRequest: +/cloud/+/file/request
+  cloudFileResponse: +/cloud/+/file/response
+  edgeFileResponse: +/device/+/file/response
+  edgeFileRequest: +/device/+/file/request
+
+  cloudControlRequest: +/cloud/+/control/request
+  edgeControlResponse: +/device/+/control/response
+
+#路径 todo 先再本地
+path:
+  local: /opt/file_center
+  #下发文件路径
+  copy: /opt/file_copy
+  #天气ip2region.db路径
+  weather: /opt/ip2region.db
+  chartPath: /opt/image/
+
+#指定字节大小
+size:
+  byteSize: 102400
+
+
+#通用文件
+files:
+  upload:
+    path: D:\upload
+  format: .jpg,.png,.doc,.docx,.xlsx,.xls,.pdf
+  maxByte: 10485760
+
+#swagger2配置
+swagger2:
+  enable: true #开启标志 生产环境要关闭
+  projectName: 云平台-文件中心-接口
+  controllerPath: com.ho.filecenter.controller
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: file-center
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.236:3306/file_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: file_center_db
+    password: zzkj@688737
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 5
+      keepAlive: true #保持长连接
+      connection-error-retry-attempts: 3
+  #设备文件上传大小
+  servlet:
+    multipart:
+      max-file-size:  500MB
+      max-request-size: 500MB
+      enabled: true
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 3000ms #连接超时
+    host: 192.168.0.236 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+
+minio:
+  accessKey: admin
+  secretKey: zzkj@688737
+  endpoint: http://192.168.0.236:9000
+  prefixUrl: http://192.168.0.236:9000
+

flowable-center/src/main/resources/application-dev.yml

@@ -17,9 +17,9 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.100.244:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+    url: jdbc:mysql://1.95.170.86:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
-    username: root
+    username: flow_db
-    password: 123456
+    password: zzkj@688737
     druid:
       initialSize: 5
       minIdle: 5
@@ -31,21 +31,9 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 300000ms #连接超时
-    host: 192.168.100.244 #单机
+    host: 1.95.170.86 #单机
     password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    record:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8

flowable-center/src/main/resources/application-prod.yml

@@ -0,0 +1,84 @@
+#文件中心
+server:
+  port: 8021
+  servlet:
+    #上下文统一使用api,屏蔽前端路径差异
+    context-path: /api
+  tomcat:
+    min-spare-threads: 30
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: flowable-center
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.236:3306/flow_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowMultiQueries=true
+    username: flow_db
+    password: zzkj@688737
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 5
+      keepAlive: true #保持长连接
+      connection-error-retry-attempts: 3
+
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 300000ms #连接超时
+    host: 1.95.153.121 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+  #工作流
+  activiti:
+    # 自动部署,验证设置：true-开启（默认）、false-关闭
+    check-process-definitions: false
+    # 保存历史数据
+    history-level: full
+    # 检测历史表是否存在
+    db-history-used: true
+    # 关闭自动部署
+    deployment-mode: never-fail
+    # 对数据库中所有表进行更新操作，如果表不存在，则自动创建
+    # create_drop：启动时创建表，在关闭时删除表（必须手动关闭引擎，才能删除表）
+    # drop-create：启动时删除原来的旧表，然后在创建新表（不需要手动关闭引擎）
+    database-schema-update: true
+    # 解决频繁查询SQL问题
+    async-executor-activate: false
+    use-strong-uuids: false
+    initialDelay: 5
+    flag: 0
+
+#自定义工作量变量
+flow:
+  #工单流程配置
+  workOrder:
+    #流程定义的key ,根据实际的名称来
+    procDefKey: workOrder
+    #处理工单的岗位 ,后续可能是多个
+    doing: tro,worker
+    #验收工单的岗位
+    check: tro,worker
+    #评价工单的岗位
+    appraise: ceo
+
+#swagger2配置
+swagger2:
+  enable: true #开启swagger
+  projectName: 云平台--flow-前端接口
+  controllerPath: com.ho.flow.controller
+
+
+
+

td-service/src/main/resources/application-dev.yml

@@ -13,23 +13,9 @@ spring:
       discovery:
         server-addr: 127.0.0.1:8848
   datasource:
-#    tdengine-server:
-#      #jdbc-url: jdbc:TAOS://192.168.1.198:6030/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
-#      jdbc-url: jdbc:TAOS-RS://123.60.64.124:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
-#      username: root
-#      password: taosdata
-#      type: com.zaxxer.hikari.HikariDataSource      # Hikari连接池的设置
-#      minimum-idle: 5                 #最小连接
-#      maximum-pool-size: 15        #最大连接
-#      auto-commit: true        #自动提交
-#      idle-timeout: 30000        #最大空闲时常
-#      pool-name: TDengineDruidCP        #连接池名
-#      max-lifetime: 1800000        #最大生命周期
-#      connection-timeout: 30000        #连接超时时间
-#      connection-test-query: show tables
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-    url: jdbc:TAOS-RS://1.95.153.121:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
+    url: jdbc:TAOS-RS://1.95.170.86:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
     username: root
     password: taosdata
     druid:
@@ -39,19 +25,12 @@ spring:
       max-wait: 10000
       time-between-eviction-runs-millis: 60000
       validation-query: SELECT 1 as nums
-#      test-while-idle: true
-#      test-on-borrow: false
-#      test-on-return: false
-#      pool-prepared-statements: true
-#      max-pool-prepared-statement-per-connection-size: 20
-#      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#      filters: stat # 拦截sql的开
   #Redis
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.153.121 #单机
+    host: 1.95.170.86 #单机
-    password: zzkj@688737
+    password: 123456
     database: 0
 
   boot:

td-service/src/main/resources/application-prod.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8013
+  servlet:
+    context-path: /td
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: td-service
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+    url: jdbc:TAOS-RS://1.95.153.121:6041/test_td_db?user=root&password=taosdata&charset=UTF-8&locale=zh_CN.UTF-8&timezone=UTC-8
+    username: root
+    password: taosdata
+    druid:
+      initial-size: 6
+      min-idle: 6
+      max-active: 12
+      max-wait: 10000
+      time-between-eviction-runs-millis: 60000
+      validation-query: SELECT 1 as nums
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 3000ms #连接超时
+    host: 1.95.153.121 #单机
+    password: zzkj@688737
+    database: 0
+
+  boot:
+    admin:
+      client:
+        url: http://localhost:8019/boot

user-service/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
         server-addr: 127.0.0.1:8848
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.95.153.121:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://1.95.170.86:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
     username: user_center_db
     password: zzkj@688737
     druid:
@@ -38,21 +38,9 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.153.121 #单机
+    host: 1.95.170.86 #单机
-    password: zzkj@688737
+    password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    cluster:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8

user-service/src/main/resources/application-prod.yml

@@ -0,0 +1,66 @@
+#用户中心
+server:
+  port: 8012
+  servlet:
+    context-path: /api
+
+#swagger2配置
+swagger2:
+  enable: true #开启标志 生产环境要关闭
+  projectName: 云平台-用户中心-接口
+  controllerPath: com.ho.user.controller
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: user-center
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.236:3306/user_center_db?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: user_center_db
+    password: zzkj@688737
+    druid:
+      initialSize: 5
+      minIdle: 5
+      maxActive: 5
+      keepAlive: true #保持长连接
+      connection-error-retry-attempts: 3
+  boot:
+    admin:
+      client:
+        url: http://localhost:8019/boot
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 3000ms #连接超时
+    host: 1.95.153.121 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+
+#jwt配置
+jwt:
+  secretKey: 78944878877848fg)
+  accessTokenExpireTime: PT2H
+  refreshTokenExpireTime: PT8H
+  refreshTokenExpireAppTime: P30D
+  issuer: hocloudSystem
+
+#加解密
+rsa:
+  pubKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuG6ZABNgLQCI9iVPDuJEb7xb5zR9UGKyKXshLuJFZxyNtaEzfpjSMqsshUYA1QpwUvkmZE0lcRE4F4QtZO9rDnH2PoW1FWRbjgg0+MKWOmZr9hSPKM/BIE+knTtTaj4/0TK7QwDd9q/QAIduC1hIyxIIkxfWx0gFuTnxui0waCwIDAQAB'
+  privateKey: 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAK4bpkAE2AtAIj2JU8O4kRvvFvnNH1QYrIpeyEu4kVnHI21oTN+mNIyqyyFRgDVCnBS+SZkTSVxETgXhC1k72sOcfY+hbUVZFuOCDT4wpY6Zmv2FI8oz8EgT6SdO1NqPj/RMrtDAN32r9AAh24LWEjLEgiTF9bHSAW5OfG6LTBoLAgMBAAECgYA614NfXYO6galQzMmvewAnxa0pLYbqABDIDvJ4jN8qzV+OyVI5v81AwTQ3hXjkBygC5rCu+FKxyS/pUr5oIQ90vbKvy+kozg9l0qWHfa8XrfC+E36CVuDrZYdZzl0C6J6BoNB9osJJ6HCnMA7kWLRRwU5VJBsK8CmgcJlfHNH60QJBAPz4rZgqgor69SonHG4xjRz+u4QkXIP8I+lorBSFEuUF03u22Kcxz7mcOq63m8K+oc22ql0g8QNrq6YPrEgpAPMCQQCwMUQcdZLWJrRbHp1ZA3jbt4vYg7xb1LklAM6Qmz1R9xVY0itDMtFRSTlVnrbTPZ+rldrkLUOzLJwKLHniIQiJAkEAmfeBMKwu6Af2T8GePDNMf+lKmBLJfEtqUBW1JogYB+yT2yhelORsWbwMu2plExKTyHD1H9l812ghAOFpKkJKoQJBAJ7lz2dbIXHAtib3FTCR0Q1WGujI5bZrwg19DM2dM1AYZUgVQq73xY5pWyu8V2VqzfUQ0Le3mracJJ2IPuOQpwECQF/b7Tv3auIHRaO9AD7xWIOCMYGlKhqeheMZb/mDRHedsdRvigiojDaaFbtnkvXlRbWlkOu5P5GNDpv7EuPbUs8='
+
+phone:
+  regexp: ^[1][3,4,5,6,7,8,9][0-9]{9}$
+

xxl-job-admin/src/main/resources/application-dev.properties

@@ -26,7 +26,7 @@ mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
 #mybatis.type-aliases-package=com.xxl.job.admin.core.model
 
 ### xxl-job, datasource
-spring.datasource.url=jdbc:mysql://1.95.153.121:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://1.95.170.86:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
 spring.datasource.username=xxl_job
 spring.datasource.password=zzkj@688737
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

xxl-job-admin/src/main/resources/application-prod.properties

@@ -0,0 +1,67 @@
+### web
+server.port=8015
+server.servlet.context-path=/job-admin
+
+### actuator
+management.server.servlet.context-path=/actuator
+management.health.mail.enabled=false
+
+spring.application.name=xxl-job-admin
+###nacos
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+### resources
+spring.mvc.servlet.load-on-startup=0
+spring.mvc.static-path-pattern=/static/**
+spring.resources.static-locations=classpath:/static/
+
+### freemarker
+spring.freemarker.templateLoaderPath=classpath:/templates/
+spring.freemarker.suffix=.ftl
+spring.freemarker.charset=UTF-8
+spring.freemarker.request-context-attribute=request
+spring.freemarker.settings.number_format=0.##########
+
+### mybatis
+mybatis.mapper-locations=classpath:/mybatis-mapper/*Mapper.xml
+#mybatis.type-aliases-package=com.xxl.job.admin.core.model
+
+### xxl-job, datasource
+spring.datasource.url=jdbc:mysql://1.95.153.121:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=xxl_job
+spring.datasource.password=zzkj@688737
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+### datasource-pool
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=HikariCP
+spring.datasource.hikari.max-lifetime=900000
+spring.datasource.hikari.connection-timeout=10000
+spring.datasource.hikari.connection-test-query=SELECT 1
+
+### xxl-job, email
+spring.mail.host=smtp.qq.com
+spring.mail.port=25
+spring.mail.username=xxx@qq.com
+spring.mail.password=xxx
+spring.mail.properties.mail.smtp.auth=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
+
+### xxl-job, access token
+xxl.job.accessToken=
+
+### xxl-job, i18n (default is zh_CN, and you can choose "zh_CN", "zh_TC" and "en")
+xxl.job.i18n=zh_CN
+
+## xxl-job, triggerpool max size
+xxl.job.triggerpool.fast.max=200
+xxl.job.triggerpool.slow.max=100
+
+### xxl-job, log retention days
+xxl.job.logretentiondays=30
+

xxl-job/src/main/resources/application-dev.yml

@@ -14,21 +14,9 @@ spring:
   redis:
     port: 6379 #端口
     timeout: 3000ms #连接超时
-    host: 1.95.153.121 #单机
+    host: 1.95.170.86 #单机
-    password: zzkj@688737
+    password: 123456
     database: 0
-
-    #port: 6379 #端口
-    #timeout: 5000ms #连接超时
-    #host: 127.0.0.1 #单机
-    #password:
-    #database: 0
-    #集群 真实环境开启
-    #    record:
-    #      nodes:
-    #        - 127.0.0.1:6379
-    #        - 127.0.0.1:6380
-    #        - 127.0.0.1:6381
     lettuce:
       pool:
         max-active: 8 #连接池最大连接  默认8

xxl-job/src/main/resources/application-prod.yml

@@ -0,0 +1,38 @@
+server:
+  port: 8016
+
+spring:
+  jackson:
+    time-zone: GMT+8
+  application:
+    name: xxl-job
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  #Redis
+  redis:
+    port: 6379 #端口
+    timeout: 3000ms #连接超时
+    host: 1.95.153.121 #单机
+    password: zzkj@688737
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8 #连接池最大连接  默认8
+        max-idle: 8 #连接池中最大空闲连接 默认8
+        min-idle: 1 #连接池中最小空闲连接 默认0
+        max-wait: 2000ms #连接池最大阻塞等待时间 使用负值表示没有限制
+xxl:
+  job:
+    admin:
+      addresses: http://127.0.0.1:8015/job-admin
+    accessToken:
+    executor:
+      appname: job-executor-sample
+      address:
+      ip: 127.0.0.1
+      port: 9999
+      logpath: /home/hocloud/logs/xxl-job/
+      logretentiondays: 30
+