From 39089a1f389bbee12f76c244e1320e68c69a7c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Fri, 8 May 2020 16:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=AF=BC=E7=AB=AF=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=A1=A5=E4=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-admin/epdc-admin-server/pom.xml           | 9 +++++++++
 .../epdc/commons/tools/constant/ServiceConstant.java     | 4 ++++
 esua-epdc/epdc-gateway/pom.xml                           | 4 ++++
 .../epdc-gateway/src/main/resources/application.yml      | 7 +++++++
 esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml    | 2 ++
 esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml   | 3 +++
 .../epdc-module/epdc-events/epdc-events-server/pom.xml   | 9 +++++++++
 7 files changed, 38 insertions(+)

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 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
                 <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
@@ -200,6 +203,9 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
                 <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.producer.group>jinshui-organizationGroup</rocketmq.producer.group>
@@ -225,6 +231,9 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
                 <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://172.19.0.2:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
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 @@
                 <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
                 <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-cloud-analysis-server.uri>
+                <!--                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>-->
                 <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
 <!--                <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
@@ -172,6 +174,7 @@
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
                 <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>
                 <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
 
@@ -208,6 +211,7 @@
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
                 <gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
+                <gateway.routes.epdc-cloud-analysis-server.uri>lb://epdc-cloud-analysis-server</gateway.routes.epdc-cloud-analysis-server.uri>
                 <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
                 <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
 
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 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.9.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
   </component>
 </module>
\ 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 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
                 <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
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 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx29b074840ef4bfd9</work.wx.ma.appId>
                 <work.wx.ma.secret>4adb1afccc69f205cdf5b521d74e2aca</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -213,6 +216,9 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
                 <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
@@ -237,6 +243,9 @@
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx826a8435db9e0947</work.wx.ma.appId>
                 <work.wx.ma.secret>cbcb7c422f00d165105b34dc80bb825f</work.wx.ma.secret>
+                <!--数据分析端小程序-->
+                <analysis.wx.ma.appId>wx3ea0a6fb71ddf659</analysis.wx.ma.appId>
+                <analysis.wx.ma.secret>2154e86d56df9fae4224c93a17e01bb3</analysis.wx.ma.secret>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>