From f5eab6ad742eb94205e03dff241254653e051258 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Fri, 5 Jun 2020 15:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=A3=E5=BC=8F=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  2 +-
 .../epdc-activiti-server.iml                  |  9 ++++++++
 .../epdc-custom-server/epdc-custom-server.iml | 22 +++++++++++++++----
 .../epdc-custom/epdc-custom-server/pom.xml    | 20 ++++-------------
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index dfb4ec7e..f361cf80 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -175,7 +175,7 @@ spring:
           - StripPrefix=1
         - id: epdc-cloud-analysis-server
           uri: @gateway.routes.epdc-cloud-analysis-server.uri@
-          order: 18
+          order: 19
           predicates:
             - Path=${server.servlet.context-path}/cloudAnalysis/**
           filters:
diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml
index 5931f3d1..7f07d65d 100644
--- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml
+++ b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml
@@ -18,6 +18,15 @@
         <naming-strategy-map />
       </configuration>
     </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <datasource-mapping>
+          <factory-entry name="epdc-activiti-server" />
+        </datasource-mapping>
+        <naming-strategy-map />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml
index 1fc1afc4..1ff8470f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml
@@ -21,6 +21,23 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="epdc-custom-client" />
+    <orderEntry type="module" module-name="epdc-admin-client" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
     <orderEntry type="module" module-name="epdc-commons-tools" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.9.RELEASE" level="project" />
@@ -66,7 +83,6 @@
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.17.Final" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
@@ -80,8 +96,6 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.15" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.3" level="project" />
@@ -226,7 +240,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
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 4594e4e5..4288a2d9 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
@@ -150,10 +150,6 @@
 
                 <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
-                <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
-                <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
         </profile>
 
@@ -179,10 +175,6 @@
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
-                <!--RocketMQ-->
-                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
-                <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
-                <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
         </profile>
 
@@ -201,19 +193,15 @@
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.20.0.4:80</nacos.server-addr>
+                <nacos.server-addr>172.16.0.7:10000,172.16.0.7:10001</nacos.server-addr>
+                <nacos.ip>172.16.0.7</nacos.ip>
+                <nacos.namespace></nacos.namespace>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5e4l333jb61be50n.mysql.rds.aliyuncs.com:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e4l333jb61be50n.mysql.rds.aliyuncs.com:3306/esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>epdc@jinshui888</spring.datasource.druid.password>
-
-                <!--RocketMQ-->
-                <rocketmq.name.server>172.16.0.7:9876;172.16.0.8:9876</rocketmq.name.server>
-                <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
-                <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
-                <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
         </profile>
     </profiles>