From e0495d5afd8ba8165cf35fef78e8569e8dca78f5 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 31 Dec 2019 13:06:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9webservice=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-module/epdc-webservice/pom.xml | 86 +++++++++++++++----
 .../esua/epdc/WebserviceApplication.java      |  2 +
 .../esua/epdc/config/ModuleConfigImpl.java    | 26 ++++++
 .../src/main/resources/application.yml        | 39 ++++++++-
 .../mapper/GridPlatformHandleLogDao.xml       | 33 +------
 .../main/resources/mapper/InterfaceLogDao.xml | 16 ----
 .../resources/mapper/ItemGridPlatformDao.xml  | 16 +---
 .../resources/mapper/ItemHandleProcessDao.xml | 16 ----
 .../src/main/resources/registry.conf          | 21 +++++
 9 files changed, 156 insertions(+), 99 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-webservice/src/main/resources/registry.conf

diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml
index 041caa4eb..6db682ca9 100644
--- a/esua-epdc/epdc-module/epdc-webservice/pom.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,17 +18,32 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-mybatis</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring.boot.admin.version}</version>
         </dependency>
 
         <!--   webservice依赖包     -->
@@ -49,18 +65,6 @@
             <artifactId>xstream</artifactId>
             <version>${xstream.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-commons-tools</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.esua.epdc</groupId>
-            <artifactId>epdc-commons-mybatis</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -85,6 +89,30 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>${basedir}/src/main/resources</directory>
+                <includes>
+                    <include>**/application*.yml</include>
+                    <include>**/*.properties</include>
+                    <include>logback-spring.xml</include>
+                    <include>registry.conf</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+                <excludes>
+                    <exclude>**/application*.yml</exclude>
+                    <exclude>**/*.properties</exclude>
+                    <exclude>logback-spring.xml</exclude>
+                    <exclude>registry.conf</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
     <profiles>
@@ -97,11 +125,19 @@
                 <server.port>9075</server.port>
                 <spring.profiles.active>dev</spring.profiles.active>
 
+                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?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>elink833066</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>
         <profile>
@@ -110,11 +146,19 @@
                 <server.port>9075</server.port>
                 <spring.profiles.active>test</spring.profiles.active>
 
+                <spring.redis.index>2</spring.redis.index>
+                <spring.redis.host>47.104.224.45</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>elink@888</spring.redis.password>
+
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?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>elink833066</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
             </properties>
         </profile>
         <profile>
@@ -123,11 +167,19 @@
                 <server.port>9075</server.port>
                 <spring.profiles.active>prod</spring.profiles.active>
 
+                <spring.redis.index>0</spring.redis.index>
+                <spring.redis.host>10.5.34.164</spring.redis.host>
+                <spring.redis.port>6379</spring.redis.port>
+                <spring.redis.password>Elink@833066</spring.redis.password>
+
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_events?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>Elink@833066</spring.datasource.druid.password>
+
+                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
             </properties>
         </profile>
     </profiles>
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/WebserviceApplication.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/WebserviceApplication.java
index c150db4a4..f2eff5de6 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/WebserviceApplication.java
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/WebserviceApplication.java
@@ -10,6 +10,7 @@ package com.elink.esua.epdc;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * webservice服务
@@ -18,6 +19,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @since 1.0.0
  */
 @SpringBootApplication
+@EnableDiscoveryClient
 public class WebserviceApplication {
 
     public static void main(String[] args) {
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 000000000..06d0f66b4
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-新闻公告模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+    @Override
+    public String getName() {
+        return "webservice";
+    }
+}
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 32b033478..e57062c70 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
@@ -3,8 +3,9 @@ server:
   servlet:
     context-path: /webservice
 
-
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: epdc-webservice
   #环境 dev|test|prod
@@ -12,10 +13,24 @@ spring:
     active: @spring.profiles.active@
   messages:
     encoding: UTF-8
-    basename: i18n/messages_common
+    basename: i18n/messages,i18n/messages_common
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
+  redis:
+    database: @spring.redis.index@
+    host: @spring.redis.host@
+    timeout: 30s
+    port: @spring.redis.port@
+    password: @spring.redis.password@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.server-addr@
+        register-enabled: @nacos.register-enabled@
+    alibaba:
+      seata:
+        tx-service-group: epdc-webservice-fescar-service-group
   datasource:
     druid:
       driver-class-name: com.mysql.jdbc.Driver
@@ -23,6 +38,24 @@ spring:
       username: @spring.datasource.druid.username@
       password: @spring.datasource.druid.password@
 
+feign:
+  hystrix:
+    enabled: true
+  httpclient:
+    enabled: true
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          thread:
+            timeoutInMilliseconds: 60000 #缺省为1000
+
+ribbon:
+  ReadTimeout: 300000
+  ConnectTimeout: 300000
+
 management:
   endpoints:
     web:
@@ -33,7 +66,7 @@ management:
       show-details: ALWAYS
 
 mybatis-plus:
-  mapper-locations: classpath:/mapper/*.xml
+  mapper-locations: classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.elink.esua.epdc.entity
   global-config:
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/GridPlatformHandleLogDao.xml b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/GridPlatformHandleLogDao.xml
index b63a046f3..7a009f45b 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/GridPlatformHandleLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/GridPlatformHandleLogDao.xml
@@ -3,39 +3,8 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.GridPlatformHandleLogDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.GridPlatformHandleLogEntity" id="gridPlatformHandleLogMap">
-        <result property="id" column="ID"/>
-        <result property="itemGridPlatformId" column="ITEM_GRID_PLATFORM_ID"/>
-        <result property="status" column="STATUS"/>
-        <result property="itemHandleProcessId" column="ITEM_HANDLE_PROCESS_ID"/>
-        <result property="handler" column="HANDLER"/>
-        <result property="handlingOpinions" column="HANDLING_OPINIONS"/>
-        <result property="handlingDept" column="HANDLING_DEPT"/>
-        <result property="handlingTime" column="HANDLING_TIME"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="dispatchtime" column="DispatchTime"/>
-        <result property="deptcode" column="DeptCode"/>
-        <result property="deptname" column="DeptName"/>
-        <result property="execdeptcode" column="ExecDeptCode"/>
-        <result property="execdeptname" column="ExecDeptName"/>
-        <result property="carrivetime" column="CArriveTime"/>
-        <result property="csolvingtime" column="CSolvingTime"/>
-        <result property="arrivetime" column="ArriveTime"/>
-        <result property="solvingtime" column="SolvingTime"/>
-        <result property="solvingnote" column="SolvingNote"/>
-        <result property="endtime" column="EndTime"/>
-        <result property="lastsolvingtime" column="LastSolvingTime"/>
-        <result property="endnote" column="EndNote"/>
-        <result property="banliresult" column="BanliResult"/>
-    </resultMap>
-
     <!--  插入记录  -->
-    <insert id="insertGridPlatformHandleLog" parameterType="com.elink.esua.epdc.modules.item.entity.GridPlatformHandleLogEntity">
+    <insert id="insertGridPlatformHandleLog" parameterType="com.elink.esua.epdc.entity.GridPlatformHandleLogEntity">
         INSERT INTO esua_epdc_events.epdc_grid_platform_handle_log (
             ID,
             ITEM_GRID_PLATFORM_ID,
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/InterfaceLogDao.xml b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/InterfaceLogDao.xml
index eaf729e3e..8c7cb8403 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/InterfaceLogDao.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/InterfaceLogDao.xml
@@ -3,21 +3,5 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.InterfaceLogDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.InterfaceLogEntity" id="interfaceLogMap">
-        <result property="id" column="ID"/>
-        <result property="referenceId" column="REFERENCE_ID"/>
-        <result property="businessType" column="BUSINESS_TYPE"/>
-        <result property="interfaceName" column="INTERFACE_NAME"/>
-        <result property="successFlag" column="SUCCESS_FLAG"/>
-        <result property="callMsgBody" column="CALL_MSG_BODY"/>
-        <result property="returnMsgBody" column="RETURN_MSG_BODY"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-    </resultMap>
-
 
 </mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemGridPlatformDao.xml b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemGridPlatformDao.xml
index 7d3396ae7..75a4da3f8 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemGridPlatformDao.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemGridPlatformDao.xml
@@ -3,22 +3,8 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.ItemGridPlatformDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.ItemGridPlatformEntity" id="itemGridPlatformMap">
-        <result property="id" column="ID"/>
-        <result property="referenceId" column="REFERENCE_ID"/>
-        <result property="taskid" column="TASKID"/>
-        <result property="reportPersonDeptId" column="REPORT_PERSON_DEPT_ID"/>
-        <result property="status" column="STATUS"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-    </resultMap>
-
     <!--   根据任务号（网格平台任务ID）查询记录  -->
-    <select id="selectByTaskId" parameterType="java.lang.String" resultType="com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity">
+    <select id="selectByTaskId" parameterType="java.lang.String" resultType="com.elink.esua.epdc.entity.ItemGridPlatformEntity">
         select * from epdc_item_grid_platform e
         where e.DEL_FLAG='0'
         and e.TASKID=#{taskNum}
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemHandleProcessDao.xml
index 8c57740fc..c8902ab17 100644
--- a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemHandleProcessDao.xml
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/mapper/ItemHandleProcessDao.xml
@@ -3,22 +3,6 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.ItemHandleProcessDao">
 
-    <resultMap type="com.elink.esua.epdc.entity.ItemHandleProcessEntity" id="itemHandleProcessMap">
-        <result property="id" column="ID"/>
-        <result property="itemId" column="ITEM_ID"/>
-        <result property="state" column="STATE"/>
-        <result property="handleAdvice" column="HANDLE_ADVICE"/>
-        <result property="outHandleAdvice" column="OUT_HANDLE_ADVICE"/>
-        <result property="handlerDeptId" column="HANDLER_DEPT_ID"/>
-        <result property="handlerDept" column="HANDLER_DEPT"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-    </resultMap>
-
     <insert id="insertItemHandleProcess">
         INSERT INTO epdc_item_handle_process ( ID, ITEM_ID, STATE, HANDLE_ADVICE, OUT_HANDLE_ADVICE, HANDLER_DEPT, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, DEL_FLAG )
         VALUES (#{id}, #{itemId}, #{state}, #{handleAdvice}, #{outHandleAdvice}, #{handlerDept}, 0, '网格化平台', #{createdTime}, '网格化平台', #{updatedTime}, '0')
diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/registry.conf
new file mode 100644
index 000000000..fb64abd71
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-webservice/src/main/resources/registry.conf
@@ -0,0 +1,21 @@
+registry {
+  # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+  type = "nacos"
+
+  nacos {
+    serverAddr = "@nacos.server-addr@"
+    namespace = "public"
+    cluster = "default"
+  }
+}
+
+config {
+  # file、nacos 、apollo、zk、consul、etcd3
+  type = "nacos"
+
+  nacos {
+    serverAddr = "@nacos.server-addr@"
+    namespace = "public"
+    cluster = "default"
+  }
+}