diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index 550b4369e3..07374c1bd5 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.32 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:0.3.32 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 0b37977879..6ca83f0570 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,19 +254,20 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -279,7 +280,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 80503e260f..2c1bea6b5d 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 6b9592dfa9..5e6e987825 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.98 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:0.3.98 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index b4c31f05cc..b6bd0a153e 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -366,13 +366,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 8cdc2c21db..3f338f611c 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java index 8a96e5ccbd..45c81d3a4c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java @@ -25,6 +25,10 @@ public class RedissonConfig { private String port; @Value("${spring.redis.password}") private String password; + @Value("${spring.redis.cluster.nodes}") + private String clusterNodesStr; + @Value("${spring.redis.cluster.max-redirects}") + private Integer rediTimes; @Bean @@ -41,10 +45,17 @@ public class RedissonConfig { config.setNettyThreads(NumConstant.FOUR); //redis://ip:port //redis的部署方式有单节点部署、主从方式部署、哨兵方式部署、集群方式部署 - config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port)); - config.useSingleServer().setPassword(password); - config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); - config.useSingleServer().setDatabase(NumConstant.TEN); + + //单机模式 + //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port)); + //config.useSingleServer().setPassword(password); + //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); + //config.useSingleServer().setDatabase(NumConstant.TEN); + + //集群模式 + config.useClusterServers().addNodeAddress(getClusterNodes()); + config.useClusterServers().setPassword(password); + config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); return Redisson.create(config); } catch (Exception e) { log.error("初始化redisson失败", e); @@ -53,4 +64,19 @@ public class RedissonConfig { } + /** + * @Description 获取集群节点列表 + * @param + * @return java.lang.String[] + * @author wxz + * @date 2021.08.23 15:21:28 + */ + private String[] getClusterNodes() { + log.info("RedssionClient::clusterNodes:{}", clusterNodesStr); + String[] nodeArray = clusterNodesStr.split(","); + for (int index = 0; index < nodeArray.length; index++) { + nodeArray[index] = "redis://".concat(nodeArray[index]); + } + return nodeArray; + } } \ No newline at end of file diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java index 29a416dfea..4998caabfd 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -17,7 +17,7 @@ public enum EnvEnum { LOCAL("local", "本地环境", "http://localhost:8080/api/"), DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"), TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"), - PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"), + PROD("prod", "生产环境", "https://epmet-cloud.pingyin.gov.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), ; diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 4edd602d7a..39f24f02b2 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.71 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:0.3.71 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index abf223c749..5460bb23e2 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -495,13 +495,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 83be8dc38a..c5f1f350ba 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -17,11 +17,19 @@ spring: encoding: UTF-8 basename: i18n/messages_common redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: gateway: locator: diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 4060745034..3b916bfad1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.92 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.92 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 51d95b3aa9..a3dac68ebe 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -537,96 +537,97 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_oper_customize_user EpmEt-db-UsEr - + epmet_message_user EpmEt-db-UsEr - + epmet_tduck EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index 9df581e38f..2026f7740e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -10,11 +10,19 @@ spring: application: name: data-aggregator-server redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: #MySQL druid: diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 7e1e17409e..880ef21129 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.210 + image: 172.22.76.12:5000/epmet-cloud-master/data-report-server:0.3.210 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 472525e5e7..bf83f38353 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -340,33 +340,34 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml index 8f7e9c61c4..7d3bf719af 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index a54a0348a6..c77f6d4a55 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.345 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.345 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index de703b486f..a17eae8b24 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -593,104 +593,105 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_gov_voice_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_cloud_viewer EpmEtclOUdvIEwEr@w - + epmet_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr - + epmet_oper_customize_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -716,7 +717,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index b159668ec9..6deb688138 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml index c6d7c0d65c..5016906b21 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:0.3.1 ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index 3788524034..ebe225d0fc 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,19 +287,20 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml index b39474ad3d..f48d8e63c1 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index 97adff5e39..e767ee6661 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.42 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.42 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 036a6c13bc..f67110672b 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,19 +270,20 @@ - + epmet_common_service_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml index 1900bf9009..477dfeead3 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml index 59feaf2641..06cca196a6 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml index caa3059dad..fccddcc9ce 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:0.0.20 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index c7c3165af0..668252d37d 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,19 +349,20 @@ - + epmet_third_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml index d4e3824a5d..afe59116c1 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index d1ccbc081a..242081bd76 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.72 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:0.0.72 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 7496a794ee..1f6e2bc0e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -318,19 +318,20 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -351,7 +352,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 true diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 31db2a802b..0d89f47e33 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index b1813f2660..063c1e5ecf 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.47 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.47 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 80377c1fba..53ddc219a6 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -250,19 +250,20 @@ - + epmet_job_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index e0cbb99af4..458982fe09 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 01efd03422..8f3837713f 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.57 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.57 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 2bef421caa..0e8397adba 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,19 +324,20 @@ - + epmet_message_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -364,7 +365,7 @@ - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 84dd154e10..19d6dc96f9 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index 2ae17d5c59..b7399db845 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.40 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.40 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index e1aa4893b4..c0b0457487 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,19 +269,20 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index 334e1e5629..e84091a0eb 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index d4ea51ca74..d08262ea9d 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.63 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.63 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 2dcda97101..ffddc18afe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,19 +290,20 @@ - + epmet_point_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -327,7 +328,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index b3fa3f8fe9..e9806784c0 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 7a2eb84297..926c73f926 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.183 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:0.0.183 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a319b011d2..ed2f9247af 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -371,19 +371,20 @@ - + epmet_third_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -411,7 +412,7 @@ + 172.22.76.20:9876;172.22.76.36:9876--> false diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 67b1a2740e..948b1b8962 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml index 9d6e4d7ae6..8a6178cc58 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.61 + image: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:0.3.61 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index b99aea3799..a2f53204d0 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,19 +248,20 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml index 94f07d888b..59e71c5674 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml index 8401604cf7..d617a09637 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.49 + image: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:0.3.49 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 5a7686b00c..cd3f252a47 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,13 +234,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml index f9d8a3caa6..5347bdcd70 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 8105b3917f..c354aad859 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.100 + image: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:0.3.100 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 0132b21cca..842d93afdf 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -301,19 +301,20 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -342,7 +343,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 06f9b57041..66d5572a7a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index 9e3c87d67b..a8ec9d4091 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47 + image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.47 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 22c67633ee..df05de4671 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,13 +248,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml index 88eabe8772..6b12841f19 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index 25ea20b467..606eaa4c90 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.156 + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.156 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 777645a3c1..113d2ab849 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -342,19 +342,20 @@ - + epmet_gov_org_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -382,7 +383,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 8039b75e00..d696460e96 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index fb855657d2..c7e0a648b2 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.96 + image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.96 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 88e598b596..bd0f041696 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -315,19 +315,20 @@ - + epmet_gov_project_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 22a2f25dc9..f9cda54e57 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index d5a6908cd6..13ebaa1ac5 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78 + image: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:0.3.78 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index acee6a8306..6122a645a9 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,19 +259,20 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml index 352c1d59e4..663d5aa60c 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index bc90323bc3..88b77506ed 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.22 + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.22 ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index f5e8264f49..bceb2b0d6f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -273,19 +273,20 @@ - + epmet_open_data_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -311,7 +312,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 6118195219..0238d28963 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml index 2d0c1631c4..80c4d5c4da 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24 + image: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:0.3.24 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 0089943bf7..bccccec07b 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,19 +244,20 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml index 9ed804a4a3..895a248847 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml index 9cc48783a1..84629b852f 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87 + image: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:0.3.87 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index f91fbdafc0..1040067586 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -292,19 +292,20 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index 15bb6eb0be..9ab17b97da 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml index 88f8deb3ed..b2800353ea 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.66 + image: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:0.3.66 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 8ab9300ff5..a99f0589f7 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -276,19 +276,20 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -316,7 +317,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 346506fb54..0e202f1678 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 354d8b1daa..d820764c73 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.130 + image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.130 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index bd232b3aac..8259c2c00e 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,19 +344,20 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -392,7 +393,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index b782d086dc..55917d1ebb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index 0405bc5164..30051964b4 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.34 + image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.34 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index f1ca66e4fe..9c82d50652 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,19 +265,20 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml index c8bfca6ee6..8a3e2fc9a2 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index 6ae227458d..0e2f7001cb 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.36 + image: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:0.3.36 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index bffb6788ab..2693c46720 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,13 +217,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml index 35219270ce..9af98d413e 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml index 9a31b60a8d..51c33b24b1 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23 + image: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:0.3.23 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 08c3603b30..3acecf8261 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,13 +238,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml index 7315ad7080..e7475106f6 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index 98ef0ddad1..864b5ce37f 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.54 + image: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:0.3.54 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index b2ebcfe1b7..a6687fca8c 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,13 +254,14 @@ prod 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml index 60f5366ff8..4fc19e9bd7 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index 253215b123..854b03311c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.83 + image: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:0.3.83 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index a15e120b72..9783658f30 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -295,19 +295,20 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index ee185fa822..b54ccda18b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml index ed0013dad4..fdb339ee69 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12 + image: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:0.3.12 ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index ae4858bceb..4984cc31bd 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,13 +217,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml index dc2eaa3898..01d9431086 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 3254a018e6..507b16bce0 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.32 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:0.3.32 ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index df86510504..9979244cda 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,13 +219,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml index 108c714da6..46786ebd6b 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index bc63091248..a1204d4fdf 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.218 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.218 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 0189ee8ce0..b7f839603e 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -362,19 +362,20 @@ - + epmet_user_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -394,7 +395,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 true diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index 37b078e18f..3415918d72 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL