From e8a5205acec61a431868c9b083fb62c2f187dd34 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 12 九月 2023 18:53:59 +0800
Subject: [PATCH] 提交上海嘉定配置信息
---
src/main/resources/application-pro5303.yml | 10 +-
src/main/java/com/fzzy/api/service/ApiRemoteService.java | 9 +++
src/main/resources/application-dev.yml | 37 ++++++------
src/main/resources/application-pro.yml | 15 ++--
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 58 +++++++++++++++++++
src/main/resources/application.yml | 2
6 files changed, 99 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiRemoteService.java b/src/main/java/com/fzzy/api/service/ApiRemoteService.java
index 1818c13..189877a 100644
--- a/src/main/java/com/fzzy/api/service/ApiRemoteService.java
+++ b/src/main/java/com/fzzy/api/service/ApiRemoteService.java
@@ -37,4 +37,13 @@
*/
public ResponseDto pushData(ApiParam param, ApiConfs confs, Object data);
+ /**
+ * 涓婁紶鏂囦欢锛岃幏鍙栨枃浠跺瓨鍌╥d
+ * @param param 鍙傛暟
+ * @param confs 閰嶇疆锛屽彲浠ヤ负绌�
+ * @param data 鎺ㄩ�佹暟鎹�
+ * @return
+ */
+// public ResponseDto pushFile(ApiParam param, ApiConfs confs, Object data);
+
}
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 71c2f85..36925f8 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -128,6 +128,64 @@
return pushData(param, null, data);
}
+// @Override
+// public ResponseDto pushFile(ApiParam param, ApiConfs conf, Object data) {
+//
+// String inteId = param.getInteId();
+// String kqdm = param.getKqdm();
+//
+// try {
+//
+// if (null == conf) {
+// conf = apiCommonService.getConf(kqdm);
+// }
+// //鑾峰彇TOKEN
+// GD2022AuthToken token = getGD2022AuthToken(conf);
+//
+// ApiLog apiLog = new ApiLog();
+// apiLog.setId(ContextUtil.getUUID());
+// apiLog.setInteId(inteId);
+// apiLog.setData(JSON.toJSONString(data));
+// apiLog.setKqdm(kqdm);
+// apiLog.setUploadTime(new Date());
+//
+// String wjdz = "";
+// if (Constant.API_CODE_1109.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1109 api1109 = new Gd2022Api1109();
+// BeanUtils.copyProperties(data, api1109);
+// wjdz = api1109.getWjdz();
+// } else if (Constant.API_CODE_1307.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1307 api1307 = new Gd2022Api1307();
+// BeanUtils.copyProperties(data, api1307);
+// wjdz = api1307.getWjdz();
+// } else if (Constant.API_CODE_1308.equals(inteId)) {
+// //灏佽鏁版嵁,鑾峰彇鏂囦欢鍦板潃
+// Gd2022Api1308 api1308 = new Gd2022Api1308();
+// BeanUtils.copyProperties(data, api1308);
+// wjdz = api1308.getWjdz();
+// }
+// if (StringUtils.isEmpty(wjdz)) {
+// ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版枃浠跺湴鍧�", wjdz);
+// apiLog.setStatus(99);
+// apiLog.setResult("娌℃湁鑾峰彇鍒版枃浠跺湴鍧�");
+// apiLogRep.save(apiLog);
+// return responseDto;
+// }
+// //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+// GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(conf.getApiUrl(), token, wjdz);
+// ResponseDto resd = new ResponseDto();
+// resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+// resd.setBizId((String) responseDto.getData());
+// resd.setMsg(responseDto.getMsg());
+// return resd;
+// } catch (Exception e) {
+// log.error(e.getMessage(), e);
+// return new ResponseDto(99, e.getMessage());
+// }
+// }
+
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
* @param param
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 14c0ab6..a60dd86 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,31 +5,32 @@
datasource:
#涓绘暟鎹簮
primary:
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娓彛鏂颁粨
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍏冲煚鑰佷粨
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鐩村睘浠撳簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瑗胯儶-鏂颁粨绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #瑗胯儶-鏂板嚖绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #閲戠伓涓�鎵�绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #閲戠伓浜屾墍绮簱
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #绮补杞繍绔�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娌虫邯绮墍
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娴烽棬绮墍
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鍜屽钩绮墍
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_bf?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍏冲煚鑰佷粨
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_3?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鐩村睘浠撳簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-鏂颁粨绮簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_4_2?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-瑗胯儶-鏂板嚖绮簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_5?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓涓�鎵�绮簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_6?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-閲戠伓浜屾墍绮簱
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_7?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-绮补杞繍绔�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_8?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娌虫邯绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_9?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娴烽棬绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍜屽钩绮墍
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢鍙板北
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 46074c8..b7e78ef 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
-########################## 骞夸笢鎯犲窞鎯犻槼 ##########################
+########################## 涓婃捣鍢夊畾 ##########################
server:
- port: 8090
+ port: 9999
jetty:
max-http-post-size: 209715200
tomcat:
@@ -10,15 +10,15 @@
#涓绘暟鎹簮
primary:
url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
- username: root
- password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
#娆℃暟鎹簮
secondary:
url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
- username: root
- password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: root
jpa:
#涓籮pa閰嶇疆
primary:
@@ -51,7 +51,6 @@
timeout: 6000
igds:
default:
- companyId: 5326
-
+ companyId: 5303
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/src/main/resources/application-pro5303.yml b/src/main/resources/application-pro5303.yml
index ab77023..5de0937 100644
--- a/src/main/resources/application-pro5303.yml
+++ b/src/main/resources/application-pro5303.yml
@@ -1,6 +1,6 @@
########################## 涓婃捣鍢夊畾 ##########################
server:
- port: 8090
+ port: 9999
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: root
- driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
username: root
password: root
- driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e225ad..bf2561d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: dev
+ active: pro
application:
name: igds-api
main:
--
Gitblit v1.9.3