From 2ce21d42f37596ed466ca0ae1b2c6fb9f1f8ef44 Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Tue, 21 Dec 2021 15:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              | 12 ++++++------
 .../DischargePermitNoticeRequest.java                |  2 +-
 .../runnable/eiareport/EiaReportNoticeRequest.java   |  2 +-
 .../taskcheck/v2/TaskCheckNoticeRequest.java         |  2 +-
 src/main/resources/application-test.yml              | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7f406a1..b17c056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <mysql.version>5.1.47</mysql.version>
         <freemarker.version>2.3.28</freemarker.version>
         <druid.version>1.1.9</druid.version>
-        <cm-cloud.version>1.0.1-SNAPSHOT</cm-cloud.version>
+        <cm-cloud.version>1.0.2-SNAPSHOT</cm-cloud.version>
         <activiti.version>7.1.0.M6</activiti.version>
     </properties>
 
@@ -108,11 +108,11 @@
             <version>${activiti.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.cm</groupId>
-            <artifactId>cloud-central-control-client</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.cm</groupId>-->
+<!--            <artifactId>cloud-central-control-client</artifactId>-->
+<!--            <version>1.0.1-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.projectlombok</groupId>
diff --git a/src/main/java/com/cm/inspection/runnable/dischargepermit/DischargePermitNoticeRequest.java b/src/main/java/com/cm/inspection/runnable/dischargepermit/DischargePermitNoticeRequest.java
index 472b1b1..0968c8c 100644
--- a/src/main/java/com/cm/inspection/runnable/dischargepermit/DischargePermitNoticeRequest.java
+++ b/src/main/java/com/cm/inspection/runnable/dischargepermit/DischargePermitNoticeRequest.java
@@ -34,7 +34,7 @@ public class DischargePermitNoticeRequest extends AbstractRestTemplate<String, J
     }
 
     @Override
-    public JSONObject postBody() {
+    public JSONObject body() {
         JSONObject noticeJSONObject = new JSONObject();
         JSONArray noticeJSONArray = new JSONArray();
         dischargePermitSet.forEach(dischargePermitDTO -> {
diff --git a/src/main/java/com/cm/inspection/runnable/eiareport/EiaReportNoticeRequest.java b/src/main/java/com/cm/inspection/runnable/eiareport/EiaReportNoticeRequest.java
index b5197c2..0182771 100644
--- a/src/main/java/com/cm/inspection/runnable/eiareport/EiaReportNoticeRequest.java
+++ b/src/main/java/com/cm/inspection/runnable/eiareport/EiaReportNoticeRequest.java
@@ -34,7 +34,7 @@ public class EiaReportNoticeRequest extends AbstractRestTemplate<String, JSONObj
     }
 
     @Override
-    public JSONObject postBody() {
+    public JSONObject body() {
         JSONObject noticeJSONObject = new JSONObject();
         JSONArray noticeJSONArray = new JSONArray();
         eiaReportSet.forEach(eiaReportDTO -> {
diff --git a/src/main/java/com/cm/inspection/runnable/taskcheck/v2/TaskCheckNoticeRequest.java b/src/main/java/com/cm/inspection/runnable/taskcheck/v2/TaskCheckNoticeRequest.java
index ae886df..eb19557 100644
--- a/src/main/java/com/cm/inspection/runnable/taskcheck/v2/TaskCheckNoticeRequest.java
+++ b/src/main/java/com/cm/inspection/runnable/taskcheck/v2/TaskCheckNoticeRequest.java
@@ -36,7 +36,7 @@ public class TaskCheckNoticeRequest extends AbstractRestTemplate<String, JSONObj
     }
 
     @Override
-    public JSONObject postBody() {
+    public JSONObject body() {
         JSONObject noticeJSONObject = new JSONObject();
         JSONArray noticeJSONArray = new JSONArray();
         enterpriseSet.forEach(enterprise -> {
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index c1b9a62..7b3634c 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -20,12 +20,12 @@ spring:
       max-request-size: 1GB
   datasource:
     druid:
-      url: jdbc:mysql://10.110.208.232:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
-#      url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+#      url: jdbc:mysql://10.110.208.232:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://127.0.0.1:3306/db_btyjj_inspection1?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
-      username: wanggeng
-      password: TSkj@0471.123
+      username: root
+      password: root
       initial-size: 2
       min-idle: 2
       max-active: 100
@@ -79,7 +79,7 @@ file:
 # 安全
 security:
   oauth2:
-    oauth-server: http://1.180.60.42:8083/usercenter
+    oauth-server: http://192.168.0.103:7011/usercenter
     oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
     client:
       client-id: 888d9c22b2d34f0694672c8ad56e8d0b
@@ -97,7 +97,7 @@ security:
 
 api-path:
   user-center: ${security.oauth2.oauth-server}
-  notice-url: http://1.180.60.42:8083/usercenter
+  notice-url: http://192.168.0.103:7011/usercenter
 version: 1
 report-form:
   check-detail: false