diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 5bf6b3f83..da5e8d6e4 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -158,6 +158,7 @@ organizationGroup + test @@ -188,82 +189,9 @@ organizationGroup - - prod - - 9055 - prod - prod - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - true - 10.5.34.164:8848 - - - http://172.31.171.61:9411 - - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 - - wx9f20a46906ab2c3e - dc13065f79429979d9f687d249eb5c4e - - wx9b6102a8ee5add65 - 394f47d4e08fc0fd629231d3f68a34dc - - - - - epdc - Elink@833066 - - - - - prod_kongcun - - 9055 - prod - prod - - - true - 172.16.1.238:8848 - - - http://172.31.171.61:9411 - - wx04ee7d7a849fa2a8 - 3980e207b86bccea8d3c0bf7d16adeba - - wxddb240334d09049f - 071b8c70da0d0482aaf79052e64f83bc - - wx9b6102a8ee5add65 - 394f47d4e08fc0fd629231d3f68a34dc - - - - - epdc - Elink@833066 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - prod_shibei_aliyun + prod 9055 prod @@ -305,38 +233,5 @@ organizationGroup - - - prod_jinshui - - 9100 - prod - prod - - - true - 172.20.0.4:80 - - http://172.31.171.61:9411 - - wx6dcf544cdae7d4ec - 9e0882274ad3821400370312a56a8470 - - wxddb240334d09049f - 071b8c70da0d0482aaf79052e64f83bc - - - - - epdc - Elink@833066 - - - 0 - 172.19.0.11 - 6379 - epdc!redis@master1405 - - diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index 2cebb2adc..44ac7ae0a 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -142,29 +142,9 @@ http://localhost:9411 - - prod - - 9056 - prod - prod - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - true - 10.5.34.164:8848 - - http://172.31.171.61:9411 - - - prod_shibei_aliyun + prod 9056 prod @@ -183,26 +163,5 @@ http://172.31.171.61:9411 - - - prod_kongcun - - 9056 - prod - prod - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - true - 172.16.1.238:8848 - - http://172.31.171.61:9411 - - diff --git a/esua-epdc/epdc-auth/src/main/resources/application.yml b/esua-epdc/epdc-auth/src/main/resources/application.yml index cec8d42d9..e509da4a9 100644 --- a/esua-epdc/epdc-auth/src/main/resources/application.yml +++ b/esua-epdc/epdc-auth/src/main/resources/application.yml @@ -3,7 +3,6 @@ server: servlet: context-path: /auth - spring: application: name: epdc-auth-server diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index a200d2ce3..4f9f00251 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -90,6 +90,8 @@ 9094 + dev + dev 2 @@ -186,96 +188,12 @@ http://localhost:9411 - - prod - - 9094 - prod - - - lb://epdc-auth-server - lb://epdc-admin-server - lb://epdc-activiti-server - - lb://epdc-api-server - lb://epdc-app-server - lb://epdc-heart-server - lb://epdc-job-server - lb://epdc-message-server - - lb://epdc-news-server - lb://epdc-oss-server - lb://epdc-cloud-analysis-server - lb://epdc-events-server - lb://epdc-services-server - - lb://epdc-user-server - lb://epdc-demo-server - lb://epdc-group-server - lb://epdc-websocket-server - lb://epdc-kpi-server - lb://epdc-custom-server - lb://epdc-analysis-server - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - true - 10.5.34.164:8848 - - http://localhost:9411 - - - prod_kongcun - - 9094 - prod - - - lb://epdc-auth-server - lb://epdc-admin-server - lb://epdc-activiti-server - lb://epdc-api-server - lb://epdc-app-server - lb://epdc-heart-server - lb://epdc-job-server - lb://epdc-message-server - lb://epdc-news-server - lb://epdc-oss-server - lb://epdc-cloud-analysis-server - lb://epdc-events-server - lb://epdc-services-server - lb://epdc-user-server - lb://epdc-demo-server - lb://epdc-group-server - lb://epdc-websocket-server - lb://epdc-kpi-server - lb://epdc-custom-server - lb://epdc-analysis-server - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - true - 172.16.1.238:8848 - - http://localhost:9411 - - - - - prod_shibei_aliyun + prod 9094 + prod prod @@ -309,6 +227,7 @@ true 172.16.0.52:8848 + http://localhost:9411 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 7684d5b03..45570f83a 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 @@ -120,15 +120,18 @@ true - dev - 9077 + dev + dev + + 2 47.104.224.45 6379 elink@888 + false 47.104.224.45:8848 @@ -138,64 +141,30 @@ test - test - 9077 + test + test + + 2 47.104.224.45 6379 elink@888 + true 47.104.224.45:8848 - + 47.104.85.99 prod - prod - 9077 - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - prod - - 9077 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - - 9077 + prod 0 @@ -206,6 +175,7 @@ true 172.16.0.52:8848 + 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 cea0ef89b..9b889f159 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 @@ -153,6 +153,7 @@ dev + dev 9040 @@ -192,6 +193,7 @@ test test + test 10003 @@ -208,7 +210,7 @@ true 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 wx3ef8f2cd12a19fcb @@ -233,86 +235,11 @@ prod - prod - prod - 9040 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - wx3ef8f2cd12a19fcb - 948aa2f21dbaa3943288ea5b119ac6f2 - 111 - 111 - - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 - - wx9f20a46906ab2c3e - dc13065f79429979d9f687d249eb5c4e - - wxfa4afaa2b5f9c876 - 7db9f049c78c9a6cafa673deebe8330d - - - - - prod_kongcun - prod prod - 9040 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - wx3ef8f2cd12a19fcb - 948aa2f21dbaa3943288ea5b119ac6f2 - 111 - 111 - - wx04ee7d7a849fa2a8 - 3980e207b86bccea8d3c0bf7d16adeba - - wxddb240334d09049f - 071b8c70da0d0482aaf79052e64f83bc - - wxfa4afaa2b5f9c876 - 7db9f049c78c9a6cafa673deebe8330d - - - - - prod_shibei_aliyun - - prod - prod - - 9040 0 172.16.0.54 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 7a2470a04..0c43534a4 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 @@ -74,12 +74,12 @@ 1.0.0 compile - - - - - - + + + + + + com.esua.epdc @@ -154,6 +154,7 @@ dev + dev 9076 @@ -180,7 +181,7 @@ false 47.104.224.45:8848 - + 47.104.85.99:9876;114.215.125.123:9876 organizationGroup @@ -191,6 +192,7 @@ test test + test 10004 @@ -217,6 +219,7 @@ true 47.104.224.45:8848 + 47.104.85.99 47.104.85.99:9876;114.215.125.123:9876 organizationGroup @@ -227,54 +230,7 @@ prod prod - - 9076 - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - - 9076 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod + prod 9076 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml index 9018540c8..cfa2a0659 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml @@ -28,6 +28,7 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ alibaba: seata: tx-service-group: epdc-custom-server-fescar-service-group @@ -95,4 +96,4 @@ wx: rocketmq: name-server: @rocketmq.name.server@ consumer: - group: @rocketmq.consumer.group@ \ No newline at end of file + group: @rocketmq.consumer.group@ 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 05455c3c4..0eb3fe1ce 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 @@ -153,6 +153,7 @@ dev + dev 9066 @@ -171,8 +172,6 @@ 47.104.224.45:8848 - dev - wxdd8530c5f4926766 5bf4fb813145431b3493a10aa7e041e9 @@ -188,20 +187,13 @@ categoryGroup categoryGroup - test test + test 10005 @@ -218,9 +210,7 @@ true 47.104.224.45:8848 - 219.146.91.110 - - test + 47.104.85.99 wxdd8530c5f4926766 @@ -237,93 +227,14 @@ categoryGroup categoryGroup - prod prod - - 9066 - - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - prod - - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 - - wx9f20a46906ab2c3e - dc13065f79429979d9f687d249eb5c4e - - wx9b6102a8ee5add65 - 394f47d4e08fc0fd629231d3f68a34dc - - - - - prod_kongcun - - prod - - 9066 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - prod - - - wx04ee7d7a849fa2a8 - 3980e207b86bccea8d3c0bf7d16adeba - - wxddb240334d09049f - 071b8c70da0d0482aaf79052e64f83bc - - wx9b6102a8ee5add65 - 394f47d4e08fc0fd629231d3f68a34dc - - - - - prod_shibei_aliyun - - prod - 9066 @@ -341,7 +252,6 @@ true 172.16.0.52:8848 - prod wxdd8530c5f4926766 @@ -362,41 +272,6 @@ categoryGroup - - - prod_jinshui - - prod - - 9066 - - prod - - - wx6dcf544cdae7d4ec - 9e0882274ad3821400370312a56a8470 - - - wxddb240334d09049f - 071b8c70da0d0482aaf79052e64f83bc - - - 0 - 172.19.0.11 - 6379 - epdc!redis@master1405 - - - true - 172.20.0.4:80 - - - - - epdc - Elink@833066 - - 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 7dcf58db5..7ed40e83b 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 @@ -120,6 +120,7 @@ dev + dev 9063 @@ -147,6 +148,7 @@ test test + test 10006 @@ -163,7 +165,7 @@ true 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 47.104.85.99:9876;114.215.125.123:9876 organizationGroup @@ -178,56 +180,6 @@ 9063 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9063 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - prod - - 9063 - 0 172.16.0.54 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 a375fd05f..a43b088c5 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 @@ -89,6 +89,7 @@ dev + dev 9060 @@ -115,6 +116,7 @@ test test + test 10007 @@ -131,59 +133,7 @@ false 47.104.224.45:8848 - 219.146.91.110 - - http://localhost:9411 - - - - - prod - - prod - - 9060 - - 2 - 47.104.224.45 - 6379 - elink@888 - - - - - epdc - elink888 - - false - 47.104.224.45:8848 - - http://localhost:9411 - - - - - prod_kongcun - - prod - - 9060 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - elink888 - - - true - 172.16.1.238:8848 + 47.104.85.99 http://localhost:9411 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 488557e1e..06c49e91c 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 @@ -75,10 +75,6 @@ springfox-swagger-ui ${swagger.version} - io.github.openfeign @@ -147,6 +143,7 @@ dev + dev 9061 @@ -163,20 +160,15 @@ false 47.104.224.45:8848 + - test test + test 10008 @@ -193,14 +185,8 @@ true 47.104.224.45:8848 + 47.104.85.99 - @@ -210,54 +196,7 @@ prod 9061 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9061 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - prod - 9061 0 172.16.0.54 @@ -272,32 +211,7 @@ true 172.16.0.52:8848 - - - - - prod_jinshui - - prod - prod - - 9061 - - - 0 - 172.19.0.11 - 6379 - epdc!redis@master1405 - - - true - 172.20.0.4:80 - - - - - epdc - Elink@833066 + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml index cfd80c920..27d91f75d 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml @@ -47,6 +47,7 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ alibaba: seata: tx-service-group: epdc-job-server-fescar-service-group 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 de413d136..0811339ab 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 @@ -123,6 +123,7 @@ dev + dev 9069 @@ -139,24 +140,20 @@ false 47.104.224.45:8848 + + 47.104.85.99:9876;114.215.125.123:9876 organizationGroup categoryGroup - test test + test 10009 @@ -173,18 +170,13 @@ true 47.104.224.45:8848 + 47.104.85.99 + 47.104.85.99:9876;114.215.125.123:9876 organizationGroup categoryGroup - @@ -193,53 +185,6 @@ prod prod - 9069 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9987 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - 9069 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml index 93f09790d..cca1b9596 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml @@ -53,6 +53,7 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ alibaba: seata: tx-service-group: epdc-kpi-server-fescar-service-group 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 3e847f3fd..915c33c1c 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 @@ -143,6 +143,7 @@ dev + dev 9062 @@ -167,6 +168,7 @@ test test + test 10010 @@ -183,7 +185,7 @@ true 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 @@ -193,54 +195,6 @@ prod prod - 9062 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9062 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - prod - 9062 0 @@ -256,6 +210,7 @@ true 172.16.0.52:8848 + 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 f7938b0f5..e38f4b980 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 @@ -114,6 +114,7 @@ dev + dev 9064 @@ -141,6 +142,7 @@ test test + test 10011 @@ -157,7 +159,8 @@ true 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 + 47.104.85.99:9876;114.215.125.123:9876 organizationGroup @@ -170,54 +173,6 @@ prod prod - 9064 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9064 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - prod - 9064 0 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 b13946ab6..86c0eaa92 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 @@ -156,6 +156,7 @@ dev + dev 9065 @@ -181,6 +182,7 @@ test test + test 9065 @@ -197,7 +199,7 @@ true 47.104.224.45:8848 - + 47.104.85.99 @@ -209,61 +211,6 @@ prod prod - 9065 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - 10.5.34.165:22122 - - - - - prod_kongcun - - prod - prod - - 9065 - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - 172.16.1.239:22122 - - - - - prod_shibei_aliyun - - prod - prod - 9065 0 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 39c323fd1..36e308097 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 @@ -124,6 +124,7 @@ dev + dev 9068 @@ -157,6 +158,7 @@ test test + test 10013 @@ -179,7 +181,8 @@ true 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 + 47.104.85.99:9876;114.215.125.123:9876 organizationGroup @@ -194,56 +197,6 @@ 9068 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - - - - prod_kongcun - - prod - prod - - 9068 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - - - - prod_shibei_aliyun - - prod - prod - - 9068 - 0 172.16.0.54 diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index 12eeca46d..595795f97 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -124,6 +124,7 @@ 9075 dev + dev 2 47.104.224.45 @@ -146,6 +147,7 @@ 10014 test + test 2 47.104.224.45 @@ -160,7 +162,7 @@ false 47.104.224.45:8848 - 219.146.91.110 + 47.104.85.99 @@ -168,50 +170,7 @@ 9075 prod - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - false - 10.5.34.164:8848 - - - - prod_kongcun - - 9075 - prod - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - - false - 172.16.1.238:8848 - - - - prod_shibei_aliyun - - 9075 - prod + prod 0 @@ -228,6 +187,7 @@ false 172.16.0.52:8848 + diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/application.yml index e57062c70..67280224c 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/application.yml @@ -28,6 +28,7 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ alibaba: seata: tx-service-group: epdc-webservice-fescar-service-group diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 1f38cd04e..3dcc78c74 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -137,6 +137,7 @@ dev + dev 9988 @@ -153,6 +154,8 @@ false 47.104.224.45:8848 + + wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 @@ -168,6 +171,7 @@ test test + test 10015 @@ -184,14 +188,16 @@ true 47.104.224.45:8848 + 47.104.85.99 + wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 111 111 - - + + wx5d3e97461d248397 bfed51b731e53db9affb9e6131e7ae12 @@ -206,72 +212,6 @@ 9988 - - 0 - 10.5.34.164 - 6379 - Elink@833066 - - - - - epdc - Elink@833066 - - true - 10.5.34.164:8848 - - wx3ef8f2cd12a19fcb - 948aa2f21dbaa3943288ea5b119ac6f2 - 111 - 111 - - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 - - - - - prod_kongcun - - prod - prod - - 9988 - - - 0 - 172.16.1.238 - 6379 - Elink833066 - - - - - epdc - Elink@833066 - - true - 172.16.1.238:8848 - - wx3ef8f2cd12a19fcb - 948aa2f21dbaa3943288ea5b119ac6f2 - 111 - 111 - - wx04ee7d7a849fa2a8 - 3980e207b86bccea8d3c0bf7d16adeba - - - - - prod_shibei_aliyun - - prod - prod - - 9988 - 0 172.16.0.54 @@ -286,6 +226,7 @@ true 172.16.0.52:8848 + wx3ef8f2cd12a19fcb 948aa2f21dbaa3943288ea5b119ac6f2 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml index 892d86b82..0bad1ce63 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/src/main/resources/application.yml @@ -26,6 +26,7 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ feign: hystrix: