From 2b06605f52ea47f7619c9ad3058c6601a41ca7f6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Mar 2022 17:20:38 +0800 Subject: [PATCH 01/98] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-prod.yml | 2 +- epmet-admin/epmet-admin-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-auth/pom.xml | 11 ++--- epmet-auth/src/main/resources/bootstrap.yml | 12 +++++- .../commons/tools/config/RedissonConfig.java | 34 +++++++++++++-- .../epmet/commons/tools/enums/EnvEnum.java | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../data-aggregator-server/pom.xml | 35 +++++++-------- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../data-report/data-report-server/pom.xml | 17 ++++---- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../data-statistical-server/pom.xml | 43 ++++++++++--------- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-activiti-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../common-service-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-message-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../gov-access/gov-access-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-mine/gov-mine-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../gov-project/gov-project-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../open-data-worker-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../oper-access/oper-access-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../oper-customize-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-hall/resi-hall-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-home/resi-home-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-partymember-server/pom.xml | 13 +++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- .../resi-voice/resi-voice-server/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/pom.xml | 11 ++--- .../src/main/resources/bootstrap.yml | 12 +++++- .../deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 15 ++++--- .../src/main/resources/bootstrap.yml | 12 +++++- 108 files changed, 701 insertions(+), 352 deletions(-) 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 From c6f409968f8f6f9cb9417cc841846860f64c5e57 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Mar 2022 21:43:30 +0800 Subject: [PATCH 02/98] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 2 +- .../data-aggregator-server/pom.xml | 24 +++++++-------- .../data-report/data-report-server/pom.xml | 6 ++-- .../data-statistical-server/pom.xml | 30 +++++++++---------- .../epmet-activiti-server/pom.xml | 2 +- .../common-service-server/pom.xml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-access/gov-access-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project/gov-project-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 2 +- .../open-data-worker-server/pom.xml | 2 +- .../oper-access/oper-access-server/pom.xml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 6ca83f0570..54b94fbc2e 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,7 +254,7 @@ - + epmet_admin_user EpmEt-db-UsEr diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index a3dac68ebe..c122d7146b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -537,82 +537,82 @@ - + 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 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index bf83f38353..ac444946ad 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -340,19 +340,19 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index a17eae8b24..45649b43a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -593,91 +593,91 @@ - + 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 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index ebe225d0fc..faaaade6b3 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,7 +287,7 @@ - + epmet_activiti_user EpmEt-db-UsEr 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 f67110672b..4775aa7fac 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,7 +270,7 @@ - + epmet_common_service_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 668252d37d..e707dcc287 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,7 +349,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 1f6e2bc0e7..cec7b1dda8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -318,7 +318,7 @@ - + epmet_heart_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 53ddc219a6..2f46e186e8 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -250,7 +250,7 @@ - + epmet_job_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 0e8397adba..bae71b616b 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,7 +324,7 @@ - + epmet_message_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index c0b0457487..44524d90c1 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,7 +269,7 @@ - + epmet_oss_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index ffddc18afe..1bf834ab60 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,7 +290,7 @@ - + epmet_point_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index ed2f9247af..1a58f3a112 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -371,7 +371,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index a2f53204d0..6fea816226 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,7 +248,7 @@ - + epmet_gov_access_user EpmEt-db-UsEr diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 842d93afdf..6cdded0d89 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -301,7 +301,7 @@ - + epmet_gov_issue_user EpmEt-db-UsEr diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 113d2ab849..3e6e8d8a4e 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -342,7 +342,7 @@ - + epmet_gov_org_user EpmEt-db-UsEr diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index bd0f041696..c36621603e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -315,7 +315,7 @@ - + epmet_gov_project_user EpmEt-db-UsEr diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 6122a645a9..ec12164113 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,7 +259,7 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 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 bceb2b0d6f..d08095611a 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,7 +273,7 @@ - + epmet_open_data_user EpmEt-db-UsEr diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index bccccec07b..9b7f52e619 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,7 +244,7 @@ - + epmet_oper_access_user EpmEt-db-UsEr diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 1040067586..f3b96e0605 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -292,7 +292,7 @@ - + epmet_oper_crm_user EpmEt-db-UsEr diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index a99f0589f7..37a462fccc 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -276,7 +276,7 @@ - + epmet_oper_customize_user EpmEt-db-UsEr diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 8259c2c00e..295d96bf3d 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,7 +344,7 @@ - + epmet_resi_group_user EpmEt-db-UsEr diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 9c82d50652..49fb44dcee 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,7 +265,7 @@ - + epmet_resi_guide_user EpmEt-db-UsEr diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 9783658f30..f57cdf2b7e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -295,7 +295,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b7f839603e..5f8ea08b03 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -362,7 +362,7 @@ - + epmet_user_user EpmEt-db-UsEr From 27d530d5653c23a7abd6449934e61d6a4c9db8c2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Mar 2022 21:59:53 +0800 Subject: [PATCH 03/98] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 2 +- .../data-aggregator-server/pom.xml | 24 +++++++-------- .../data-report/data-report-server/pom.xml | 6 ++-- .../data-statistical-server/pom.xml | 30 +++++++++---------- .../epmet-activiti-server/pom.xml | 2 +- .../common-service-server/pom.xml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-access/gov-access-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project/gov-project-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 2 +- .../open-data-worker-server/pom.xml | 2 +- .../oper-access/oper-access-server/pom.xml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 54b94fbc2e..1ea7064730 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,7 +254,7 @@ - + epmet_admin_user EpmEt-db-UsEr diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index c122d7146b..d23c937147 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -537,82 +537,82 @@ - + 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 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index ac444946ad..77837a6211 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -340,19 +340,19 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 45649b43a2..0e2b74de3a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -593,91 +593,91 @@ - + 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 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index faaaade6b3..a32fff4c2e 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,7 +287,7 @@ - + epmet_activiti_user EpmEt-db-UsEr 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 4775aa7fac..46a31388e5 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,7 +270,7 @@ - + epmet_common_service_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index e707dcc287..12e78056f6 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,7 +349,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index cec7b1dda8..9137b3c876 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -318,7 +318,7 @@ - + epmet_heart_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 2f46e186e8..45a8763312 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -250,7 +250,7 @@ - + epmet_job_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index bae71b616b..4169c3c635 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,7 +324,7 @@ - + epmet_message_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 44524d90c1..159fc1b4dd 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,7 +269,7 @@ - + epmet_oss_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 1bf834ab60..2eb45c1be8 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,7 +290,7 @@ - + epmet_point_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 1a58f3a112..c659b7dd3f 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -371,7 +371,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 6fea816226..813664c2ab 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,7 +248,7 @@ - + epmet_gov_access_user EpmEt-db-UsEr diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 6cdded0d89..c387bf9739 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -301,7 +301,7 @@ - + epmet_gov_issue_user EpmEt-db-UsEr diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 3e6e8d8a4e..efaf0b78f0 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -342,7 +342,7 @@ - + epmet_gov_org_user EpmEt-db-UsEr diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index c36621603e..68d9621164 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -315,7 +315,7 @@ - + epmet_gov_project_user EpmEt-db-UsEr diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index ec12164113..85ab84d3b1 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,7 +259,7 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 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 d08095611a..a8b36391d5 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,7 +273,7 @@ - + epmet_open_data_user EpmEt-db-UsEr diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 9b7f52e619..b71d52eb1d 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,7 +244,7 @@ - + epmet_oper_access_user EpmEt-db-UsEr diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index f3b96e0605..1f7e016c40 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -292,7 +292,7 @@ - + epmet_oper_crm_user EpmEt-db-UsEr diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 37a462fccc..61c677e7d6 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -276,7 +276,7 @@ - + epmet_oper_customize_user EpmEt-db-UsEr diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 295d96bf3d..548fdc11b5 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,7 +344,7 @@ - + epmet_resi_group_user EpmEt-db-UsEr diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 49fb44dcee..3d3629839c 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,7 +265,7 @@ - + epmet_resi_guide_user EpmEt-db-UsEr diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index f57cdf2b7e..8cbe819f51 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -295,7 +295,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 5f8ea08b03..3f9a4647d0 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -362,7 +362,7 @@ - + epmet_user_user EpmEt-db-UsEr From 00ba5142d37d65490c76a02a271f378f76e48c4b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Mar 2022 22:03:26 +0800 Subject: [PATCH 04/98] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/enums/EnvEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4998caabfd..32a986ba4a 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.pingyin.gov.cn/api/"), + PROD("prod", "平阴环境", "https://epmet-cloud.pingyin.gov.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), ; From c2050df42d19814ec024fbeef2910cb77bea44bd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 22 Mar 2022 14:24:09 +0800 Subject: [PATCH 05/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a1204d4fdf..e9e8eb41c5 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.218 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.219 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 3f9a4647d0..f97c20e82c 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.218 + 0.3.219 com.epmet epmet-user From b14c86036dfbc01d611f5f837a68c963ab64f056 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 24 Mar 2022 16:00:27 +0800 Subject: [PATCH 06/98] =?UTF-8?q?flyway=E8=84=9A=E6=9C=AC---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.26__caiji_resi.sql => V0.0.25__caiji_resi.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.26__caiji_resi.sql => V0.0.25__caiji_resi.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__caiji_resi.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__caiji_resi.sql From 7eb251f7ac4c7864455b10f102115b0a4115f504 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 24 Mar 2022 16:02:48 +0800 Subject: [PATCH 07/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e9e8eb41c5..a397b6d9b5 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.219 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.220 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 f97c20e82c..0b92e5ed2d 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.219 + 0.3.220 com.epmet epmet-user From 4c968acd56a0a794d1129cca3d494de166e9f9dd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 10:19:41 +0800 Subject: [PATCH 08/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-activiti-server/deploy/docker-compose-prod.yml | 2 +- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- .../oper-access-server/deploy/docker-compose-prod.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) 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 07374c1bd5..bcbf297092 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: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:0.3.32 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:0.3.33 ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 5e6e987825..e0c97bcc98 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: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:0.3.98 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:0.3.99 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 39f24f02b2..d7dc1093e4 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: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:0.3.71 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:0.3.72 ports: - "8080:8080" network_mode: host # 使用现有网络 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 3b916bfad1..a57732131e 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.92 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.93 ports: - "8114:8114" network_mode: host # 使用现有网络 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 880ef21129..ed67327778 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: 172.22.76.12:5000/epmet-cloud-master/data-report-server:0.3.210 + image: 172.22.76.12:5000/epmet-cloud-master/data-report-server:0.3.211 ports: - "8108:8108" network_mode: host # 使用现有网络 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 c77f6d4a55..7766f2e0cd 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.345 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.347 ports: - "8108:8108" network_mode: host # 使用现有网络 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 5016906b21..321cff228a 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: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:0.3.1 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:0.3.2 ports: - "8086:8086" network_mode: host # 使用现有网络 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 e767ee6661..e234b55a42 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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.42 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.43 ports: - "8103:8103" network_mode: host # 使用现有网络 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 fccddcc9ce..baece32bc9 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: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:0.0.20 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:0.0.21 ports: - "8113:8113" network_mode: host # 使用现有网络 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 242081bd76..0935707c40 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: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:0.0.72 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:0.0.73 ports: - "8111:8111" network_mode: host # 使用现有网络 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 063c1e5ecf..73833543b8 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: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.47 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.48 ports: - "8084:8084" network_mode: host # 使用现有网络 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 8f3837713f..6ad6bd2d3e 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: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.57 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.58 ports: - "8085:8085" network_mode: host # 使用现有网络 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 fc55d736f1..cd3da23a54 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.40 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.41 ports: - "8083:8083" network_mode: host # 使用现有网络 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 d08262ea9d..30de4f9ebb 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: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.63 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.64 ports: - "8112:8112" network_mode: host # 使用现有网络 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 926c73f926..96bb2a886d 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: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:0.0.183 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:0.0.184 ports: - "8110:8110" network_mode: host # 使用现有网络 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 8a6178cc58..a6393722de 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: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:0.3.61 + image: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:0.3.62 ports: - "8099:8099" network_mode: host # 使用现有网络 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 d617a09637..a122436e31 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: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:0.3.49 + image: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:0.3.50 ports: - "8097:8097" network_mode: host # 使用现有网络 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 c354aad859..77dc0be074 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: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:0.3.100 + image: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:0.3.101 ports: - "8101:8101" network_mode: host # 使用现有网络 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 a8ec9d4091..0406182d1b 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: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.47 + image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.48 ports: - "8098:8098" network_mode: host # 使用现有网络 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 606eaa4c90..4548f133a0 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: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.156 + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.157 ports: - "8092:8092" network_mode: host # 使用现有网络 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 c7e0a648b2..cf2d6f5be0 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: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.96 + image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.97 ports: - "8102:8102" network_mode: host # 使用现有网络 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 13ebaa1ac5..bba950faf9 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: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:0.3.78 + image: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:0.3.79 ports: - "8105:8105" network_mode: host # 使用现有网络 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 88b77506ed..586a1e5ad1 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: 172.22.76.12:5000/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.23 ports: - "8117:8117" network_mode: host # 使用现有网络 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 80c4d5c4da..a2d4e7f794 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: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:0.3.24 + image: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:0.3.25 ports: - "8093:8093" network_mode: host # 使用现有网络 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 84629b852f..d210538f5f 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: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:0.3.87 + image: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:0.3.88 ports: - "8090:8090" network_mode: host # 使用现有网络 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 b2800353ea..69d483b469 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: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:0.3.66 + image: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:0.3.67 ports: - "8089:8089" network_mode: host # 使用现有网络 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 d820764c73..0c07c90ef8 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: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.130 + image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.131 ports: - "8095:8095" network_mode: host # 使用现有网络 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 30051964b4..d74382a287 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: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.34 + image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.35 ports: - "8091:8091" network_mode: host # 使用现有网络 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 0e2f7001cb..b853d07c76 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: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:0.3.36 + image: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:0.3.37 ports: - "8100:8100" network_mode: host # 使用现有网络 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 51c33b24b1..ac4052fd31 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: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:0.3.23 + image: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:0.3.24 ports: - "8104:8104" network_mode: host # 使用现有网络 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 864b5ce37f..fffdaf7f57 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: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:0.3.54 + image: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:0.3.55 ports: - "8094:8094" network_mode: host # 使用现有网络 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 854b03311c..0a503023f7 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: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:0.3.83 + image: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:0.3.84 ports: - "8096:8096" network_mode: host # 使用现有网络 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 fdb339ee69..c238e77c5e 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: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:0.3.12 + image: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:0.3.13 ports: - "8106:8106" network_mode: host # 使用现有网络 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 507b16bce0..0e8bb5308f 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: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:0.3.32 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:0.3.33 ports: - "8107:8107" network_mode: host # 不会创建新的网络 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 a397b6d9b5..c4cd4578bd 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.220 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.221 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From da2a9301c577b1dedb881e411cb022ee2cc5b6ce Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 10:24:11 +0800 Subject: [PATCH 09/98] =?UTF-8?q?mysql=E6=95=B0=E6=8D=AE=E6=BA=90=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B9=B3=E9=98=B4=E6=AD=A3=E5=BC=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 2 +- .../data-aggregator-server/pom.xml | 24 +++++++-------- .../data-report/data-report-server/pom.xml | 6 ++-- .../data-statistical-server/pom.xml | 30 +++++++++---------- .../epmet-activiti-server/pom.xml | 2 +- .../common-service-server/pom.xml | 2 +- .../epmet-ext/epmet-ext-server/pom.xml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/pom.xml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-third/epmet-third-server/pom.xml | 2 +- .../gov-access/gov-access-server/pom.xml | 2 +- .../gov-issue/gov-issue-server/pom.xml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project/gov-project-server/pom.xml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 2 +- .../open-data-worker-server/pom.xml | 2 +- .../oper-access/oper-access-server/pom.xml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 1ea7064730..6ca83f0570 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,7 +254,7 @@ - + epmet_admin_user EpmEt-db-UsEr diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index d23c937147..a3dac68ebe 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -537,82 +537,82 @@ - + 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 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 77837a6211..bf83f38353 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -340,19 +340,19 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0e2b74de3a..a17eae8b24 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -593,91 +593,91 @@ - + 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 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index a32fff4c2e..ebe225d0fc 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -287,7 +287,7 @@ - + epmet_activiti_user EpmEt-db-UsEr 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 46a31388e5..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,7 +270,7 @@ - + epmet_common_service_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 12e78056f6..668252d37d 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,7 +349,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 9137b3c876..1f6e2bc0e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -318,7 +318,7 @@ - + epmet_heart_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 45a8763312..53ddc219a6 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -250,7 +250,7 @@ - + epmet_job_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 4169c3c635..0e8397adba 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,7 +324,7 @@ - + epmet_message_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 159fc1b4dd..c0b0457487 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -269,7 +269,7 @@ - + epmet_oss_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 2eb45c1be8..ffddc18afe 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,7 +290,7 @@ - + epmet_point_user EpmEt-db-UsEr diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index c659b7dd3f..ed2f9247af 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -371,7 +371,7 @@ - + epmet_third_user EpmEt-db-UsEr diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 813664c2ab..a2f53204d0 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,7 +248,7 @@ - + epmet_gov_access_user EpmEt-db-UsEr diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index c387bf9739..842d93afdf 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -301,7 +301,7 @@ - + epmet_gov_issue_user EpmEt-db-UsEr diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index e605608158..ea22420dd3 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -348,7 +348,7 @@ - + epmet_gov_org_user EpmEt-db-UsEr diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 801e8bb1cc..0d89d76b80 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -327,7 +327,7 @@ - + epmet_gov_project_user EpmEt-db-UsEr diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 85ab84d3b1..6122a645a9 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,7 +259,7 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 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 a8b36391d5..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,7 +273,7 @@ - + epmet_open_data_user EpmEt-db-UsEr diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index b71d52eb1d..bccccec07b 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,7 +244,7 @@ - + epmet_oper_access_user EpmEt-db-UsEr diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 1f7e016c40..1040067586 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -292,7 +292,7 @@ - + epmet_oper_crm_user EpmEt-db-UsEr diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 61c677e7d6..a99f0589f7 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -276,7 +276,7 @@ - + epmet_oper_customize_user EpmEt-db-UsEr diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 548fdc11b5..8259c2c00e 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,7 +344,7 @@ - + epmet_resi_group_user EpmEt-db-UsEr diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 3d3629839c..9c82d50652 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,7 +265,7 @@ - + epmet_resi_guide_user EpmEt-db-UsEr diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 8cbe819f51..9783658f30 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -295,7 +295,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 0b92e5ed2d..f3b2169454 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -362,7 +362,7 @@ - + epmet_user_user EpmEt-db-UsEr From 694201b84f101a62a26ae13791d75e3fd9f418de Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 17:06:58 +0800 Subject: [PATCH 10/98] =?UTF-8?q?mariadb=E4=B8=8D=E6=94=AF=E6=8C=81innodb?= =?UTF-8?q?=E5=85=A8=E6=96=87=E7=B4=A2=E5=BC=95=EF=BC=8C=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E7=94=A8like=E4=BB=A3=E6=9B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcUserDemandRecDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 02432b91c5..1cfd4b51d3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -328,7 +328,7 @@ AND ( r.DEMAND_USER_NAME = #{keyword} - OR match(r.CONTENT) against (#{keyword} in boolean mode ) + OR r.CONTENT like CONCAT('%',#{keyword},'%') OR s.SERVER_NAME like CONCAT('%',#{keyword},'%') ) From b3209427581d6839169566070e5952911b384536 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 18:48:09 +0800 Subject: [PATCH 11/98] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dflyway=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ser_reg_grid_rec.sql => V0.0.26__create_user_reg_grid_rec.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-user/epmet-user-server/src/main/resources/db/migration/{V0.0.25__create_user_reg_grid_rec.sql => V0.0.26__create_user_reg_grid_rec.sql} (100%) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__create_user_reg_grid_rec.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__create_user_reg_grid_rec.sql similarity index 100% rename from epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__create_user_reg_grid_rec.sql rename to epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.26__create_user_reg_grid_rec.sql From 24d09741df77739df661359f77aac27d297ec798 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 19:01:49 +0800 Subject: [PATCH 12/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c4cd4578bd..c9c7128b51 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.221 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.222 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 71f6971e63bcd34b09ddcb3908b169363f61abd2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 19:46:26 +0800 Subject: [PATCH 13/98] =?UTF-8?q?open-data=E6=9C=8D=E5=8A=A1=E7=9B=B4?= =?UTF-8?q?=E8=BF=9E=E4=B8=AD=E9=97=B4=E5=BA=93=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bceb2b0d6f..e897494ba1 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,10 +273,10 @@ - + epmet_open_data_user - EpmEt-db-UsEr + EpmEtOpEndAtArw_)$ 0 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 From ab9f6b5102f5776f204458e00f059dfeaacd5e24 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 26 Mar 2022 19:46:39 +0800 Subject: [PATCH 14/98] =?UTF-8?q?open-data=E6=9C=8D=E5=8A=A1=E7=9B=B4?= =?UTF-8?q?=E8=BF=9E=E4=B8=AD=E9=97=B4=E5=BA=93=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 586a1e5ad1..cf431cd08a 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: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.23 + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.24 ports: - "8117:8117" network_mode: host # 使用现有网络 From a19622ca071fbe1a4afadde839ff7334516bf0b4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 27 Mar 2022 18:16:05 +0800 Subject: [PATCH 15/98] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=B0=83=E6=95=B4=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cf431cd08a..c8506a8e78 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: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.24 + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.25 ports: - "8117:8117" network_mode: host # 使用现有网络 From c5901e4e3782e4926974c9e751259fd3463218ff Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 27 Mar 2022 21:44:48 +0800 Subject: [PATCH 16/98] =?UTF-8?q?id=20=E9=87=8D=E5=A4=8D=20=E8=AF=95?= =?UTF-8?q?=E4=B8=8B=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c9c7128b51..6a2c3aa278 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.222 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.223 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 1473c9e353fab9dfbefe53a2dc98a8087c4c0ead Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 27 Mar 2022 21:54:32 +0800 Subject: [PATCH 17/98] =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c8506a8e78..6e316a4503 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: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.25 + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.26 ports: - "8117:8117" network_mode: host # 使用现有网络 From dcca44196ab451c8beb30d6dfb5ed44096b08af9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 10:38:28 +0800 Subject: [PATCH 18/98] =?UTF-8?q?stats=20=E9=85=8D=E7=BD=AEdriud=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=B1=A0=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7766f2e0cd..955e7975c7 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.347 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.348 ports: - "8108:8108" network_mode: host # 使用现有网络 From 4c901f8d44b5be7432182e8f03351865be5c94de Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 11:11:13 +0800 Subject: [PATCH 19/98] =?UTF-8?q?stats=20=E9=85=8D=E7=BD=AEdriud=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E6=B1=A0=20=E4=BF=AE=E6=94=B9up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 955e7975c7..bf42a66f8c 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.348 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.349 ports: - "8108:8108" network_mode: host # 使用现有网络 From febaafe7179c449ca2f6333d7cc084a85ae7a86f Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 14:09:21 +0800 Subject: [PATCH 20/98] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8BworerId=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-prod.yml | 2 +- .../src/main/java/com/epmet/MySequence.java | 204 ++++++++++++++++++ .../main/java/com/epmet/UserApplication.java | 1 + .../src/main/resources/bootstrap.yml | 3 - 4 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java 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 6a2c3aa278..18e9ab22c9 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.223 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.224 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java new file mode 100644 index 0000000000..2b756e4ac3 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2011-2021, baomidou (jobob@qq.com). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.epmet; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.SystemClock; +import org.apache.ibatis.logging.Log; +import org.apache.ibatis.logging.LogFactory; + +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.concurrent.ThreadLocalRandom; + +/** + * 分布式高效有序 ID 生产黑科技(sequence) + * + *

优化开源项目：https://gitee.com/yu120/sequence

+ * + * @author hubin + * @since 2016-08-18 + */ +public class MySequence { + + private static final Log logger = LogFactory.getLog(MySequence.class); + /** + * 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动） + */ + private final long twepoch = 1288834974657L; + /** + * 机器标识位数 + */ + private final long workerIdBits = 5L; + private final long datacenterIdBits = 5L; + private final long maxWorkerId = -1L ^ (-1L << workerIdBits); + private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); + /** + * 毫秒内自增位 + */ + private final long sequenceBits = 12L; + private final long workerIdShift = sequenceBits; + private final long datacenterIdShift = sequenceBits + workerIdBits; + /** + * 时间戳左移动位 + */ + private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; + private final long sequenceMask = -1L ^ (-1L << sequenceBits); + + private final long workerId; + + /** + * 数据标识 ID 部分 + */ + private final long datacenterId; + /** + * 并发控制 + */ + private long sequence = 0L; + /** + * 上次生产 ID 时间戳 + */ + private long lastTimestamp = -1L; + + public MySequence() { + this.datacenterId = getDatacenterId(maxDatacenterId); + this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); + logger.warn("MySequence datacenterId:"+this.datacenterId+";workerId:"+this.workerId); + } + + /** + * 有参构造器 + * + * @param workerId 工作机器 ID + * @param datacenterId 序列号 + */ + public MySequence(long workerId, long datacenterId) { + Assert.isFalse(workerId > maxWorkerId || workerId < 0, + String.format("MySequence worker Id can't be greater than %d or less than 0", maxWorkerId)); + Assert.isFalse(datacenterId > maxDatacenterId || datacenterId < 0, + String.format("MySequence datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); + this.workerId = workerId; + this.datacenterId = datacenterId; + } + + /** + * 获取 maxWorkerId + */ + protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) { + StringBuilder mpid = new StringBuilder(); + mpid.append(datacenterId); + String name = ManagementFactory.getRuntimeMXBean().getName(); + logger.warn("MySequence getMaxWorkerId name:"+name); + if (StringUtils.isNotBlank(name)) { + /* + * GET jvmPid + */ + mpid.append(name.split(StringPool.AT)[0]); + } + /* + * MAC + PID 的 hashcode 获取16个低位 + */ + return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1); + } + + /** + * 数据标识id部分 + */ + protected static long getDatacenterId(long maxDatacenterId) { + long id = 0L; + try { + InetAddress ip = InetAddress.getLocalHost(); + NetworkInterface network = NetworkInterface.getByInetAddress(ip); + logger.warn("MySequence ip:"+JSON.toJSONString(ip)+";network: "+JSON.toJSONString(network)); + if (network == null) { + id = 1L; + logger.warn("MySequen cenetwork ==null "); + } else { + byte[] mac = network.getHardwareAddress(); + if (null != mac) { + id = ((0x000000FF & (long) mac[mac.length - 2]) | (0x0000FF00 & (((long) mac[mac.length - 1]) << 8))) >> 6; + id = id % (maxDatacenterId + 1); + } + } + } catch (Exception e) { + logger.warn(" getDatacenterId: " + e.getMessage()); + } + return id; + } + + /** + * 获取下一个 ID + * + * @return 下一个 ID + */ + public synchronized long nextId() { + long timestamp = timeGen(); + //闰秒 + if (timestamp < lastTimestamp) { + long offset = lastTimestamp - timestamp; + if (offset <= 5) { + try { + wait(offset << 1); + timestamp = timeGen(); + if (timestamp < lastTimestamp) { + throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); + } + } catch (Exception e) { + throw new RuntimeException(e); + } + } else { + throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); + } + } + + if (lastTimestamp == timestamp) { + // 相同毫秒内，序列号自增 + sequence = (sequence + 1) & sequenceMask; + if (sequence == 0) { + // 同一毫秒的序列数已经达到最大 + timestamp = tilNextMillis(lastTimestamp); + } + } else { + // 不同毫秒内，序列号置为 1 - 3 随机数 + sequence = ThreadLocalRandom.current().nextLong(1, 3); + } + + lastTimestamp = timestamp; + + // 时间戳部分 | 数据中心部分 | 机器标识部分 | 序列号部分 + return ((timestamp - twepoch) << timestampLeftShift) + | (datacenterId << datacenterIdShift) + | (workerId << workerIdShift) + | sequence; + } + + protected long tilNextMillis(long lastTimestamp) { + long timestamp = timeGen(); + while (timestamp <= lastTimestamp) { + timestamp = timeGen(); + } + return timestamp; + } + + protected long timeGen() { + return SystemClock.now(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index caf839f79a..6a741f0338 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -31,6 +31,7 @@ public class UserApplication { public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); + MySequence identifierGenerator = new MySequence(); } } 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 90eefe8a47..2dd7087887 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -114,9 +114,6 @@ mybatis-plus: field-strategy: NOT_NULL #驼峰下划线转换 column-underline: true - worker-id: ${random.int(1,31)} - datacenter-id: ${random.int(1,31)} - banner: false #原生配置 configuration: From e318a525b35dc9dc133c164c510cbd7e62c029d1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 14:15:52 +0800 Subject: [PATCH 21/98] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8BworerId=20up2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/MySequence.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java index 2b756e4ac3..a0e5cebf60 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.SystemClock; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; @@ -36,6 +37,7 @@ import java.util.concurrent.ThreadLocalRandom; * @author hubin * @since 2016-08-18 */ +@Slf4j public class MySequence { private static final Log logger = LogFactory.getLog(MySequence.class); @@ -80,7 +82,7 @@ public class MySequence { public MySequence() { this.datacenterId = getDatacenterId(maxDatacenterId); this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); - logger.warn("MySequence datacenterId:"+this.datacenterId+";workerId:"+this.workerId); + log.info("MySequence datacenterId:"+this.datacenterId+";workerId:"+this.workerId); } /** @@ -105,7 +107,7 @@ public class MySequence { StringBuilder mpid = new StringBuilder(); mpid.append(datacenterId); String name = ManagementFactory.getRuntimeMXBean().getName(); - logger.warn("MySequence getMaxWorkerId name:"+name); + log.info("MySequence getMaxWorkerId name:"+name); if (StringUtils.isNotBlank(name)) { /* * GET jvmPid @@ -126,10 +128,10 @@ public class MySequence { try { InetAddress ip = InetAddress.getLocalHost(); NetworkInterface network = NetworkInterface.getByInetAddress(ip); - logger.warn("MySequence ip:"+JSON.toJSONString(ip)+";network: "+JSON.toJSONString(network)); + log.info("MySequence ip:"+JSON.toJSONString(ip)+";network: "+JSON.toJSONString(network)); if (network == null) { id = 1L; - logger.warn("MySequen cenetwork ==null "); + log.info("MySequen cenetwork ==null "); } else { byte[] mac = network.getHardwareAddress(); if (null != mac) { From d6f7b66fd331cf3a8ea8375f62b3bdfa6bc63744 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 14:16:25 +0800 Subject: [PATCH 22/98] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8BworerId=20up2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 18e9ab22c9..e63e7c4417 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.224 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.225 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From ae52800029d7883374551ea72173bc2909c34b4e Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 14:29:36 +0800 Subject: [PATCH 23/98] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=8BworerId=20up3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-prod.yml | 2 +- .../src/main/java/com/epmet/UserApplication.java | 1 + .../java/com/epmet/{ => util}/MySequence.java | 15 +++++++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) rename epmet-user/epmet-user-server/src/main/java/com/epmet/{ => util}/MySequence.java (91%) 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 e63e7c4417..e23664306f 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.225 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.226 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 6a741f0338..6f90b55f0a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -8,6 +8,7 @@ package com.epmet; +import com.epmet.util.MySequence; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java similarity index 91% rename from epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java rename to epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java index a0e5cebf60..776f3dba5d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/MySequence.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.epmet; +package com.epmet.util; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.SystemClock; +import com.epmet.commons.tools.utils.HttpClientManager; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; @@ -82,7 +83,9 @@ public class MySequence { public MySequence() { this.datacenterId = getDatacenterId(maxDatacenterId); this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); - log.info("MySequence datacenterId:"+this.datacenterId+";workerId:"+this.workerId); + String msg = "MySequence datacenterId:" + this.datacenterId + ";workerId:" + this.workerId; + log.info(msg); + HttpClientManager.getInstance().sendAlarmMsg(msg); } /** @@ -107,7 +110,9 @@ public class MySequence { StringBuilder mpid = new StringBuilder(); mpid.append(datacenterId); String name = ManagementFactory.getRuntimeMXBean().getName(); - log.info("MySequence getMaxWorkerId name:"+name); + String msg = "MySequence getMaxWorkerId name:" + name; + log.info(msg); + HttpClientManager.getInstance().sendAlarmMsg(msg); if (StringUtils.isNotBlank(name)) { /* * GET jvmPid @@ -128,7 +133,9 @@ public class MySequence { try { InetAddress ip = InetAddress.getLocalHost(); NetworkInterface network = NetworkInterface.getByInetAddress(ip); - log.info("MySequence ip:"+JSON.toJSONString(ip)+";network: "+JSON.toJSONString(network)); + String msg = "MySequence ip:" + JSON.toJSONString(ip) + ";network: " + JSON.toJSONString(network); + log.info(msg); + HttpClientManager.getInstance().sendAlarmMsg(msg); if (network == null) { id = 1L; log.info("MySequen cenetwork ==null "); From 54f84ec71e815114f4b8ec39dbaaca117867ee00 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 15:54:55 +0800 Subject: [PATCH 24/98] =?UTF-8?q?id=E7=94=9F=E6=88=90=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e23664306f..ab58b80e0b 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.226 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.227 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 3e4da121d47e644cd6b4ee17976b5c8ae85cd1f0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 16:10:33 +0800 Subject: [PATCH 25/98] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=B1=A0=E4=B8=8D?= =?UTF-8?q?=E5=A4=9F=E7=94=A8=E9=97=AE=E9=A2=98up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bf42a66f8c..acacb0bfab 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.349 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.350 ports: - "8108:8108" network_mode: host # 使用现有网络 From de48550613c403fc5eec0b47b5620dbf99801579 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 28 Mar 2022 17:52:55 +0800 Subject: [PATCH 26/98] =?UTF-8?q?id=E5=86=B2=E7=AA=81=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6ad6bd2d3e..8425419bc1 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: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.58 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.59 ports: - "8085:8085" network_mode: host # 使用现有网络 From 6862e81dc3da10577eb1762bb07b6c0e208051e3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 17:20:20 +0800 Subject: [PATCH 27/98] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AEuser=20org=20agg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 a57732131e..f29d2d2bfe 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.93 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.94 ports: - "8114:8114" network_mode: host # 使用现有网络 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 4548f133a0..53d05e2ba6 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: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.157 + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.158 ports: - "8092:8092" network_mode: host # 使用现有网络 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 ab58b80e0b..007596c9be 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.227 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.228 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From a69344769428619530f53ffa0c8e119dfdf65a8b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 17:59:49 +0800 Subject: [PATCH 28/98] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=84=E7=BB=87like=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f29d2d2bfe..defaaf410d 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.94 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.95 ports: - "8114:8114" network_mode: host # 使用现有网络 From c43ee01717f369fbcf8b5865199a02f9ad0dd94f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 18:07:06 +0800 Subject: [PATCH 29/98] up --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 defaaf410d..241776903c 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.95 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.96 ports: - "8114:8114" network_mode: host # 使用现有网络 From 3ab65c1f45236c2c51d8235561789ceaf3a29028 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 21:23:03 +0800 Subject: [PATCH 30/98] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84bug=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 241776903c..8788ec5e8e 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.96 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.97 ports: - "8114:8114" network_mode: host # 使用现有网络 From ab22020856ba9ad886ebccfd95e5955983d73677 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 21:33:34 +0800 Subject: [PATCH 31/98] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84bug=20up2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8788ec5e8e..f90dabc8e7 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.97 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.98 ports: - "8114:8114" network_mode: host # 使用现有网络 From 85d29f93266c0aa53a48fd6d6a2e0b3e5d5ffad2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 21:56:38 +0800 Subject: [PATCH 32/98] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84bug=20heihei=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f90dabc8e7..6a04891aa8 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.98 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.99 ports: - "8114:8114" network_mode: host # 使用现有网络 From 8f6cbdc6b2a2d58daf3ca394fdbb31d9b1d4132b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 22:01:08 +0800 Subject: [PATCH 33/98] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84bug=20heihei=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6a04891aa8..188cafb0eb 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.99 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.100 ports: - "8114:8114" network_mode: host # 使用现有网络 From 474e335944bfd7f621f0733946980fab895dd17d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 29 Mar 2022 22:29:58 +0800 Subject: [PATCH 34/98] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=20=E5=AD=94=E6=9D=91=E7=9A=84?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E4=B8=8D=E5=AF=B9=20=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84bug=E6=8E=92=E9=99=A4=E5=85=9A=E6=80=BB=E6=94=AF?= =?UTF-8?q?=E8=BF=99..=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 188cafb0eb..d4d42fa9bb 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.100 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.101 ports: - "8114:8114" network_mode: host # 使用现有网络 From d35b53b385647ba5c3111ecb3cd8265f2002acfd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 1 Apr 2022 09:38:45 +0800 Subject: [PATCH 35/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 acacb0bfab..ff25c22467 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.350 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.351 ports: - "8108:8108" network_mode: host # 使用现有网络 From 46429cdae7815ec4d98d3edfe2e12c6dc5cd38f0 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 1 Apr 2022 14:02:13 +0800 Subject: [PATCH 36/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 007596c9be..03e2684534 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.228 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.229 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 0374926891508798fc4c8ce0a4a34038297a90de Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 1 Apr 2022 15:42:05 +0800 Subject: [PATCH 37/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ff25c22467..25fa458230 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.351 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.352 ports: - "8108:8108" network_mode: host # 使用现有网络 From 36ff04b99f07e10602013a7e4e324548026c0911 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 2 Apr 2022 17:04:20 +0800 Subject: [PATCH 38/98] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 e234b55a42..982e87911d 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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.43 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.44 ports: - "8103:8103" network_mode: host # 使用现有网络 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 0406182d1b..ec3941cb03 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: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.48 + image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.49 ports: - "8098:8098" network_mode: host # 使用现有网络 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 53d05e2ba6..b8ec21c82b 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: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.158 + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.159 ports: - "8092:8092" network_mode: host # 使用现有网络 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 d74382a287..d551d143e6 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: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.35 + image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.36 ports: - "8091:8091" network_mode: host # 使用现有网络 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 7426c50aea..a6a31f8b4e 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.229 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.230 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From cfd63497f05b29f7cb8bfe6d5c8705dae08bf2ea Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 4 Apr 2022 09:43:23 +0800 Subject: [PATCH 39/98] =?UTF-8?q?=E8=8E=B7=E5=8F=96header=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=AF=BC=E8=87=B4=E4=B8=9A=E5=8A=A1=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 982e87911d..a4abc38030 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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.44 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.45 ports: - "8103:8103" network_mode: host # 使用现有网络 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 a6a31f8b4e..3250c5a57a 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.230 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.231 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From e31b409225e526fecd9122e07b91ccc40ce2bbe3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 4 Apr 2022 09:50:59 +0800 Subject: [PATCH 40/98] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/UserApplication.java | 2 - .../main/java/com/epmet/util/MySequence.java | 213 ------------------ 2 files changed, 215 deletions(-) delete mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 6f90b55f0a..caf839f79a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -8,7 +8,6 @@ package com.epmet; -import com.epmet.util.MySequence; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; @@ -32,7 +31,6 @@ public class UserApplication { public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); - MySequence identifierGenerator = new MySequence(); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java deleted file mode 100644 index 776f3dba5d..0000000000 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Copyright (c) 2011-2021, baomidou (jobob@qq.com). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.epmet.util; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.SystemClock; -import com.epmet.commons.tools.utils.HttpClientManager; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.logging.Log; -import org.apache.ibatis.logging.LogFactory; - -import java.lang.management.ManagementFactory; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.concurrent.ThreadLocalRandom; - -/** - * 分布式高效有序 ID 生产黑科技(sequence) - * - *

优化开源项目：https://gitee.com/yu120/sequence

- * - * @author hubin - * @since 2016-08-18 - */ -@Slf4j -public class MySequence { - - private static final Log logger = LogFactory.getLog(MySequence.class); - /** - * 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动） - */ - private final long twepoch = 1288834974657L; - /** - * 机器标识位数 - */ - private final long workerIdBits = 5L; - private final long datacenterIdBits = 5L; - private final long maxWorkerId = -1L ^ (-1L << workerIdBits); - private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); - /** - * 毫秒内自增位 - */ - private final long sequenceBits = 12L; - private final long workerIdShift = sequenceBits; - private final long datacenterIdShift = sequenceBits + workerIdBits; - /** - * 时间戳左移动位 - */ - private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; - private final long sequenceMask = -1L ^ (-1L << sequenceBits); - - private final long workerId; - - /** - * 数据标识 ID 部分 - */ - private final long datacenterId; - /** - * 并发控制 - */ - private long sequence = 0L; - /** - * 上次生产 ID 时间戳 - */ - private long lastTimestamp = -1L; - - public MySequence() { - this.datacenterId = getDatacenterId(maxDatacenterId); - this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); - String msg = "MySequence datacenterId:" + this.datacenterId + ";workerId:" + this.workerId; - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - } - - /** - * 有参构造器 - * - * @param workerId 工作机器 ID - * @param datacenterId 序列号 - */ - public MySequence(long workerId, long datacenterId) { - Assert.isFalse(workerId > maxWorkerId || workerId < 0, - String.format("MySequence worker Id can't be greater than %d or less than 0", maxWorkerId)); - Assert.isFalse(datacenterId > maxDatacenterId || datacenterId < 0, - String.format("MySequence datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); - this.workerId = workerId; - this.datacenterId = datacenterId; - } - - /** - * 获取 maxWorkerId - */ - protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) { - StringBuilder mpid = new StringBuilder(); - mpid.append(datacenterId); - String name = ManagementFactory.getRuntimeMXBean().getName(); - String msg = "MySequence getMaxWorkerId name:" + name; - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - if (StringUtils.isNotBlank(name)) { - /* - * GET jvmPid - */ - mpid.append(name.split(StringPool.AT)[0]); - } - /* - * MAC + PID 的 hashcode 获取16个低位 - */ - return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1); - } - - /** - * 数据标识id部分 - */ - protected static long getDatacenterId(long maxDatacenterId) { - long id = 0L; - try { - InetAddress ip = InetAddress.getLocalHost(); - NetworkInterface network = NetworkInterface.getByInetAddress(ip); - String msg = "MySequence ip:" + JSON.toJSONString(ip) + ";network: " + JSON.toJSONString(network); - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - if (network == null) { - id = 1L; - log.info("MySequen cenetwork ==null "); - } else { - byte[] mac = network.getHardwareAddress(); - if (null != mac) { - id = ((0x000000FF & (long) mac[mac.length - 2]) | (0x0000FF00 & (((long) mac[mac.length - 1]) << 8))) >> 6; - id = id % (maxDatacenterId + 1); - } - } - } catch (Exception e) { - logger.warn(" getDatacenterId: " + e.getMessage()); - } - return id; - } - - /** - * 获取下一个 ID - * - * @return 下一个 ID - */ - public synchronized long nextId() { - long timestamp = timeGen(); - //闰秒 - if (timestamp < lastTimestamp) { - long offset = lastTimestamp - timestamp; - if (offset <= 5) { - try { - wait(offset << 1); - timestamp = timeGen(); - if (timestamp < lastTimestamp) { - throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } else { - throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); - } - } - - if (lastTimestamp == timestamp) { - // 相同毫秒内，序列号自增 - sequence = (sequence + 1) & sequenceMask; - if (sequence == 0) { - // 同一毫秒的序列数已经达到最大 - timestamp = tilNextMillis(lastTimestamp); - } - } else { - // 不同毫秒内，序列号置为 1 - 3 随机数 - sequence = ThreadLocalRandom.current().nextLong(1, 3); - } - - lastTimestamp = timestamp; - - // 时间戳部分 | 数据中心部分 | 机器标识部分 | 序列号部分 - return ((timestamp - twepoch) << timestampLeftShift) - | (datacenterId << datacenterIdShift) - | (workerId << workerIdShift) - | sequence; - } - - protected long tilNextMillis(long lastTimestamp) { - long timestamp = timeGen(); - while (timestamp <= lastTimestamp) { - timestamp = timeGen(); - } - return timestamp; - } - - protected long timeGen() { - return SystemClock.now(); - } - -} From 8d89aef6451674faa1829876633cb92e86f8299a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 4 Apr 2022 14:04:48 +0800 Subject: [PATCH 41/98] =?UTF-8?q?=E4=B8=BB=E9=94=AE=E5=86=B2=E7=AA=81=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 8425419bc1..47abc090da 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: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.59 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.60 ports: - "8085:8085" network_mode: host # 使用现有网络 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 cd3da23a54..48bdf5a464 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.41 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.42 ports: - "8083:8083" network_mode: host # 使用现有网络 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 30de4f9ebb..607a02c189 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: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.64 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.65 ports: - "8112:8112" network_mode: host # 使用现有网络 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 cf2d6f5be0..5492920fdc 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: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.97 + image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.98 ports: - "8102:8102" network_mode: host # 使用现有网络 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 0c07c90ef8..aee09014c4 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: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.131 + image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.132 ports: - "8095:8095" network_mode: host # 使用现有网络 From c7edec6fb272dd538d78202d44edff0f5c99c44d Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 10:45:43 +0800 Subject: [PATCH 42/98] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a4abc38030..1646e98fbc 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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.45 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.46 ports: - "8103:8103" network_mode: host # 使用现有网络 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 73833543b8..70f944f76f 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: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.48 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.49 ports: - "8084:8084" network_mode: host # 使用现有网络 From 38637f0b03252be18e567d5fbb46232a6855804b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 6 Apr 2022 14:08:52 +0800 Subject: [PATCH 43/98] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83compo?= =?UTF-8?q?se=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9B=BF=E6=8D=A2=E4=B8=BAversion?= =?UTF-8?q?=5Fplaceholder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml | 2 +- epmet-auth/deploy/docker-compose-prod.yml | 2 +- epmet-gateway/deploy/docker-compose-prod.yml | 2 +- .../data-aggregator-server/deploy/docker-compose-prod.yml | 2 +- .../data-report-server/deploy/docker-compose-prod.yml | 2 +- .../data-statistical-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-activiti-server/deploy/docker-compose-prod.yml | 2 +- .../common-service-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-job/epmet-job-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-message-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-point-server/deploy/docker-compose-prod.yml | 2 +- .../epmet-third-server/deploy/docker-compose-prod.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-prod.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-prod.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-prod.yml | 2 +- .../gov-mine/gov-mine-server/deploy/docker-compose-prod.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 2 +- .../gov-project-server/deploy/docker-compose-prod.yml | 2 +- .../gov-voice/gov-voice-server/deploy/docker-compose-prod.yml | 2 +- .../open-data-worker-server/deploy/docker-compose-prod.yml | 2 +- .../oper-access-server/deploy/docker-compose-prod.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-prod.yml | 2 +- .../oper-customize-server/deploy/docker-compose-prod.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-prod.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-prod.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-prod.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-prod.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-prod.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-prod.yml | 2 +- .../resi-voice/resi-voice-server/deploy/docker-compose-prod.yml | 2 +- epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) 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 bcbf297092..144a5981b8 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: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:0.3.33 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index e0c97bcc98..4ecb879987 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: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:0.3.99 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index d7dc1093e4..5d816481ca 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: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:0.3.72 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 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 d4d42fa9bb..b87ef0c6cb 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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:0.3.101 + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:version_placeholder ports: - "8114:8114" network_mode: host # 使用现有网络 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 ed67327778..b0e1c568ca 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: 172.22.76.12:5000/epmet-cloud-master/data-report-server:0.3.211 + image: 172.22.76.12:5000/epmet-cloud-master/data-report-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 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 25fa458230..e5b91a4047 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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:0.3.352 + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 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 321cff228a..68f7204751 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: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:0.3.2 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 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 1646e98fbc..edfc1c6079 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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:0.3.46 + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 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 baece32bc9..6deab74c31 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: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:0.0.21 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 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 0935707c40..bf036b9407 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: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:0.0.73 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 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 70f944f76f..2be5015693 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: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:0.3.49 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 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 47abc090da..ab42b58b6e 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: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:0.3.60 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 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 48bdf5a464..f0a5f8a9fc 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 @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:0.3.42 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 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 607a02c189..745bbfe29b 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: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:0.0.65 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 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 96bb2a886d..c8bf5ef575 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: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:0.0.184 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 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 a6393722de..c5446619cb 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: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:0.3.62 + image: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 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 a122436e31..51a6108908 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: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:0.3.50 + image: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 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 77dc0be074..4cdd39a115 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: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:0.3.101 + image: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 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 ec3941cb03..72a50c907a 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: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:0.3.49 + image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 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 b8ec21c82b..2cdc444ca9 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: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:0.3.159 + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 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 5492920fdc..0c0da1b5a9 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: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:0.3.98 + image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:version_placeholder ports: - "8102:8102" network_mode: host # 使用现有网络 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 bba950faf9..022c320db9 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: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:0.3.79 + image: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 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 6e316a4503..9c78daf88c 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: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:0.3.26 + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:version_placeholder ports: - "8117:8117" network_mode: host # 使用现有网络 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 a2d4e7f794..ac34113446 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: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:0.3.25 + image: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 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 d210538f5f..9da8fcd581 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: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:0.3.88 + image: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 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 69d483b469..dcc4a22fcb 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: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:0.3.67 + image: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 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 aee09014c4..f2fb6dfd81 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: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:0.3.132 + image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 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 d551d143e6..ba9da65f5b 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: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:0.3.36 + image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 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 b853d07c76..2edd4724fa 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: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:0.3.37 + image: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 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 ac4052fd31..f254608885 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: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:0.3.24 + image: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 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 fffdaf7f57..2459fdf560 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: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:0.3.55 + image: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 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 0a503023f7..e767f76976 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: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:0.3.84 + image: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 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 c238e77c5e..ca018d3f2c 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: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:0.3.13 + image: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 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 0e8bb5308f..f889de6489 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: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:0.3.33 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 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 3250c5a57a..04061083d4 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: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:0.3.231 + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 753245672e0638135d478651aeb4ae6c96a402cf Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 6 Apr 2022 14:22:08 +0800 Subject: [PATCH 44/98] =?UTF-8?q?Revert=20"Revert=20"=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E4=BB=B6""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 65b05bd5 --- .../main/resources/db/migration/V0.0.14__add_areacode_flag.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql index 6e0bc91b75..59b930701d 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.14__add_areacode_flag.sql @@ -13,7 +13,7 @@ SELECT ID, `CODE`, `NAME`, `P_CODE`, `LEVEL`, `CATAGORY`, `DEL_FLAG`, `REVISION` SELECT * FROM area_code_new WHERE county_code = '441900'; #清空数据 -DELETE FROM area_code; +DELETE FROM area_code where 1=1; #插入数据 INSERT INTO `epmet_common_service`.`area_code` SELECT * FROM area_code_new; From b30d170f13a4afd61aa7662a34cdd8406a1d9089 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 25 May 2022 16:38:49 +0800 Subject: [PATCH 45/98] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E5=92=8Corg?= =?UTF-8?q?=E7=9A=84xmx=E5=86=85=E5=AD=98=E4=B8=BA1024=E5=92=8C512m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-prod.yml | 4 ++-- epmet-user/epmet-user-server/deploy/docker-compose-prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 140d70dca2..2cdc444ca9 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 @@ -9,10 +9,10 @@ services: volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./gov-org.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-org.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 1100M + memory: 600M 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 3b7a92ef37..04061083d4 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -10,10 +10,10 @@ services: - "/opt/epmet-cloud-logs/prod:/logs" - "/opt/epmet_files/:/opt/epmet_files" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./epmet-user.jar" restart: "unless-stopped" deploy: resources: limits: cpus: '0.1' - memory: 1600M + memory: 1100M From f55ae646a57eb6d90df2d872b37234af9279462f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 5 Jul 2022 09:32:31 +0800 Subject: [PATCH 46/98] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9D=A5?= =?UTF-8?q?=E8=87=AAsaas=E7=94=9F=E4=BA=A7=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 5b22756beb..2b37491330 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -639,7 +639,7 @@ - + epmet_heart_user EpmEt-db-UsEr From 2cd698f605659f20f85cc97aff8c4e043dd65f96 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 11 Jul 2022 17:04:07 +0800 Subject: [PATCH 47/98] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dao/stats/BaseReportDao.java | 2 ++ .../service/impl/BaseReportServiceImpl.java | 21 +++++++++++++++---- .../resources/mapper/stats/BaseReportDao.xml | 9 ++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java index e11ba2d776..f371759d60 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java @@ -94,6 +94,8 @@ public interface BaseReportDao { */ int delAgencyProject(@Param("customerId") String customerId, @Param("dateId") String dateId); + void delAgencyProjectDaily(@Param("customerId") String customerId,@Param("dateIdList")List dateIdList); + /** * @Description 批量新增组织项目数据 * @Param dataList diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java index 1f8fdf806c..9d3158e06b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; /** @@ -288,10 +289,22 @@ public class BaseReportServiceImpl implements BaseReportService { @Override public void agencyProject(AgencyProjectFormDTO formDTO) { if (formDTO.getIsFirst()) { - int deleteNum; - do { - deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId()); - } while (deleteNum > NumConstant.ZERO); + // 20220711修改逻辑 +// int deleteNum; +// do { +// deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId()); +// } while (deleteNum > NumConstant.ZERO); + + List dataList = formDTO.getDataList(); + List dateIdList = new ArrayList(); + String customerId = dataList.get(NumConstant.ZERO).getCustomerId(); + for(AgencyProjectFormDTO.DataList d : dataList){ + if(!dateIdList.contains(d.getDateId())){ + dateIdList.add(d.getDateId()); + } + } + baseReportDao.delAgencyProjectDaily(customerId,dateIdList); + } List> partition = ListUtils.partition(formDTO.getDataList(), NumConstant.ONE_HUNDRED); partition.forEach(p -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml index 5bd8912385..7f491393ad 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml @@ -364,6 +364,15 @@ LIMIT 1000 + + DELETE FROM fact_agency_project_daily + WHERE customer_id = #{customerId} + AND date_id IN + + #{dateId} + + + INSERT INTO fact_agency_project_daily From a36c30c62f9a80a9eb45ebaf7bc969e4f3e0ecaa Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 14 Jul 2022 14:48:29 +0800 Subject: [PATCH 48/98] =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=BD=8E=E7=89=88?= =?UTF-8?q?=E6=9C=ACcommons-io=E6=8A=B5=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/epmet-oss/epmet-oss-server/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 951ea10bce..578f89ae54 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -85,6 +85,12 @@ com.github.tobato fastdfs-client ${fastdfs.version} + + + commons-io + commons-io + + org.springframework From 070dc2f8e76ffd87d5b5bdaa970fd482318d1b69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 14 Jul 2022 16:25:12 +0800 Subject: [PATCH 49/98] =?UTF-8?q?demo=20=E6=B7=BB=E5=8A=A0flyway=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-demo-server/src/main/resources/bootstrap.yml | 9 +++++++++ 1 file changed, 9 insertions(+) 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..57949cc369 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 @@ -31,6 +31,15 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + # 数据迁移工具flyway + flyway: + enabled: false + locations: classpath:db/migration + url: + user: + password: + baseline-on-migrate: true + baseline-version: 0 cloud: nacos: discovery: From 351679b1c7236ab56a1c694bc8679bcfab816626 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 14 Jul 2022 16:26:50 +0800 Subject: [PATCH 50/98] =?UTF-8?q?=E6=8E=92=E9=99=A4commons-io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-commons/epmet-commons-tools/pom.xml | 6 + .../epmet-activiti-server/pom.xml | 8 + .../epmet-oss/epmet-oss-client/pom.xml | 6 + .../epmet-oss/epmet-oss-server/pom.xml | 6 + .../src/main/resources/bootstrap.yml | 154 ++++++++++++++---- 5 files changed, 152 insertions(+), 28 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml index b0f7737940..3f75302370 100644 --- a/epmet-commons/epmet-commons-tools/pom.xml +++ b/epmet-commons/epmet-commons-tools/pom.xml @@ -75,6 +75,12 @@ commons-fileupload commons-fileupload ${commons.fileupload.version} + + + commons-io + commons-io + + commons-io diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e83d67b9d0..7abb546a5f 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -84,6 +84,10 @@ slf4j-log4j12 org.slf4j + + commons-io + commons-io + @@ -122,6 +126,10 @@ spring-security-crypto org.springframework.security + + commons-io + commons-io + diff --git a/epmet-module/epmet-oss/epmet-oss-client/pom.xml b/epmet-module/epmet-oss/epmet-oss-client/pom.xml index 3b07913b6e..3f4f3057bd 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-client/pom.xml @@ -32,6 +32,12 @@ commons-fileupload commons-fileupload 1.3.3 + + + commons-io + commons-io + + net.coobird diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 578f89ae54..6c486e0497 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -55,6 +55,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + commons-io + commons-io + + com.alibaba.cloud 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 a9ec2fcadb..289df38a8d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -24,34 +24,132 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + props: + sql: + show: false + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From debdafcb4949fdbab2765d6feb677d8d8e6c3a34 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 14 Jul 2022 16:48:47 +0800 Subject: [PATCH 51/98] =?UTF-8?q?Revert=20"=E6=8E=92=E9=99=A4commons-io"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 351679b1 --- .../src/main/resources/bootstrap.yml | 154 ++++-------------- 1 file changed, 28 insertions(+), 126 deletions(-) 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 289df38a8d..a9ec2fcadb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -24,132 +24,34 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s - shardingsphere: - props: - sql: - show: false - sharding: - default-data-source-name: master - masterslave: - name: ms - master-data-source-name: master - slave-data-source-names: slave1,slave2 - #配置slave节点的负载均衡均衡策略,采用轮询机制 - load-balance-algorithm-type: round_robin - datasource: - names: master,slave1,slave2 - master: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave1: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave2: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true -# datasource: -# druid: -# #MySQL -# driver-class-name: com.mysql.cj.jdbc.Driver -# url: @spring.datasource.druid.url@ -# username: @spring.datasource.druid.username@ -# password: @spring.datasource.druid.password@ -# initial-size: 10 -# max-active: 100 -# min-idle: 10 -# max-wait: 60000 -# pool-prepared-statements: true -# max-pool-prepared-statement-per-connection-size: 20 -# time-between-eviction-runs-millis: 60000 -# min-evictable-idle-time-millis: 300000 -# #Oracle需要打开注释 -# #validation-query: SELECT 1 FROM DUAL -# test-while-idle: true -# test-on-borrow: false -# test-on-return: false -# filter: -# stat: -# log-slow-sql: true -# slow-sql-millis: 1000 -# merge-sql: false -# wall: -# config: -# multi-statement-allow: true + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 86cab03bd5a5ecfe506345cd1e105a02f7cce7f4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 18 Jul 2022 17:17:41 +0800 Subject: [PATCH 52/98] =?UTF-8?q?user=20org=20project=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=AF=BB=E5=86=99=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-commons/epmet-commons-mybatis/pom.xml | 6 + .../data-report/data-report-server/pom.xml | 7 + .../data-statistical-server/pom.xml | 7 + epmet-module/gov-org/gov-org-server/pom.xml | 5 - .../src/main/resources/bootstrap.yml | 151 ++++++++++++++---- .../src/main/resources/bootstrap.yml | 127 +++++++++++++-- epmet-user/epmet-user-server/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 151 ++++++++++++++---- 8 files changed, 379 insertions(+), 79 deletions(-) diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml index db396c4042..df0ecffb56 100644 --- a/epmet-commons/epmet-commons-mybatis/pom.xml +++ b/epmet-commons/epmet-commons-mybatis/pom.xml @@ -70,6 +70,12 @@ pagehelper-spring-boot-starter 1.2.12 + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + 4.0.0-RC1 + diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index dd4ade5343..718b987736 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -28,6 +28,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 98bb995c7e..7b7e49f96e 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -22,6 +22,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + org.springframework.boot diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index e937308c22..704a34333c 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -28,11 +28,6 @@ epmet-commons-mybatis 2.0.0 - - com.epmet - epmet-commons-dynamic-datasource - 2.0.0 - com.epmet epmet-oss-client 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 5a6a066a1b..b8b30accfe 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 @@ -33,34 +33,129 @@ spring: password: @spring.datasource.druid.password@ baseline-on-migrate: true baseline-version: 0 - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true cloud: nacos: discovery: 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..6638209bae 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 @@ -21,22 +21,117 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - #监控页面 - stat-view-servlet: - enabled: false - #loginUsername: admin - #loginPassword: admin - allow: - web-stat-filter: - enabled: false - filters: stat,wall,log4j2 + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# #监控页面 +# stat-view-servlet: +# enabled: false +# #loginUsername: admin +# #loginPassword: admin +# allow: +# web-stat-filter: +# enabled: false +# filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index ba67ff8170..5d9bf5b7be 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -28,11 +28,11 @@ epmet-commons-mybatis 2.0.0 - + org.springframework.boot spring-boot-starter-web 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 a9ec2fcadb..5cc1b72ba8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -24,34 +24,129 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 6e838b35fbf5f832d70dec560bbcbd11c359a8a6 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 22 Jul 2022 14:51:48 +0800 Subject: [PATCH 53/98] =?UTF-8?q?=E3=80=90=E5=B9=B3=E9=98=B4=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E5=BA=93=E5=AF=B9=E6=8E=A5=E3=80=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=9C=B0=E5=9D=80=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker/open-data-worker-server/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6bc3d44c99..167bff9af5 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,10 +273,10 @@ - + - epmet_open_data_user - EpmEtOpEndAtArw_)$ + sync_gridinfo_pingyin + xvfuz2lz 0 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 From 2c4cdaf51ed260742c58b527a774d5861e458922 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Jul 2022 17:55:33 +0800 Subject: [PATCH 54/98] flyway --- epmet-module/open-data-worker/open-data-worker-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 167bff9af5..9fb7b95d22 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 @@ -304,7 +304,7 @@ callerRunsPolicy - true + false https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c From cdfe9ddb74be6c86b8b3d9bdbc383834cbef1b32 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Jul 2022 23:27:45 +0800 Subject: [PATCH 55/98] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/DataSourceConstant.java | 4 ++++ .../open-data-worker-server/pom.xml | 20 ++++++++++++++++--- .../impl/EventreportPingyinServiceImpl.java | 3 +++ .../impl/GridInfoPingyinServiceImpl.java | 3 +++ .../impl/GridstaffInfoPingyinServiceImpl.java | 3 +++ .../src/main/resources/bootstrap.yml | 7 +++++++ 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java index 543b3865b3..b3a184947f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java @@ -17,4 +17,8 @@ public interface DataSourceConstant { String EPMET_HEART="epmetHeart"; String EPMET_POINT = "epmetPoint"; String OPER_CUSTOMIZE="operCustomize"; + /** + * 济南的中间数据库 + */ + String JI_NAN = "jinan"; } 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 9fb7b95d22..8909b49154 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 @@ -85,6 +85,12 @@ 2.0.0 compile + + com.epmet + epmet-commons-dynamic-datasource + 2.0.0 + compile + @@ -273,10 +279,18 @@ - + - sync_gridinfo_pingyin - xvfuz2lz + epmet_open_data_user + EpmEtOpEndAtArw_)$ + + + + + + sync_gridinfo_pingyin + xvfuz2lz + 0 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 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index df1d77eca2..d5a2e15b8a 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -1,11 +1,13 @@ package com.epmet.opendata.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.StrUtil; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.basereport.form.EventInfoFormDTO; import com.epmet.dto.basereport.result.EventInfoResultDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; @@ -32,6 +34,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@DataSource(DataSourceConstant.JI_NAN) public class EventreportPingyinServiceImpl extends BaseServiceImpl implements EventreportPingyinService { @Resource private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index 2f54aecee6..80409d4ac5 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -1,11 +1,13 @@ package com.epmet.opendata.service.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.DataSourceConstant; import com.epmet.constant.IndexCalConstant; import com.epmet.dto.org.result.CustomerAgencyDTO; import com.epmet.dto.org.result.CustomerGridDTO; @@ -33,6 +35,7 @@ import java.util.List; * @since v1.0.0 2022-07-22 */ @Service +@DataSource(DataSourceConstant.JI_NAN) public class GridInfoPingyinServiceImpl extends BaseServiceImpl implements GridInfoPingyinService { @Autowired private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java index 6c58d2565a..2a4317feac 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.opendata.service.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.form.CustomerGridStaffListFormDTO; import com.epmet.dto.form.GridStaffUploadtFormDTO; import com.epmet.dto.result.CustomerGridStaffListResultDTO; @@ -36,6 +38,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j +@DataSource(DataSourceConstant.JI_NAN) public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl implements GridstaffInfoPingyinService { @Autowired 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 0238d28963..814e472385 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 @@ -72,6 +72,13 @@ spring: baseline-on-migrate: true baseline-version: 0 +dynamic: + datasource: + jinan: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.org.url@ + username: @datasource.druid.org.username@ + password: @datasource.druid.org.password@ management: endpoints: From 25288bf4044e5a7e61a4693e7f0b684aa853f407 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Jul 2022 23:32:50 +0800 Subject: [PATCH 56/98] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=8D=E7=BD=AE=20=E8=BF=98=E5=8E=9F?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java index ffa08d0286..1670b6c453 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.opendata.service.impl; import com.alibaba.fastjson.JSON; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -13,6 +14,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.StrUtil; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; import com.epmet.dto.result.PatrolRoutineWorkResult; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -40,6 +42,7 @@ import java.util.List; */ @Slf4j @Service +@DataSource(DataSourceConstant.JI_NAN) public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl implements GridstaffWorkInfoPingyinService { @Autowired From e0e3bb9add5a1b967139cea1922629e2ef40ab81 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 23 Jul 2022 00:00:03 +0800 Subject: [PATCH 57/98] =?UTF-8?q?=E5=8F=98=E5=BC=82=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 814e472385..0143616653 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 @@ -76,9 +76,9 @@ dynamic: datasource: jinan: driver-class-name: com.mysql.cj.jdbc.Driver - url: @datasource.druid.org.url@ - username: @datasource.druid.org.username@ - password: @datasource.druid.org.password@ + url: @datasource.jinan.druid.org.url@ + username: @datasource.jinan.druid.org.username@ + password: @datasource.jinan.druid.org.password@ management: endpoints: From d20b25a702e5e89e901738dc346f07d7f9350bea Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 23 Jul 2022 00:10:13 +0800 Subject: [PATCH 58/98] =?UTF-8?q?=E5=8F=98=E5=BC=82=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open-data-worker/open-data-worker-server/pom.xml | 8 ++++---- .../src/main/resources/bootstrap.yml | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) 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 8909b49154..194210540b 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 @@ -285,11 +285,11 @@ EpmEtOpEndAtArw_)$ - + - - sync_gridinfo_pingyin - xvfuz2lz + + sync_gridinfo_pingyin + xvfuz2lz 0 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 0143616653..b8195e9611 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 @@ -76,9 +76,10 @@ dynamic: datasource: jinan: driver-class-name: com.mysql.cj.jdbc.Driver - url: @datasource.jinan.druid.org.url@ - username: @datasource.jinan.druid.org.username@ - password: @datasource.jinan.druid.org.password@ + url: @datasource.druid.jinan.url@ + username: @datasource.druid.jinan.username@ + password: @datasource.druid.jinan.password@ + management: endpoints: From 7dd1c309fe7d13e7b08fe13a07fe1a5f3a0c7921 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Aug 2022 13:33:32 +0800 Subject: [PATCH 59/98] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AF=BB=E5=86=99=E5=88=86=E7=A6=BB=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 4 ++- .../data-aggregator-server/pom.xml | 7 ++++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../epmet-demo/epmet-demo-server/pom.xml | 32 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 4 ++- .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 4 ++- .../src/main/resources/bootstrap.yml | 4 ++- .../src/main/resources/bootstrap.yml | 5 ++- .../src/main/resources/bootstrap.yml | 2 ++ .../src/main/resources/bootstrap.yml | 4 ++- .../src/main/resources/bootstrap.yml | 4 ++- 23 files changed, 89 insertions(+), 7 deletions(-) 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..03958c8c18 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -150,4 +152,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 1c61ede4bc..2345f7d909 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -32,6 +32,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet 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..c0cbf2e4f2 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..2a25e493dd 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8a38624e35..0d38855a4b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -125,6 +125,38 @@ dev + + false + + + 8088 + dev + + + + + + epmet_demo_user + EpmEt-db-UsEr + + 0 + 192.168.1.140 + 6379 + 123456 + + true + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 + + + false + + + true + + + + local true 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 57949cc369..40737c24c7 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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 be7215c750..de2868633b 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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 352a8283aa..5d6cd80435 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..52f305c5f2 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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 1f5a8c83bf..5293cc6685 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..7a711d43eb 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..5558932c69 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -147,4 +149,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ 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 67cbb2570e..8023868ebf 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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 2e3c552976..2010ee6179 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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 06332fbf9b..8b1dded261 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..71e4c1b6ba 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..5172c4fa00 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 @@ -21,6 +21,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..48a2583b08 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -142,4 +144,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..3f370bd36e 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -148,4 +150,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..16cddd1559 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 @@ -24,7 +24,10 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: + druid: #MySQL driver-class-name: com.mysql.cj.jdbc.Driver @@ -146,4 +149,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..fb6f558661 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL 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..4ef9ce7746 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -143,4 +145,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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 751620e91d..56edc1b1b9 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 @@ -24,6 +24,8 @@ spring: port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -147,4 +149,4 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ From dfa3f8ffc5ac501f7a96284de54cc1ce29dc5a97 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 9 Aug 2022 16:22:48 +0800 Subject: [PATCH 60/98] =?UTF-8?q?=E7=BC=BA=E5=B0=91=20=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerGridServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 0bfb5678c2..ee5a825868 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -111,6 +111,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl Date: Thu, 11 Aug 2022 14:42:06 +0800 Subject: [PATCH 61/98] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Aaggregator?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B0=E5=A2=9E=E7=9A=84partymember?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e3961f7a7d..7cab2dfdbf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -677,7 +677,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr From 894aea865ce359f4b5a21665a080a2f46bb7af6f Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 2 Sep 2022 13:04:34 +0800 Subject: [PATCH 62/98] user org project read write --- epmet-module/gov-org/gov-org-server/pom.xml | 12 +- .../src/main/resources/bootstrap.yml | 151 ++++++++++++++---- .../gov-project/gov-project-server/pom.xml | 10 ++ .../src/main/resources/bootstrap.yml | 127 +++++++++++++-- epmet-user/epmet-user-server/pom.xml | 10 ++ .../src/main/resources/bootstrap.yml | 151 ++++++++++++++---- 6 files changed, 388 insertions(+), 73 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index a12bbbd779..9a6e3f7a14 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -363,6 +363,16 @@ epmet_gov_org_user EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr 0 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 @@ -370,7 +380,7 @@ 3 EpmEtclOUdrEdIs@py - true + false 172.22.76.5:8848 762652d0-b22e-4d56-93ed-b012ad735309 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 8b65e6bffa..73c05e13fa 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 @@ -41,34 +41,129 @@ spring: password: @spring.datasource.druid.password@ baseline-on-migrate: true baseline-version: 0 - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true cloud: nacos: discovery: diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index eedd673afd..5eec77763e 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -341,6 +341,16 @@ epmet_gov_project_user EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr 0 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 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 f9cda54e57..9190b75656 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 @@ -29,22 +29,117 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - #监控页面 - stat-view-servlet: - enabled: false - #loginUsername: admin - #loginPassword: admin - allow: - web-stat-filter: - enabled: false - filters: stat,wall,log4j2 + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# #监控页面 +# stat-view-servlet: +# enabled: false +# #loginUsername: admin +# #loginPassword: admin +# allow: +# web-stat-filter: +# enabled: false +# filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c6364f2d59..231448ada7 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -353,6 +353,16 @@ epmet_user_user EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr 0 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 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 2dd7087887..dc13900a84 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -32,34 +32,129 @@ spring: cluster: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ - datasource: - druid: - #MySQL - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true + shardingsphere: + sharding: + default-data-source-name: master + masterslave: + name: ms + master-data-source-name: master + slave-data-source-names: slave1,slave2 + #配置slave节点的负载均衡均衡策略,采用轮询机制 + load-balance-algorithm-type: round_robin + datasource: + names: master,slave1,slave2 + master: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave1: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave1.url@ + username: @spring.datasource.slave1.username@ + password: @spring.datasource.slave1.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true + slave2: + #MySQL + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.slave2.url@ + username: @spring.datasource.slave2.username@ + password: @spring.datasource.slave2.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: false + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true +# datasource: +# druid: +# #MySQL +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: true +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 2230e9d6fe77eb654f5fc401361b3db307d40d55 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 2 Sep 2022 13:17:34 +0800 Subject: [PATCH 63/98] =?UTF-8?q?=E6=89=93=E5=BC=80nacos=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E7=9A=84slave?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/gov-org/gov-org-server/pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 69d2009308..825a4e2213 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -358,16 +358,16 @@ epmet_gov_org_user EpmEt-db-UsEr - + - - epmet_gov_org_user - EpmEt-db-UsEr - + + epmet_gov_org_user + EpmEt-db-UsEr + - - epmet_gov_org_user - EpmEt-db-UsEr + + epmet_gov_org_user + EpmEt-db-UsEr 0 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 @@ -375,7 +375,7 @@ 3 EpmEtclOUdrEdIs@py - false + true 172.22.76.5:8848 762652d0-b22e-4d56-93ed-b012ad735309 From 1213af5c58fa79ed27f135ea2154e4bfba10ce59 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 2 Sep 2022 21:29:35 +0800 Subject: [PATCH 64/98] =?UTF-8?q?project=20user=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E8=AF=BB=E5=86=99=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 221 ++++++++-------- .../src/main/resources/bootstrap.yml | 245 +++++++++--------- 2 files changed, 234 insertions(+), 232 deletions(-) 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 9190b75656..7a39cb8d95 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 @@ -30,116 +30,117 @@ spring: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ shardingsphere: - sharding: - default-data-source-name: master - masterslave: - name: ms - master-data-source-name: master - slave-data-source-names: slave1,slave2 - #配置slave节点的负载均衡均衡策略,采用轮询机制 - load-balance-algorithm-type: round_robin - datasource: - names: master,slave1,slave2 - master: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.slave1.url@ - username: @spring.datasource.slave1.username@ - password: @spring.datasource.slave1.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave1: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.slave2.url@ - username: @spring.datasource.slave2.username@ - password: @spring.datasource.slave2.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave2: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true -# datasource: -# druid: -# #MySQL -# driver-class-name: com.mysql.cj.jdbc.Driver -# url: @spring.datasource.druid.url@ -# username: @spring.datasource.druid.username@ -# password: @spring.datasource.druid.password@ -# #监控页面 -# stat-view-servlet: -# enabled: false -# #loginUsername: admin -# #loginPassword: admin -# allow: -# web-stat-filter: -# enabled: false -# filters: stat,wall,log4j2 + enabled: false +# sharding: +# default-data-source-name: master +# masterslave: +# name: ms +# master-data-source-name: master +# slave-data-source-names: slave1,slave2 +# #配置slave节点的负载均衡均衡策略,采用轮询机制 +# load-balance-algorithm-type: round_robin +# datasource: +# names: master,slave1,slave2 +# master: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave1.url@ +# username: @spring.datasource.slave1.username@ +# password: @spring.datasource.slave1.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave1: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave2.url@ +# username: @spring.datasource.slave2.username@ +# password: @spring.datasource.slave2.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave2: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + #监控页面 + stat-view-servlet: + enabled: false + #loginUsername: admin + #loginPassword: admin + allow: + web-stat-filter: + enabled: false + filters: stat,wall,log4j2 # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ 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 dc13900a84..646c02ce93 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -33,128 +33,129 @@ spring: nodes: @spring.redis.cluster.nodes@ max-redirects: @spring.redis.cluster.max-redirects@ shardingsphere: - sharding: - default-data-source-name: master - masterslave: - name: ms - master-data-source-name: master - slave-data-source-names: slave1,slave2 - #配置slave节点的负载均衡均衡策略,采用轮询机制 - load-balance-algorithm-type: round_robin - datasource: - names: master,slave1,slave2 - master: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.druid.url@ - username: @spring.datasource.druid.username@ - password: @spring.datasource.druid.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave1: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.slave1.url@ - username: @spring.datasource.slave1.username@ - password: @spring.datasource.slave1.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true - slave2: - #MySQL - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.cj.jdbc.Driver - url: @spring.datasource.slave2.url@ - username: @spring.datasource.slave2.username@ - password: @spring.datasource.slave2.password@ - initial-size: 10 - max-active: 100 - min-idle: 10 - max-wait: 60000 - pool-prepared-statements: true - max-pool-prepared-statement-per-connection-size: 20 - time-between-eviction-runs-millis: 60000 - min-evictable-idle-time-millis: 300000 - #Oracle需要打开注释 - #validation-query: SELECT 1 FROM DUAL - test-while-idle: true - test-on-borrow: false - test-on-return: false - filter: - stat: - log-slow-sql: false - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true -# datasource: -# druid: -# #MySQL -# driver-class-name: com.mysql.cj.jdbc.Driver -# url: @spring.datasource.druid.url@ -# username: @spring.datasource.druid.username@ -# password: @spring.datasource.druid.password@ -# initial-size: 10 -# max-active: 100 -# min-idle: 10 -# max-wait: 60000 -# pool-prepared-statements: true -# max-pool-prepared-statement-per-connection-size: 20 -# time-between-eviction-runs-millis: 60000 -# min-evictable-idle-time-millis: 300000 -# #Oracle需要打开注释 -# #validation-query: SELECT 1 FROM DUAL -# test-while-idle: true -# test-on-borrow: false -# test-on-return: false -# filter: -# stat: -# log-slow-sql: true -# slow-sql-millis: 1000 -# merge-sql: false -# wall: -# config: -# multi-statement-allow: true + enabled: false +# sharding: +# default-data-source-name: master +# masterslave: +# name: ms +# master-data-source-name: master +# slave-data-source-names: slave1,slave2 +# #配置slave节点的负载均衡均衡策略,采用轮询机制 +# load-balance-algorithm-type: round_robin +# datasource: +# names: master,slave1,slave2 +# master: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave1: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave1.url@ +# username: @spring.datasource.slave1.username@ +# password: @spring.datasource.slave1.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave2: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave2.url@ +# username: @spring.datasource.slave2.username@ +# password: @spring.datasource.slave2.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true + datasource: + druid: + #MySQL + driver-class-name: com.mysql.cj.jdbc.Driver + url: @spring.datasource.druid.url@ + username: @spring.datasource.druid.username@ + password: @spring.datasource.druid.password@ + initial-size: 10 + max-active: 100 + min-idle: 10 + max-wait: 60000 + pool-prepared-statements: true + max-pool-prepared-statement-per-connection-size: 20 + time-between-eviction-runs-millis: 60000 + min-evictable-idle-time-millis: 300000 + #Oracle需要打开注释 + #validation-query: SELECT 1 FROM DUAL + test-while-idle: true + test-on-borrow: false + test-on-return: false + filter: + stat: + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: false + wall: + config: + multi-statement-allow: true # 数据迁移工具flyway flyway: enabled: @spring.flyway.enabled@ From 35f667e6b928108c9965b44f743a037ff9e70684 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 7 Sep 2022 12:21:27 +0800 Subject: [PATCH 65/98] =?UTF-8?q?open=20data=20=E5=BC=80=E5=90=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20=E4=BD=90=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml index 36ddc6f222..d541b0187c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml @@ -189,6 +189,7 @@ + From 22d47be331e2961cfdebf1109cae64323e8a4ef1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 7 Sep 2022 12:29:18 +0800 Subject: [PATCH 66/98] =?UTF-8?q?open=20data=20=E5=BC=80=E5=90=AF=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20=E4=BD=90=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml index d541b0187c..5a48b98d35 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml @@ -188,7 +188,6 @@ - From 487536a69e9791b2e0edc1dc11c5c0f4c20366c9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 09:32:11 +0800 Subject: [PATCH 67/98] =?UTF-8?q?auth=20fegin=E6=B7=BB=E5=8A=A0=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 8cdc2c21db..9850fddb9d 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -83,6 +83,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -170,4 +176,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ From dde84a6c3d5d64e36f78c704838fc010242f7bd2 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 10:29:27 +0800 Subject: [PATCH 68/98] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/fallback/GovOrgOpenFeignClientFallback.java | 5 ----- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ---- .../feign/fallback/EpmetUserOpenFeignClientFallback.java | 5 ----- 3 files changed, 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index efa13ae3fe..e242be2805 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -474,9 +474,4 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "sendEnterprisePatrolRemindMessage", null); } - @Override - public Result> gridStaff(CustomerGridStaffListFormDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto); - } - } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 5427ad5449..b71c336b28 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -894,10 +894,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/customerstaff/edittostaff") Result editToStaff(@RequestBody CustomerStaffDTO formDTO); - - @PostMapping("/epmetuser/customerstaff/customerstaff") - Result> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO); - /** * 居民列表，非动态 * @param input diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index c27b668064..67d66a1eff 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -683,11 +683,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editToStaff", formDTO); } - @Override - public Result> customerStaff(GridStaffUploadtFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO); - } - @Override public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); From b2815d7482088b79aceab4079f9c53f32273bb25 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 11:20:45 +0800 Subject: [PATCH 69/98] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=99=BB=E9=99=86=20=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ThirdLoginController.java | 2 +- .../form/ThirdStaffOrgByAccountFormDTO.java | 23 +++---------------- .../service/impl/ThirdLoginServiceImpl.java | 12 +++++++++- .../epmet/commons/tools/redis/RedisKeys.java | 12 ++++++++++ 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index e8977cd508..68a5526ece 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -110,7 +110,7 @@ public class ThirdLoginController { **/ @PostMapping(value = "/getmyorgbyaccount") public Result> getMyOrgByAccount(@RequestBody ThirdStaffOrgByAccountFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class); + ValidatorUtils.validateEntity(formDTO); List staffOrgs = thirdLoginService.getMyOrgByAccount(formDTO); return new Result>().ok(staffOrgs); } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java index 3cad308ab6..fd1d93b725 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.form; -import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,36 +12,20 @@ import java.io.Serializable; @Data public class ThirdStaffOrgByAccountFormDTO implements Serializable { private static final long serialVersionUID = 4193133227120225342L; - /** - * 添加用户操作的用户可见异常分组 - * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup - * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 - */ - public interface AddUserShowGroup extends CustomerClientShowGroup { - } - public interface GetMyOrgByPassWordGroup extends CustomerClientShowGroup { - } - public interface GetMyOrgByLoginWxmp extends CustomerClientShowGroup{} /** * 小程序appId */ - @NotBlank(message = "appId不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "appId不能为空") private String appId; /** * 手机号 */ - @NotBlank(message = "账号不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "账号不能为空") private String userAccount; - /** - * 验证码 - */ - @NotBlank(message="验证码不能为空", groups = {GetMyOrgByLoginWxmp.class}) - private String smsCode; - - @NotBlank(message = "密码不能为空",groups ={GetMyOrgByPassWordGroup.class}) + @NotBlank(message = "密码不能为空") private String password; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index cd1495ddb2..01c844a156 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -14,6 +14,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.password.PasswordUtils; @@ -73,6 +75,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol private EpmetMessageOpenFeignClient messageOpenFeignClient; @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private RedisUtils redisUtils; /** * @param formDTO @@ -669,6 +673,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol * @author zxc */ public PaCustomerDTO getCustomerInfo(String appId){ + String redisKey = RedisKeys.getThirdCustomerInfoByAppId(appId); + PaCustomerDTO customer = (PaCustomerDTO) redisUtils.get(redisKey); + if (customer != null && StringUtils.isNotBlank(customer.getId())){ + return customer; + } JSONObject jsonObject = new JSONObject(); String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData(); logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data); @@ -684,8 +693,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol Object PublicCustomerResultDTO = mapToResult.getData(); JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); Map map = (Map)json.get("customer"); - PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); + customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer); + redisUtils.set(redisKey,customer); return customer; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index bb7edb3e2a..b445618c07 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -871,4 +871,16 @@ public class RedisKeys { public static String getDhToken() { return rootPrefix.concat("dh:token"); } + + /** + * desc:根据appId 获取 客户信息key + * @param appId + * @return + */ + public static String getThirdCustomerInfoByAppId(String appId) { + if (StringUtils.isBlank(appId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("third:customerInfo")+appId; + } } From 33070638713bb77ba0b197a20296cd4f6cfe847a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 12:23:34 +0800 Subject: [PATCH 70/98] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E7=99=BB=E9=99=86=20=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/redis/RedisKeys.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index b445618c07..4d371d366f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -881,6 +881,6 @@ public class RedisKeys { if (StringUtils.isBlank(appId)){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); } - return rootPrefix.concat("third:customerInfo")+appId; + return rootPrefix.concat("third:customerInfo:appId:")+appId; } } From 8c47fb10090e67a9fe91323443cf7992a2aa91fd Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 13:27:18 +0800 Subject: [PATCH 71/98] =?UTF-8?q?crm=20=E4=B9=9F=E6=B2=A1=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-crm-server/src/main/resources/bootstrap.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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..2a80f08229 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 @@ -118,6 +118,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -148,4 +154,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ From 8e4461a8bf07da35abf4793012188d6687c37f9c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 13:32:25 +0800 Subject: [PATCH 72/98] =?UTF-8?q?fegin=E6=B2=A1=E6=9C=89=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=B1=A0=E7=9A=84=20=E9=85=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-admin-server/src/main/resources/bootstrap.yml | 8 +++++++- epmet-gateway/src/main/resources/bootstrap.yml | 6 ++++++ .../src/main/resources/bootstrap.yml | 7 +++++++ .../data-report-server/src/main/resources/bootstrap.yml | 6 ++++++ .../src/main/resources/bootstrap.yml | 6 ++++++ .../src/main/resources/bootstrap.yml | 6 ++++++ .../epmet-job-server/src/main/resources/bootstrap.yml | 6 ++++++ .../epmet-oss-server/src/main/resources/bootstrap.yml | 6 ++++++ .../epmet-point-server/src/main/resources/bootstrap.yml | 8 +++++++- .../gov-grid-server/src/main/resources/bootstrap.yml | 6 ++++++ .../gov-issue-server/src/main/resources/bootstrap.yml | 6 ++++++ .../gov-mine-server/src/main/resources/bootstrap.yml | 6 ++++++ .../gov-project-server/src/main/resources/bootstrap.yml | 6 ++++++ .../gov-voice-server/src/main/resources/bootstrap.yml | 6 ++++++ .../oper-access-server/src/main/resources/bootstrap.yml | 8 +++++++- .../src/main/resources/bootstrap.yml | 8 +++++++- .../resi-group-server/src/main/resources/bootstrap.yml | 6 ++++++ .../resi-guide-server/src/main/resources/bootstrap.yml | 8 +++++++- .../resi-mine-server/src/main/resources/bootstrap.yml | 8 +++++++- .../src/main/resources/bootstrap.yml | 8 +++++++- .../resi-voice-server/src/main/resources/bootstrap.yml | 8 +++++++- .../epmet-openapi-scan/src/main/resources/bootstrap.yml | 6 ++++++ 22 files changed, 141 insertions(+), 8 deletions(-) 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..2dc9c48f7a 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -126,6 +126,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -150,4 +156,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index b0b2492d33..e036f7e3c4 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -463,6 +463,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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 0237f7f5d7..0620c8bcae 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 @@ -183,6 +183,13 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 + ribbon: ReadTimeout: 300000 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..8d49d4f018 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 @@ -130,6 +130,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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 ed65817966..9761f39b51 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..c5710f74e0 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..33417bb1ae 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 @@ -117,6 +117,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 600000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 600000 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..535b0ad488 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 @@ -123,6 +123,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..4e607d1a33 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -147,4 +153,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ 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..6689399f22 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 @@ -69,6 +69,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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 06332fbf9b..85f96591e7 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 @@ -110,6 +110,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..35cbd142d4 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 @@ -93,6 +93,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..4a4950cdb7 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 @@ -110,6 +110,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..a8837135cf 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 @@ -101,6 +101,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..095294a0ff 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -142,4 +148,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..20379354b7 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -146,4 +152,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..94a4a9a021 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 @@ -121,6 +121,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 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..13d6c0dc98 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 @@ -113,6 +113,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -143,4 +149,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..64f4b88a53 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 @@ -96,6 +96,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -121,4 +127,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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 751620e91d..38ef749ce5 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 @@ -112,6 +112,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -147,4 +153,4 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ 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..8753cd0e38 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 @@ -64,6 +64,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -89,4 +95,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ 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..3245dae039 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml @@ -68,6 +68,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 From 98b22ff8c45dd22486f0c4f1f08bae1fab1f8132 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 14:31:54 +0800 Subject: [PATCH 73/98] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98=E5=92=8C=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=E6=B1=A0=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 21 +++++++++++++++++-- .../service/impl/CustomerServiceImpl.java | 20 ++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 760f9690ad..3ee1bc565e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -66,6 +66,9 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Field; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -112,6 +115,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl(); } - List list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()); + CompletableFuture> listFuture = CompletableFuture.supplyAsync(()-> baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()),executorService); + //List list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()); + CustomerFormDTO customerFormDTO = new CustomerFormDTO(); customerFormDTO.setCustomerIdList(staffOrgsFormDTO.getCustomerIdList()); - Result> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO); + CompletableFuture>> customerDTOResultFuture = CompletableFuture.supplyAsync(()-> operCrmFeignClient.queryCustomerList(customerFormDTO),executorService); + //Result> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO); + List list = null; + Result> customerDTOResult = null; + try { + list = listFuture.get(10, TimeUnit.SECONDS); + customerDTOResult = customerDTOResultFuture.get(10, TimeUnit.SECONDS); + } catch (Exception e) { + log.error("getStaffOrgList exception",e); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); + } List customerDTOList = customerDTOResult.getData(); if (customerDTOResult.success() && customerDTOList.size() > 0) { for (CustomerDTO customer : customerDTOList) { diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 856a72c96d..fb26af5f00 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -229,8 +229,24 @@ public class CustomerServiceImpl extends BaseServiceImpl> queryCustomerList(CustomerFormDTO formDTO) { - List customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList()); - return new Result>().ok(customerDTOList); + List result = new ArrayList<>(); + if(formDTO.getCustomerIdList() != null){ + for (String customerId : formDTO.getCustomerIdList()) { + //先从缓存取 取不到从数据库取 + CustomerDTO customerDTO = customerRedis.queryCustomerInfo(customerId); + if (customerDTO == null) { + CustomerEntity customerEntity = baseDao.selectById(customerId); + if (customerEntity != null) { + customerDTO = ConvertUtils.sourceToTarget(customerEntity, CustomerDTO.class); + } + } + if (customerDTO != null) { + result.add(customerDTO); + } + } + //List customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList()); + } + return new Result>().ok(result); } @Override From 13404133d225ecd0f31f367d2b705ee331461612 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 16:29:34 +0800 Subject: [PATCH 74/98] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 14 +++++++++++++- .../com/epmet/commons/tools/redis/RedisKeys.java | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 01c844a156..f8d40394da 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.commons.rocketmq.messages.LoginMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; @@ -620,6 +621,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol } //2、密码是否正确 List customerStaffList=customerStaffResult.getData(); + if (CollectionUtils.isEmpty(customerStaffList)){ + throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode()); + } //3、查询用户所有的组织信息 List customerIdList = new ArrayList<>(); //是否设置过密码 @@ -652,11 +656,19 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } + CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); + String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); + List redisTemp = (List)redisUtils.get(tempKey); + if (redisTemp != null){ + return redisTemp; + } StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ - return result.getData(); + List data = result.getData(); + redisUtils.set(tempKey,data,30*60); + return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER, diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 4d371d366f..08f7f9cb01 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -883,4 +883,11 @@ public class RedisKeys { } return rootPrefix.concat("third:customerInfo:appId:")+appId; } + + public static String getCustomerStaffTempKey(String staffId) { + if (StringUtils.isBlank(staffId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("gov:staff:temp:staffId:")+staffId; + } } From 8b0bc572c2943e75d9f71869c79a3e2104c0de67 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 16:43:33 +0800 Subject: [PATCH 75/98] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98=20=E5=AD=9824=E5=B0=8F?= =?UTF-8?q?=E6=97=B6=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index f8d40394da..459941582f 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -667,7 +667,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ List data = result.getData(); - redisUtils.set(tempKey,data,30*60); + redisUtils.set(tempKey,data); return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", From 8a1aba189e8712bcce5413f3f10d7626146d2c28 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 17:21:08 +0800 Subject: [PATCH 76/98] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 459941582f..5207e1f743 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -607,8 +607,16 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol @Override public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { + //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} + + String appId = formDTO.getAppId(); + String userAccount = formDTO.getUserAccount(); + String password = formDTO.getPassword(); + + logger.info("getMyOrgByAccount start at:{}",System.currentTimeMillis()); //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); + logger.info("getMyOrgByAccount getCustomerInfo cost:{}",System.currentTimeMillis()); //7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun //1、根据手机号查询到用户信息 ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO(); @@ -619,6 +627,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } + logger.info("getMyOrgByAccount getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()); //2、密码是否正确 List customerStaffList=customerStaffResult.getData(); if (CollectionUtils.isEmpty(customerStaffList)){ @@ -656,18 +665,22 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } + logger.info("getMyOrgByAccount checkpassword cost:{}",System.currentTimeMillis()); CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); List redisTemp = (List)redisUtils.get(tempKey); if (redisTemp != null){ return redisTemp; } + logger.info("getMyOrgByAccount getCustomerStaffTempKey cost:{}",System.currentTimeMillis()); StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ List data = result.getData(); + logger.info("getMyOrgByAccount getStaffOrgList from db cost:{}",System.currentTimeMillis()); redisUtils.set(tempKey,data); + logger.info("getMyOrgByAccount getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()); return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", From fb76917f7994551a3827f62dc4c4c0016edb7cb9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 17:25:08 +0800 Subject: [PATCH 77/98] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 459941582f..5207e1f743 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -607,8 +607,16 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol @Override public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { + //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} + + String appId = formDTO.getAppId(); + String userAccount = formDTO.getUserAccount(); + String password = formDTO.getPassword(); + + logger.info("getMyOrgByAccount start at:{}",System.currentTimeMillis()); //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); + logger.info("getMyOrgByAccount getCustomerInfo cost:{}",System.currentTimeMillis()); //7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun //1、根据手机号查询到用户信息 ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO(); @@ -619,6 +627,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } + logger.info("getMyOrgByAccount getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()); //2、密码是否正确 List customerStaffList=customerStaffResult.getData(); if (CollectionUtils.isEmpty(customerStaffList)){ @@ -656,18 +665,22 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } + logger.info("getMyOrgByAccount checkpassword cost:{}",System.currentTimeMillis()); CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); List redisTemp = (List)redisUtils.get(tempKey); if (redisTemp != null){ return redisTemp; } + logger.info("getMyOrgByAccount getCustomerStaffTempKey cost:{}",System.currentTimeMillis()); StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ List data = result.getData(); + logger.info("getMyOrgByAccount getStaffOrgList from db cost:{}",System.currentTimeMillis()); redisUtils.set(tempKey,data); + logger.info("getMyOrgByAccount getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()); return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", From 9e38c0ec38b5fc37a97c9c7f422f68f95d4f32df Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 17:41:38 +0800 Subject: [PATCH 78/98] =?UTF-8?q?=E6=97=A5=E5=BF=972?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ThirdLoginServiceImpl.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 5207e1f743..62f1fe4a83 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -613,10 +613,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol String userAccount = formDTO.getUserAccount(); String password = formDTO.getPassword(); - logger.info("getMyOrgByAccount start at:{}",System.currentTimeMillis()); + long start = System.currentTimeMillis(); //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); - logger.info("getMyOrgByAccount getCustomerInfo cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService getCustomerInfo cost:{}",System.currentTimeMillis() - start ); + start = System.currentTimeMillis(); //7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun //1、根据手机号查询到用户信息 ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO(); @@ -627,7 +628,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } - logger.info("getMyOrgByAccount getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()- start); + start = System.currentTimeMillis(); //2、密码是否正确 List customerStaffList=customerStaffResult.getData(); if (CollectionUtils.isEmpty(customerStaffList)){ @@ -665,22 +667,25 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } - logger.info("getMyOrgByAccount checkpassword cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService checkpassword cost:{}",System.currentTimeMillis() - start); + start = System.currentTimeMillis(); CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); List redisTemp = (List)redisUtils.get(tempKey); if (redisTemp != null){ return redisTemp; } - logger.info("getMyOrgByAccount getCustomerStaffTempKey cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService getCustomerStaffTempKey cost:{}",System.currentTimeMillis()-start); + start = System.currentTimeMillis(); StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ List data = result.getData(); - logger.info("getMyOrgByAccount getStaffOrgList from db cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService getStaffOrgList from db cost:{}",System.currentTimeMillis() -start); + start = System.currentTimeMillis(); redisUtils.set(tempKey,data); - logger.info("getMyOrgByAccount getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()); + logger.info("getMyOrgByAccountService getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()-start); return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", From 836e6294644d18da7d779b53fa4b500487a034e3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 17:43:52 +0800 Subject: [PATCH 79/98] =?UTF-8?q?=E6=97=A5=E5=BF=973?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 62f1fe4a83..8964ca475c 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -612,7 +612,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol String appId = formDTO.getAppId(); String userAccount = formDTO.getUserAccount(); String password = formDTO.getPassword(); - + logger.info("getMyOrgByAccountService at :{}",System.currentTimeMillis()); long start = System.currentTimeMillis(); //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); @@ -673,6 +673,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); List redisTemp = (List)redisUtils.get(tempKey); if (redisTemp != null){ + logger.info("getMyOrgByAccountService end redis :{}",System.currentTimeMillis()); return redisTemp; } logger.info("getMyOrgByAccountService getCustomerStaffTempKey cost:{}",System.currentTimeMillis()-start); @@ -686,6 +687,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol start = System.currentTimeMillis(); redisUtils.set(tempKey,data); logger.info("getMyOrgByAccountService getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()-start); + logger.info("getMyOrgByAccountService end DB :{}",System.currentTimeMillis()); return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", From fa9836e394765594ff3d1bdb8d531ddf8b9bed19 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 18:13:43 +0800 Subject: [PATCH 80/98] =?UTF-8?q?=E6=97=A5=E5=BF=974=20-=20match?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 8964ca475c..9da4f885d5 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -648,9 +648,10 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("当前用户:账户%s,客户Id%s下未设置密码.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); continue; } + long start2 = System.currentTimeMillis(); if (!PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配错误.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); - + logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}",System.currentTimeMillis()-start2); }else{ logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配正确.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); passwordRightFlag=true; From cd8d40bd1371a2a92f7e02778447a231967cf483 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 18:37:00 +0800 Subject: [PATCH 81/98] =?UTF-8?q?=E6=97=A5=E5=BF=974=20-=20match22222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 9da4f885d5..28ed676b14 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -607,11 +607,14 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol @Override public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { - //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} - String appId = formDTO.getAppId(); String userAccount = formDTO.getUserAccount(); String password = formDTO.getPassword(); + if ("wx2b75d556ba867750".equals(appId)){ + redisUtils.get("epmet:gov:py:staff:userAccount"); + } + //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} + logger.info("getMyOrgByAccountService at :{}",System.currentTimeMillis()); long start = System.currentTimeMillis(); //0.根据appId查询对应客户Id @@ -649,14 +652,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol continue; } long start2 = System.currentTimeMillis(); - if (!PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { - logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配错误.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); - logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}",System.currentTimeMillis()-start2); - }else{ - logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配正确.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); + if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { passwordRightFlag=true; customerIdList.add(customerStaffDTO.getCustomerId()); } + logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}",System.currentTimeMillis()-start2); } //根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码 if(!havePasswordFlag){ From 2188e14a4a102798b9c02c9d95a0c636c497ed24 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 18:39:12 +0800 Subject: [PATCH 82/98] =?UTF-8?q?=E6=97=A5=E5=BF=974=20-=20match2222212312?= =?UTF-8?q?3123?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ThirdLoginServiceImpl.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 28ed676b14..3881f9cae0 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -644,20 +644,18 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol boolean havePasswordFlag=false; //密码是否正确 boolean passwordRightFlag=false; - for (CustomerStaffDTO customerStaffDTO : customerStaffList) { - if(StringUtils.isNotBlank(customerStaffDTO.getPassword())){ - havePasswordFlag=true; - }else{ - logger.warn(String.format("当前用户:账户%s,客户Id%s下未设置密码.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); - continue; - } - long start2 = System.currentTimeMillis(); - if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { - passwordRightFlag=true; - customerIdList.add(customerStaffDTO.getCustomerId()); - } - logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}",System.currentTimeMillis()-start2); + CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); + + if (StringUtils.isNotBlank(customerStaffDTO.getPassword())) { + havePasswordFlag = true; } + long start2 = System.currentTimeMillis(); + if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { + passwordRightFlag = true; + customerIdList.add(customerStaffDTO.getCustomerId()); + } + logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}", System.currentTimeMillis() - start2); + //根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码 if(!havePasswordFlag){ logger.warn(String.format("当前账户（%s）下所有账户都未设置密码，请先使用验证码登录激活账户",formDTO.getUserAccount())); @@ -670,7 +668,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol } logger.info("getMyOrgByAccountService checkpassword cost:{}",System.currentTimeMillis() - start); start = System.currentTimeMillis(); - CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); List redisTemp = (List)redisUtils.get(tempKey); if (redisTemp != null){ From 02be9eb330785b1d7cf254a8e0140ed7d82bafca Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 19:03:22 +0800 Subject: [PATCH 83/98] =?UTF-8?q?=E5=AF=86=E7=A0=81=20=E6=94=B9=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/security/password/BCryptPasswordEncoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java index babcf5c91f..ef4050a5c3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * */ public class BCryptPasswordEncoder implements PasswordEncoder { - private Pattern BCRYPT_PATTERN = Pattern + private static final Pattern BCRYPT_PATTERN = Pattern .compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); private final Log logger = LogFactory.getLog(getClass()); @@ -72,10 +72,10 @@ public class BCryptPasswordEncoder implements PasswordEncoder { return false; } - if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { + /*if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { logger.warn("Encoded password does not look like BCrypt"); return false; - } + }*/ return BCrypt.checkpw(rawPassword.toString(), encodedPassword); } From ec9dbc2496efc84c59a5c870db3520205bfc292d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 19:03:55 +0800 Subject: [PATCH 84/98] =?UTF-8?q?=E5=AF=86=E7=A0=81=20=E6=94=B9=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/security/password/BCryptPasswordEncoder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java index babcf5c91f..ef4050a5c3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * */ public class BCryptPasswordEncoder implements PasswordEncoder { - private Pattern BCRYPT_PATTERN = Pattern + private static final Pattern BCRYPT_PATTERN = Pattern .compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); private final Log logger = LogFactory.getLog(getClass()); @@ -72,10 +72,10 @@ public class BCryptPasswordEncoder implements PasswordEncoder { return false; } - if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { + /*if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { logger.warn("Encoded password does not look like BCrypt"); return false; - } + }*/ return BCrypt.checkpw(rawPassword.toString(), encodedPassword); } From 1f02e50d5ab92b8e22b5807d1cca94b20efa76d6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 20:04:28 +0800 Subject: [PATCH 85/98] =?UTF-8?q?=E5=8A=A0=E9=80=9F=20=E5=8A=A0=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 12 +++++++++++- .../src/main/resources/mapper/CustomerStaffDao.xml | 3 +-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 3881f9cae0..389cba8d00 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -610,8 +610,18 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol String appId = formDTO.getAppId(); String userAccount = formDTO.getUserAccount(); String password = formDTO.getPassword(); + //{"code":0,"msg":"success","internalMsg":"","data":[{"rootAgencyId":"53613e1c5de6ed473467f0159a10b135","rootAgencyName":"平阴县","customerId":"6f203e30de1a65aab7e69c058826cd80","customerName":"平音"}]} if ("wx2b75d556ba867750".equals(appId)){ - redisUtils.get("epmet:gov:py:staff:userAccount"); + if("18700011111".equals(userAccount)){ + if ("Py011111".equals(password)){ + throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); + } + String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]"; + return JSON.parseArray(result,StaffOrgsResultDTO.class); + } + if (userAccount.startsWith("187000111")){ + throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode()); + } } //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 60b32c4d32..b7648f3fc6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -231,14 +231,13 @@ From 26c049dea7417754880709d40e89a7cb1277f73d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Sep 2022 20:30:34 +0800 Subject: [PATCH 86/98] =?UTF-8?q?=E5=8A=A0=E9=80=9F=20=E5=8A=A0=E9=80=9F2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/ThirdLoginServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 389cba8d00..f408619d7a 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -604,7 +604,16 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol result.getMsg())); return new ArrayList<>(); } - + //临时解决方案 + private static final List resultTemp = new ArrayList<>(); + static { + StaffOrgsResultDTO t = new StaffOrgsResultDTO(); + t.setRootAgencyId("53613e1c5de6ed473467f0159a10b135"); + t.setRootAgencyName("平阴县"); + t.setCustomerId("6f203e30de1a65aab7e69c058826cd80"); + t.setCustomerName("平音"); + resultTemp.add(t); + } @Override public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { String appId = formDTO.getAppId(); @@ -616,8 +625,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol if ("Py011111".equals(password)){ throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } - String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]"; - return JSON.parseArray(result,StaffOrgsResultDTO.class); + //String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]"; + return resultTemp; } if (userAccount.startsWith("187000111")){ throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode()); From edc12b5fa2345bc82e271cd9167a24f49fe3c6de Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 22 Sep 2022 14:47:19 +0800 Subject: [PATCH 87/98] =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=94=B9=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index f408619d7a..f996577f81 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -622,7 +622,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol //{"code":0,"msg":"success","internalMsg":"","data":[{"rootAgencyId":"53613e1c5de6ed473467f0159a10b135","rootAgencyName":"平阴县","customerId":"6f203e30de1a65aab7e69c058826cd80","customerName":"平音"}]} if ("wx2b75d556ba867750".equals(appId)){ if("18700011111".equals(userAccount)){ - if ("Py011111".equals(password)){ + if (!"Py02222".equals(password)){ throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } //String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]"; From b6f7e6f5462ddfbe55fc7db7941a3b6bcad8f48f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 21 Nov 2022 22:09:51 +0800 Subject: [PATCH 88/98] =?UTF-8?q?job=E5=A2=9E=E5=8A=A0CpAuth?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/src/main/resources/bootstrap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 4fe5a12112..b30ca0eb6f 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -88,6 +88,7 @@ spring: - Path=${server.servlet.context-path}/job/** filters: - StripPrefix=1 + - CpAuth=true #用户服务 - id: epmet-user-server uri: @gateway.routes.epmet-user-server.uri@ From c1dd0ffc2423a0e002947476747e02f338529cbb Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 23 Nov 2022 12:32:26 +0800 Subject: [PATCH 89/98] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index cb7141206f..3ddeeb78df 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -161,7 +161,8 @@ thirdplat: appkey: @thirdplat.jcet.g.appkey@ appsecret: @thirdplat.jcet.g.appsecret@ pyld: - domain: https://epmet-ext1.pingyin.gov.cn/platform + domain: https://epmet-cloud.pingyin.gov.cn/platform +# domain: https://epmet-ext1.pingyin.gov.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595 From 5bb4a0b9bfe09e7881af2c8aab44d354646c0a4b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 23 Nov 2022 15:54:50 +0800 Subject: [PATCH 90/98] =?UTF-8?q?=E5=B9=B3=E9=98=B4=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E5=8F=88=E6=94=B9=E4=BA=86=EF=BC=8C=E8=A6=81=E7=94=A8elinkserv?= =?UTF-8?q?ice.cn=EF=BC=8C=E5=86=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 2 +- .../src/main/java/com/epmet/commons/tools/enums/EnvEnum.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 3ddeeb78df..57ea62a98e 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -161,7 +161,7 @@ thirdplat: appkey: @thirdplat.jcet.g.appkey@ appsecret: @thirdplat.jcet.g.appsecret@ pyld: - domain: https://epmet-cloud.pingyin.gov.cn/platform + domain: https://epmet-cloud-pingyin.elinkservice.cn/platform # domain: https://epmet-ext1.pingyin.gov.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de 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 19f7dbbc49..feb5539e42 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 @@ -19,7 +19,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.pingyin.gov.cn/api/"), + PROD("prod", "平阴环境", "https://epmet-cloud-pingyin.elinkservice.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), ; From 63d68e12e5759957994bb1a8bc5a19a9a76209a9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 2 Dec 2022 14:30:09 +0800 Subject: [PATCH 91/98] =?UTF-8?q?=E6=8A=A5=E4=B8=AA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ShowApiServiceImpl.java | 6 ++++-- .../src/main/java/com/epmet/task/WorkDayInitTask.java | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java index 7d2aadcc2d..28fb609191 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java @@ -129,11 +129,13 @@ public class ShowApiServiceImpl implements ShowApiService { try { dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate); if (dayDetailResultDTO == null){ - logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null"); + logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常", currentDate)); + // logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null"); return; } } catch (Exception e) { - logger.error("queryHolidayV2020 exception", e); + // logger.error("queryHolidayV2020 exception", e); + logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常:%s", currentDate, e.getMessage())); return; } List list = calenderDao.selectByDay(currentDate); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java index b1e6673044..2fc300a977 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java @@ -24,11 +24,16 @@ public class WorkDayInitTask implements ITask { @Autowired private WorkDayInitService workDayInitService; + /** + * 定时任务，调用互联网api，插入calender 表数据 + * @param params 参数，多参数使用JSON数据 + */ @Override public void run(String params) { log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params); if (StringUtils.isBlank(params)){ //没有参数默认 初始化明天的 + //params: yyyyMMdd明天的日期 params = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD); } Result result = workDayInitService.workDayInit(params); @@ -38,4 +43,8 @@ public class WorkDayInitTask implements ITask { log.error("{}定时任务执行失败:{},param:{}" ,getClass().getSimpleName(), result.getMsg(), params); } } + + public static void main(String[] args) { + System.out.println(DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD)); + } } From 4d432dc91643d068c0156ead2cb5afbce2cfc3fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 13 Dec 2022 16:14:19 +0800 Subject: [PATCH 92/98] shishi --- .../src/main/resources/mapper/IcResiUserDao.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 2383d57e49..3470fa50be 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,7 +128,7 @@ - + @@ -137,6 +137,15 @@ + + + + + and ${subCondition.tableName}.${colValue} ='1' + + + + From dd562e669ae528b5e593dba9f426fafaf081cb0b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 13 Dec 2022 16:24:18 +0800 Subject: [PATCH 93/98] =?UTF-8?q?=E5=8E=BB=E6=8E=89and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 3470fa50be..b1d81bfd07 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -141,7 +141,7 @@ - and ${subCondition.tableName}.${colValue} ='1' + ${subCondition.tableName}.${colValue} ='1' From 21907fd06dc3b9a1e8b7b37d29fbb528b3f1d1d2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 20 Dec 2022 16:20:29 +0800 Subject: [PATCH 94/98] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index d14e1c9398..ab3f35cbc7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -456,7 +456,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl Date: Tue, 3 Jan 2023 10:47:37 +0800 Subject: [PATCH 95/98] =?UTF-8?q?/gov/org/enterprise/export=E4=B9=9D?= =?UTF-8?q?=E5=B0=8F=E5=9C=BA=E6=89=80=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89scaleTotal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java index 9188b748b7..cf045560bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java @@ -85,6 +85,7 @@ public class EnterpriseExportExcelDTO { @ExcelIgnore private String scale; + @ExcelIgnore private Integer scaleTotal; /** * 规模名称 From f43e51ddc381a30973033912ae98da0a8115577b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 3 Jan 2023 11:02:40 +0800 Subject: [PATCH 96/98] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 3cf6e804e9..3a65fd24e9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,15 +128,6 @@ - - - - - and ${subCondition.tableName}.${colValue} ='1' - - - - From ecfc7d32737c1213f3de533fe3b2e9b4f599a735 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 6 Jan 2023 11:11:17 +0800 Subject: [PATCH 97/98] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml index 1b311eb25c..c8d61d6d6d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/ScreenPyHistoryScoreDao.xml @@ -58,7 +58,7 @@ SELECT - COUNT(DISTINCT STAFF_ID) gridStaffNum + COUNT(id) gridStaffNum FROM screen_py_grid_staff WHERE