diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index db4d8b4e..4d263101 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -162,6 +162,9 @@ wx29b074840ef4bfd9 4adb1afccc69f205cdf5b521d74e2aca + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 47.104.85.99:9876;114.215.125.123:9876 jinshui-organizationGroup @@ -200,6 +203,9 @@ wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 47.104.85.99:9876;114.215.125.123:9876 jinshui-organizationGroup @@ -225,6 +231,9 @@ wx826a8435db9e0947 cbcb7c422f00d165105b34dc80bb825f + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 1c33d197..5e562467 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -84,4 +84,8 @@ public interface ServiceConstant { * 定制功能模块 */ String EPDC_CUSTOM_SERVER = "epdc-custom-server"; + /** + * 数据分析模块 + */ + String EPDC_ANALYSIS_SERVER = "epdc-analysis-server"; } diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index d6d8857b..9925b7f6 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -128,6 +128,8 @@ http://127.0.0.1:9063 lb://epdc-websocket-server + http://127.0.0.1:9060 + lb://epdc-kpi-server lb://epdc-custom-server @@ -172,6 +174,7 @@ lb://epdc-demo-server lb://epdc-group-server lb://epdc-websocket-server + lb://epdc-cloud-analysis-server lb://epdc-kpi-server lb://epdc-custom-server @@ -208,6 +211,7 @@ lb://epdc-demo-server lb://epdc-group-server lb://epdc-websocket-server + lb://epdc-cloud-analysis-server lb://epdc-kpi-server lb://epdc-custom-server diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index a0e3c6dc..0bb9fb1e 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -165,6 +165,13 @@ spring: - Path=${server.servlet.context-path}/custom/** filters: - StripPrefix=1 + - id: epdc-cloud-analysis-server + uri: @gateway.routes.epdc-cloud-analysis-server.uri@ + order: 18 + predicates: + - Path=${server.servlet.context-path}/cloudAnalysis/** + filters: + - StripPrefix=1 nacos: discovery: server-addr: @nacos.server-addr@ diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml index 318fbe19..d1f05fac 100644 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml +++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml @@ -45,5 +45,7 @@ + + \ No newline at end of file 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 3b31ad0d..71cb64d5 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 @@ -240,6 +240,9 @@ wx826a8435db9e0947 cbcb7c422f00d165105b34dc80bb825f + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 0 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 c4e1e45a..2c2449ca 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 @@ -171,6 +171,9 @@ wx29b074840ef4bfd9 4adb1afccc69f205cdf5b521d74e2aca + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 47.104.85.99:9876;114.215.125.123:9876 jinshui-organizationGroup @@ -213,6 +216,9 @@ wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 47.104.85.99:9876;114.215.125.123:9876 jinshui-organizationGroup @@ -237,6 +243,9 @@ wx826a8435db9e0947 cbcb7c422f00d165105b34dc80bb825f + + wx3ea0a6fb71ddf659 + 2154e86d56df9fae4224c93a17e01bb3 0