From a5973d73333b01e3e7791aa9a6ca8dda7b25b473 Mon Sep 17 00:00:00 2001 From: RXS Date: Sat, 20 May 2023 22:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 26 +++- epmet-auth/pom.xml | 4 +- epmet-auth/src/main/resources/bootstrap.yml | 34 +++-- .../commons/tools/config/RedissonConfig.java | 28 ++--- epmet-gateway/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../data-aggregator-server/pom.xml | 34 ++--- .../src/main/resources/bootstrap.yml | 34 +++-- .../data-report/data-report-server/pom.xml | 12 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../data-statistical-server/pom.xml | 118 +++++++++++------- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-activiti-server/pom.xml | 2 +- .../common-service-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-ext/epmet-ext-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-heart/epmet-heart-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-job/epmet-job-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-message-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-oss/epmet-oss-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 38 ++++-- .../epmet-point/epmet-point-server/pom.xml | 12 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../epmet-third/epmet-third-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../gov-access/gov-access-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-module/gov-grid/gov-grid-server/pom.xml | 6 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../gov-issue/gov-issue-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-module/gov-mine/gov-mine-server/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-module/gov-org/gov-org-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../gov-project/gov-project-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../gov-voice/gov-voice-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../open-data-worker-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../oper-access/oper-access-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-module/oper-crm/oper-crm-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../oper-customize-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-group/resi-group-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-guide/resi-guide-server/pom.xml | 8 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-hall/resi-hall-server/pom.xml | 6 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-home/resi-home-server/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-mine/resi-mine-server/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-partymember-server/pom.xml | 10 +- .../src/main/resources/bootstrap.yml | 34 +++-- .../resi-voice/resi-voice-server/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-openapi/epmet-openapi-scan/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 34 +++-- epmet-user/epmet-user-server/pom.xml | 11 +- .../processor/YanTaiNatSyncProcessor.java | 6 +- .../YanTaiResiComparisonSyncProcessor.java | 8 +- .../YanTaiTripReportSyncProcessor.java | 4 +- .../processor/YanTaiVaccineSyncProcessor.java | 6 +- .../src/main/resources/bootstrap.yml | 34 +++-- 74 files changed, 1059 insertions(+), 552 deletions(-) diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 255524170b..1954b1cc82 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 @@ -268,8 +268,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -278,11 +278,11 @@ true - true + false true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 ac0dc26592..77327d7b1f 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -18,7 +18,21 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 + database: @spring.redis.index@ + # 密码(如没有密码请注释掉) + password: @spring.redis.password@ + # 连接超时时间 + timeout: 30s + # 是否开启ssl + ssl: false +# redis: # 烟台使用cluster模式下使用cluster:配置段 # database: @spring.redis.index@ # host: @spring.redis.host@ @@ -26,12 +40,12 @@ spring: # password: @spring.redis.password@ # timeout: 30s - database: @spring.redis.index@ - password: @spring.redis.password@ - timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ +# database: @spring.redis.index@ +# 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/pom.xml b/epmet-auth/pom.xml index 8ec3d7e6e4..0438a3394d 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -384,8 +384,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 534d1d79a3..3f11ee9eba 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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 c745f4d9c5..efa9e15fea 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 @@ -16,19 +16,19 @@ import org.springframework.context.annotation.Configuration; * redisson 配置类 */ @Slf4j -@Configuration +//@Configuration public class RedissonConfig { - //@Value("${spring.redis.host}") - //private String host; - //@Value("${spring.redis.port}") - //private String port; + @Value("${spring.redis.host}") + private String host; + @Value("${spring.redis.port}") + 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; + @Value("${spring.redis.cluster.max-redirects}") + private Integer rediTimes; @Bean @@ -47,15 +47,15 @@ public class RedissonConfig { //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); +// config.useClusterServers().addNodeAddress(getClusterNodes()); +// config.useClusterServers().setPassword(password); +// config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); return Redisson.create(config); } catch (Exception e) { diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 46c69b55f3..464a43fc93 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -515,8 +515,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 8efbf5c56e..281cae6482 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -17,20 +17,34 @@ spring: messages: encoding: UTF-8 basename: i18n/messages_common + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index bdd3fcda4f..436f573b00 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -606,96 +606,96 @@ - + 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 - + epmet_heart_user EpmEt-db-UsEr - + epmet_resi_partymember_user EpmEt-db-UsEr @@ -711,8 +711,8 @@ true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -722,7 +722,7 @@ true - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 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 7f041b60f0..74d41ea992 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 @@ -9,20 +9,34 @@ spring: allow-bean-definition-overriding: true application: name: data-aggregator-server + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index d4e21f6a8b..a9847176cd 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -334,19 +334,19 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr @@ -362,8 +362,8 @@ true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -373,7 +373,7 @@ true - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 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 71cc5eeb04..85acb5be93 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index fc14a26018..a475bbf9a4 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -239,13 +239,15 @@ - epmet_data_stats_display_user + epmet_data_stats_display_user + EpmEt-db-UsEr - epmet_evaluation_index_user + epmet_evaluation_index_user + EpmEt-db-UsEr @@ -257,7 +259,8 @@ - epmet_resi_partymember_user + epmet_resi_partymember_user + EpmEt-db-UsEr @@ -276,7 +279,8 @@ - epmet_oper_customize_user + epmet_oper_customize_user + EpmEt-db-UsEr @@ -305,11 +309,15 @@ 20 60 data-statistical - callerRunsPolicy + callerRunsPolicy + - https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 - SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + true @@ -377,13 +385,15 @@ - epmet_data_stats_display_user + epmet_data_stats_display_user + EpmEt-db-UsEr - epmet_evaluation_index_user + epmet_evaluation_index_user + EpmEt-db-UsEr @@ -395,7 +405,8 @@ - epmet_resi_partymember_user + epmet_resi_partymember_user + EpmEt-db-UsEr @@ -414,7 +425,8 @@ - epmet_oper_customize_user + epmet_oper_customize_user + EpmEt-db-UsEr @@ -443,11 +455,15 @@ 20 60 data-statistical - callerRunsPolicy + callerRunsPolicy + - https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 - SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + false @@ -580,11 +596,15 @@ 20 60 data-statistical - callerRunsPolicy + callerRunsPolicy + - https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 - SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + + https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4 + + SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd + true @@ -599,93 +619,99 @@ - + 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_data_stats_display_user + EpmEt-db-UsEr - + - epmet_evaluation_index_user + epmet_evaluation_index_user + EpmEt-db-UsEr - + - epmet_cloud_viewer - EpmEtclOUdvIEwEr@w + epmet_cloud_viewer + + EpmEtclOUdvIEwEr@w + - + - epmet_resi_partymember_user + epmet_resi_partymember_user + EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr - + - epmet_oper_customize_user + epmet_oper_customize_user + EpmEt-db-UsEr @@ -698,8 +724,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -717,15 +743,19 @@ 20 60 data-statistical - callerRunsPolicy + callerRunsPolicy + - https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 - SEC134641aac79c2514b74cbb87028d706c34d071747f60a279a34bf8d2ad75be8e + + https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 + + SEC134641aac79c2514b74cbb87028d706c34d071747f60a279a34bf8d2ad75be8e + true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 bcbd6c5d7f..c7e0e37749 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e83d67b9d0..ee3132d1da 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -299,7 +299,7 @@ true 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false 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 aff8171bbb..d7a0ee9ce0 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 @@ -284,8 +284,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -293,7 +293,7 @@ true - true + false https://estos.elinkservice.cn:7519/estos/ producerService/producer/sendMsg 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 179b755443..acb0f0c03a 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 66be7f50af..86d480f601 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -348,7 +348,7 @@ - + epmet_third_user EpmEt-db-UsEr @@ -362,8 +362,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -371,7 +371,7 @@ true - true + 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 4a313be933..211d16bc8e 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index d812566efc..7fa21b99db 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,7 +331,7 @@ - + epmet_heart_user EpmEt-db-UsEr @@ -345,8 +345,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -354,7 +354,7 @@ true - true + false https://epmet-open.elinkservice.cn/api/epmetscan/api https://estos.elinkservice.cn:7519/estos/ @@ -367,7 +367,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 3c14639a2f..7dee840cd6 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 2254ed7faa..1754239c84 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,7 +262,7 @@ - + epmet_job_user EpmEt-db-UsEr @@ -276,8 +276,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -286,7 +286,7 @@ true - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 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 5af363b1b1..b68eaa7982 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index e900c8ba1a..79af386402 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -319,7 +319,7 @@ - + epmet_message_user EpmEt-db-UsEr @@ -333,8 +333,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -343,7 +343,7 @@ true - true + false true @@ -362,7 +362,7 @@ - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 331f3db593..34383adb04 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index ea22b95498..fbe84e2bcb 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -279,7 +279,7 @@ - + epmet_oss_user EpmEt-db-UsEr @@ -293,8 +293,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -311,7 +311,7 @@ epmet-oss callerRunsPolicy - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 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 fa4190e991..64fe7d2efb 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 @@ -18,22 +18,36 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - cluster-enabled: true - -# database: @spring.redis.index@ -# host: @spring.redis.host@ -# port: @spring.redis.port@ -# password: @spring.redis.password@ -# timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# redis: +# # 烟台使用cluster模式下使用cluster:配置段 +# cluster-enabled: true +# +## database: @spring.redis.index@ +## host: @spring.redis.host@ +## port: @spring.redis.port@ +## password: @spring.redis.password@ +## timeout: 30s +# +# database: @spring.redis.index@ +# 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/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index f9e1eb6d09..a5d3707e76 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -250,7 +250,7 @@ EpmEtrEdIs!q@w true - 192.168.10.150:8848 + 172.16.3.87 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae @@ -290,7 +290,7 @@ - + epmet_point_user EpmEt-db-UsEr @@ -304,8 +304,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -313,7 +313,7 @@ true - true + false true @@ -330,7 +330,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 3d070660a5..3b4bca61df 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 24afa0e236..d903147819 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -380,7 +380,7 @@ - + epmet_third_user EpmEt-db-UsEr @@ -394,8 +394,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -412,7 +412,7 @@ epmet-third callerRunsPolicy - true + 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 8d8ec22d19..8c2f2d040b 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index e1951b2004..98590117a3 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 @@ -262,8 +262,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -281,7 +281,7 @@ callerRunsPolicy - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 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 20d6d335f4..872472699f 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 95f1e72ff2..bd684e1938 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -242,8 +242,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -260,7 +260,7 @@ gov-grid callerRunsPolicy - true + 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 68f74098e9..4b88552964 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index f26a6595bb..37bb32be84 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,7 +303,7 @@ - + epmet_gov_issue_user EpmEt-db-UsEr @@ -317,8 +317,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -335,7 +335,7 @@ gov-issue callerRunsPolicy - true + false https://epmet-open.elinkservice.cn/api/epmetscan/api @@ -347,7 +347,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 ac509eac60..290b412362 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 83cddf8796..733836328e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -256,8 +256,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 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 2d242d0bf3..bb2ff26517 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 36dee53ef8..f72326e483 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -359,7 +359,7 @@ - + epmet_gov_org_user EpmEt-db-UsEr @@ -373,8 +373,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -391,7 +391,7 @@ gov-org callerRunsPolicy - true + false @@ -402,7 +402,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 6c649a5210..92e3285990 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index 5935543337..b394b9833b 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -338,7 +338,7 @@ - + epmet_gov_project_user EpmEt-db-UsEr @@ -352,8 +352,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -370,7 +370,7 @@ gov-project callerRunsPolicy - true + false https://epmet-open.elinkservice.cn/api/epmetscan/api 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 2dffa79357..4bae7e888c 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 95d95d6cd0..f12a7a66db 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 @@ -273,8 +273,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -291,7 +291,7 @@ gov-voice callerRunsPolicy - true + false https://epmet-open.elinkservice.cn/api/epmetscan/api 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 9cd583e6b2..eb59702799 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index e89af673af..b98bdb74df 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 @@ -287,8 +287,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -306,7 +306,7 @@ callerRunsPolicy - true + false https://oapi.dingtalk.com/robot/send?access_token=c96c904b375f8b63eb10036db43a18628365dd87aa8669a9052cf95c911b4df0 @@ -314,7 +314,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 c7e8211644..07e311190d 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 12e0dd45b2..1f3c8f910c 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 @@ -258,8 +258,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -276,7 +276,7 @@ oper-access callerRunsPolicy - true + 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 4a2a550673..093f8b8752 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 20b4004210..b1c6482999 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,7 +298,7 @@ - + epmet_oper_crm_user EpmEt-db-UsEr @@ -312,8 +312,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -330,7 +330,7 @@ oper-crm callerRunsPolicy - true + 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 4c5ffb1a0d..53eb988991 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index ba6a1705a9..410f8068aa 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,7 +299,7 @@ - + epmet_oper_customize_user EpmEt-db-UsEr @@ -313,8 +313,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -331,7 +331,7 @@ oper-customize callerRunsPolicy - true + false @@ -342,7 +342,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 678ced872d..20615e417f 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f90581a6d2..ae8185da77 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 @@ -358,8 +358,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -368,7 +368,7 @@ true - true + false https://estos.elinkservice.cn:7519/estos/ @@ -395,7 +395,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87: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 476b3628b2..ddb537d7fe 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 5136e14a06..fd5a5c8fb6 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 @@ -279,8 +279,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -298,7 +298,7 @@ epmet-guide- callerRunsPolicy - true + 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 9aa89fc099..7e0fef4095 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index f85492e67a..b7e605b946 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -225,8 +225,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -243,7 +243,7 @@ resi-hall callerRunsPolicy - true + 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 42378eac77..6ed51e10cc 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 平阴cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 7678c9dee5..9b42189326 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -246,8 +246,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 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 6088c301b9..1a9395470b 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 34bba3c8a9..058414654c 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -262,8 +262,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 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 ab93430f80..dfd4216fc8 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index d033c9f8dc..e6c3dbb8a3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -332,7 +332,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr @@ -346,8 +346,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -365,7 +365,7 @@ resi-partymember- callerRunsPolicy - true + false @@ -377,7 +377,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87:9876 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 dfc0d9fee4..f94b55453d 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 @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 9982b4e47b..ace0cba108 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -225,8 +225,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 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 f5a72cf7a8..3680029d0b 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 @@ -15,20 +15,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 1c12e088a1..d277c67983 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -226,8 +226,8 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 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 9fef5568d4..5b9574ec37 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# 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/pom.xml b/epmet-user/epmet-user-server/pom.xml index 19cae9270c..7ae0c21357 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -349,7 +349,7 @@ - + epmet_user_user EpmEt-db-UsEr @@ -363,9 +363,10 @@ rEdIs@yAntAI_666 true - 10.2.2.51:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.16.3.87 + + bf153d2b-7aa5-4b6e-ba7b-4977e54eb126 false @@ -373,7 +374,7 @@ true - true + false https://epmet-open.elinkservice.cn/api/epmetscan/api @@ -384,7 +385,7 @@ true - 10.2.2.50:9876;10.2.2.51:9876 + 172.16.3.86:9876;172.16.3.87:9876 true diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java index 44c3b5e1a1..0e9311ab1c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java @@ -15,11 +15,11 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_NAT; * @Author wxz * @Date 2022/11/20 上午11:43 */ -@Component +//@Component @Slf4j public class YanTaiNatSyncProcessor extends AbstractDataSyncJobProcessor { - @Autowired +// @Autowired private DataSyncConfigService dataSyncConfigService; /** @@ -29,7 +29,7 @@ public class YanTaiNatSyncProcessor extends AbstractDataSyncJobProcessor { * @author wxz * @date 2022/11/8 下午5:42 */ - @Scheduled(cron = "0/10 * * * * ? ") +// @Scheduled(cron = "0/10 * * * * ? ") public void scanJobs() { scanAndExecWaitingJobs(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java index 1f9fd9288f..ba51665ddf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiResiComparisonSyncProcessor.java @@ -14,21 +14,21 @@ import org.springframework.stereotype.Component; * @Author wxz * @Date 2022/11/15 下午5:54 */ -@Component +//@Component @Slf4j public class YanTaiResiComparisonSyncProcessor extends AbstractDataSyncJobProcessor { - @Autowired +// @Autowired private IcResiComparisonRecordService icResiComparisonRecordService; - @Autowired +// @Autowired RedisUtils redisUtils; /** * 定时扫描和执行同步任务 * 10s扫一次库 */ - @Scheduled(cron = "0/10 * * * * ? ") +// @Scheduled(cron = "0/10 * * * * ? ") public void scanJobs() { scanAndExecWaitingJobs(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java index 1bb4afd991..23720aab82 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java @@ -18,7 +18,7 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_TRIP_REPORT; @Slf4j public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor { - @Autowired +// @Autowired private DataSyncConfigService dataSyncConfigService; /** @@ -26,7 +26,7 @@ public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor * @Author zxc * @Date 2022/11/11 10:32 */ - @Scheduled(cron = "0/10 * * * * ? ") +// @Scheduled(cron = "0/10 * * * * ? ") public void scanJobs() { scanAndExecWaitingJobs(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java index 5c633e74d2..7435f71aa5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiVaccineSyncProcessor.java @@ -15,11 +15,11 @@ import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; * @Author wxz * @Date 2022/11/20 上午11:55 */ -@Component +//@Component @Slf4j public class YanTaiVaccineSyncProcessor extends AbstractDataSyncJobProcessor { - @Autowired +// @Autowired private DataSyncConfigService dataSyncConfigService; /** @@ -27,7 +27,7 @@ public class YanTaiVaccineSyncProcessor extends AbstractDataSyncJobProcessor { * @Author zxc * @Date 2022/11/11 10:32 */ - @Scheduled(cron = "0/10 * * * * ? ") +// @Scheduled(cron = "0/10 * * * * ? ") public void scanJobs() { scanAndExecWaitingJobs(); } 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 8618daf1bf..8552f698c7 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -18,20 +18,34 @@ spring: jackson: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss + # redis 单机配置(单机与集群只能开启一个另一个需要注释掉) redis: - # 烟台使用cluster模式下使用cluster:配置段 - # database: @spring.redis.index@ - # host: @spring.redis.host@ - # port: @spring.redis.port@ - # password: @spring.redis.password@ - # timeout: 30s - + # 地址 + host: 172.16.3.87 + # 端口，默认为6379 + port: 6379 + # 数据库索引 database: @spring.redis.index@ + # 密码(如没有密码请注释掉) password: @spring.redis.password@ + # 连接超时时间 timeout: 30s - cluster: - nodes: @spring.redis.cluster.nodes@ - max-redirects: @spring.redis.cluster.max-redirects@ + # 是否开启ssl + ssl: false +# 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@ +# password: @spring.redis.password@ +# timeout: 30s +# cluster: +# nodes: @spring.redis.cluster.nodes@ +# max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL