diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 0b0159861..284b130f5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -255,17 +255,17 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - http://172.31.171.61:9411 + http://192.168.203.30:9411 wxdd8530c5f4926766 @@ -281,12 +281,12 @@ 7db9f049c78c9a6cafa673deebe8330d - + epdc Elink@833066 - 172.16.0.53:9876;172.16.0.51:9876 + 1192.168.203.29:9876;192.168.203.30:9876 organizationGroup diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml index 7b496ab42..9ed6cf69c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml @@ -36,9 +36,9 @@ spring: merge-sql: false data: mongodb: - host: dds-m5e31db1fcc742341.mongodb.rds.aliyuncs.com - port: 3717 + host: 192.168.203.30 + port: 27017 username: root - password: 'Elink833066' + password: '123456' database: gis authentication-database: admin diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index abeae74ce..824644341 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -155,17 +155,17 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - http://172.31.171.61:9411 + http://192.168.203.30:9411 diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index 4ee6a3054..fa2c20005 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit 4ee6a3054b7c0cc5d5d36aa01abe5f6ae67663db +Subproject commit fa2c20005c4b52aa606b2433c38ce51d3111ff9e diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 5d430044f..27845fa31 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -180,13 +180,13 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 https://epmet-open.elinkservice.cn/api diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml index 720816c8a..eec828e5f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml @@ -3,51 +3,51 @@ spring: driverClassName: com.mysql.jdbc.Driver druid: first: #数据源1 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 second: #数据源2 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 third: #数据源3 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 fourth: #数据源4 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 fifth: #数据源5 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 sixth: #数据源6 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 seventh: #数据源7 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 eighth: #数据源8 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 ninth: #数据源9 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 tenth: #数据源10 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 eleventh: #数据源11 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 twelve: #数据源12 - url: jdbc:mysql://h6z1zs369h8mdqldfcaf-rw4rm.rwlb.rds.aliyuncs.com:3306/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.203.31:3306/esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: epdc password: Elink@833066 initial-size: 10 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index ea7a03593..cc8262a65 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -282,18 +282,18 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml index f7bd49854..1d00f4144 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/pom.xml @@ -233,18 +233,18 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml index 2a8effd7c..17acc6e84 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml @@ -250,18 +250,18 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 @@ -278,7 +278,7 @@ wx9b6102a8ee5add65 394f47d4e08fc0fd629231d3f68a34dc - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 30fa8fe72..d5971b8c5 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -255,18 +255,18 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 @@ -283,7 +283,7 @@ wx9b6102a8ee5add65 394f47d4e08fc0fd629231d3f68a34dc - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup categoryGroup categoryGroup diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index 41e8592bc..3be5b42a5 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -219,22 +219,22 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup contentSecurityGroup diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index cce8106cb..1deee4df0 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -233,22 +233,22 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup categoryGroup diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 3f3a43d98..78a3f7153 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -213,18 +213,18 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 5a798ca35..e93538599 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -195,22 +195,22 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup categoryGroup diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index 36a99cff8..721d7486a 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -206,12 +206,12 @@ 9062 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index a15a2a721..eb6837357 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -201,22 +201,22 @@ 9064 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index 38634aecb..aebf20853 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -240,18 +240,18 @@ 9065 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml index c05efd25b..1edf09c16 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml @@ -130,7 +130,7 @@ 2 - r-v0l694084401a044pd.redis.rds.aliyuncs.com + 192.168.203.30 6379 CJ!redis@elink @@ -189,22 +189,22 @@ 9070 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - http://localhost:9411 + http://192.168.203.30:9411 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index aeeda38b9..6b1bca022 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -216,27 +216,27 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 - + epdc Elink@833066 true - 172.16.0.53:8848 + 192.168.203.32:8848 - 172.16.0.53:9876;172.16.0.51:9876 + 192.168.203.29:9876;192.168.203.30:9876 organizationGroup diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index 6dafa2c0a..d057a2481 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -182,19 +182,19 @@ 0 - r-m5evpexxjmi6xmsiwj.redis.rds.aliyuncs.com + 192.168.203.30 6379 Elink833066 - + epdc Elink@833066 false - 172.16.0.53:8848 + 192.168.203.32:8848