Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理依赖版本问题

Browse Source
This commit is contained in:
wanggeng 2021-12-21 15:03:19 +08:00
parent 16580fb2f3
commit 2ce21d42f3
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -24,7 +24,7 @@
<mysql.version>5.1.47</mysql.version> <mysql.version>5.1.47</mysql.version>
<freemarker.version>2.3.28</freemarker.version> <freemarker.version>2.3.28</freemarker.version>
<druid.version>1.1.9</druid.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> <activiti.version>7.1.0.M6</activiti.version>
</properties> </properties>
@ -108,11 +108,11 @@
<version>${activiti.version}</version> <version>${activiti.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.cm</groupId> <!-- <groupId>com.cm</groupId>-->
<artifactId>cloud-central-control-client</artifactId> <!-- <artifactId>cloud-central-control-client</artifactId>-->
<version>1.0.1-SNAPSHOT</version> <!-- <version>1.0.1-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

2
src/main/java/com/cm/inspection/runnable/dischargepermit/DischargePermitNoticeRequest.java
View File

@ -34,7 +34,7 @@ public class DischargePermitNoticeRequest extends AbstractRestTemplate<String, J
} }
@Override @Override
public JSONObject postBody() { public JSONObject body() {
JSONObject noticeJSONObject = new JSONObject(); JSONObject noticeJSONObject = new JSONObject();
JSONArray noticeJSONArray = new JSONArray(); JSONArray noticeJSONArray = new JSONArray();
dischargePermitSet.forEach(dischargePermitDTO -> { dischargePermitSet.forEach(dischargePermitDTO -> {

2
src/main/java/com/cm/inspection/runnable/eiareport/EiaReportNoticeRequest.java
View File

@ -34,7 +34,7 @@ public class EiaReportNoticeRequest extends AbstractRestTemplate<String, JSONObj
} }
@Override @Override
public JSONObject postBody() { public JSONObject body() {
JSONObject noticeJSONObject = new JSONObject(); JSONObject noticeJSONObject = new JSONObject();
JSONArray noticeJSONArray = new JSONArray(); JSONArray noticeJSONArray = new JSONArray();
eiaReportSet.forEach(eiaReportDTO -> { eiaReportSet.forEach(eiaReportDTO -> {

2
src/main/java/com/cm/inspection/runnable/taskcheck/v2/TaskCheckNoticeRequest.java
View File

@ -36,7 +36,7 @@ public class TaskCheckNoticeRequest extends AbstractRestTemplate<String, JSONObj
} }
@Override @Override
public JSONObject postBody() { public JSONObject body() {
JSONObject noticeJSONObject = new JSONObject(); JSONObject noticeJSONObject = new JSONObject();
JSONArray noticeJSONArray = new JSONArray(); JSONArray noticeJSONArray = new JSONArray();
enterpriseSet.forEach(enterprise -> { enterpriseSet.forEach(enterprise -> {

12
src/main/resources/application-test.yml
View File

@ -20,12 +20,12 @@ spring:
max-request-size: 1GB max-request-size: 1GB
datasource: datasource:
druid: 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://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://127.0.0.1:3306/db_btyjj_inspection1?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
db-type: mysql db-type: mysql
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: wanggeng username: root
password: TSkj@0471.123 password: root
initial-size: 2 initial-size: 2
min-idle: 2 min-idle: 2
max-active: 100 max-active: 100
@ -79,7 +79,7 @@ file:
# 安全 # 安全
security: security:
oauth2: 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} oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client: client:
client-id: 888d9c22b2d34f0694672c8ad56e8d0b client-id: 888d9c22b2d34f0694672c8ad56e8d0b
@ -97,7 +97,7 @@ security:
api-path: api-path:
user-center: ${security.oauth2.oauth-server} 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 version: 1
report-form: report-form:
check-detail: false check-detail: false