From bf692b7352dd0bab46fcdb97d8705c55a81cb17d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 13 九月 2023 09:37:27 +0800
Subject: [PATCH] 提交上海嘉定新版接口配置信息
---
src/main/java/com/fzzy/api/utils/RSAUtils.java | 10 +++++
src/main/resources/application-pro5303.yml | 9 +++-
src/main/resources/application-dev.yml | 9 ++--
src/main/resources/application-pro.yml | 6 +-
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 3 +
src/main/java/com/fzzy/order/OrderServer.java | 3 +
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 23 ++---------
7 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/fzzy/api/utils/RSAUtils.java b/src/main/java/com/fzzy/api/utils/RSAUtils.java
index c36f1cd..61d4e85 100644
--- a/src/main/java/com/fzzy/api/utils/RSAUtils.java
+++ b/src/main/java/com/fzzy/api/utils/RSAUtils.java
@@ -36,6 +36,16 @@
// 2048 bits 鐨� RSA 瀵嗛挜瀵癸紝鏈�澶у姞瀵嗘槑鏂囧ぇ灏�
private static final int MAX_ENCRYPT_BLOCK = MAX_DECRYPT_BLOCK - RESERVE_BYTES;
+ public static void main(String[] args) throws Exception {
+ Map<String, Object> map = initKey(1024);
+
+ String privateKeyStr = getPrivateKeyStr(map);
+ log.info("-----绉侀挜={}", privateKeyStr);
+
+ String publicKeyStr = getPublicKeyStr(map);
+ log.info("-----鍏挜={}", publicKeyStr);
+ }
+
// 鐢熸垚瀵嗛挜瀵�
public static Map<String, Object> initKey(int keysize) throws Exception {
KeyPairGenerator keyPairGen = KeyPairGenerator.getInstance(KEY_ALGORITHM);
diff --git a/src/main/java/com/fzzy/order/OrderServer.java b/src/main/java/com/fzzy/order/OrderServer.java
index 5b53c3f..8cf015d 100644
--- a/src/main/java/com/fzzy/order/OrderServer.java
+++ b/src/main/java/com/fzzy/order/OrderServer.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.fzzy.order.data.*;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +15,7 @@
* @author czt
* @date 2023/8/17
*/
+@Slf4j
@Controller
@RequestMapping("service/api")
public class OrderServer {
@@ -30,6 +32,7 @@
@RequestMapping("/order")
public OrderResp order(@RequestBody OrderReq<JSONObject> req){
+ log.info("鎺ユ敹鐨勬寚浠や俊鎭�={}", req);
//鍒ゆ柇鍙傛暟
if(null == req){
return new OrderResp(OrderResult.ORDER_CODE_500.getCode(), OrderResult.ORDER_CODE_500.getResult());
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 36925f8..af69ddc 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -339,8 +339,9 @@
}
//鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1109.getWjdz());
+ System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
- api1109.setFileStorageId((String) responseDto.getData());
+// api1109.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1109);
}else if (Constant.API_CODE_1111.equals(inteId)) {
Gd2022Api1111 api1111 = new Gd2022Api1111();
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 6b7d07f..606d808 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -11,10 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.push.gd2022.GD2022HttpClientUtil;
-import com.fzzy.push.gd2022.dto.GD2022AuthToken;
-import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
-import com.fzzy.push.gd2022.dto.GDFinanceDto;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -23,8 +19,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -116,23 +110,16 @@
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
- if (null == api1102List || api1102List.isEmpty()) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLog.setStatus(99);
- apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
- apiLogRep.save(apiLog);
- return responseDto;
- }
- reqData.setUid(api1102List.get(0).getXzqhdm());
+ reqData.setUid(conf.getUserName());
//鎸囦护id
reqData.setOrderid(param.getOrderid());
- //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
+ reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
- //鏁版嵁杩涜SM4鍔犲瘑
- reqData.setData(jsonData);
+ //浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
+ reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a60dd86..ac0cb17 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,8 +8,7 @@
# 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_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?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 #娼槼-鐩村睘浠撳簱
@@ -23,7 +22,7 @@
# 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_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..
@@ -33,10 +32,10 @@
# 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
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+ url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index b7e78ef..e784d0e 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,6 +1,6 @@
########################## 涓婃捣鍢夊畾 ##########################
server:
- port: 9999
+ port: 8090
jetty:
max-http-post-size: 209715200
tomcat:
@@ -9,13 +9,13 @@
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
#娆℃暟鎹簮
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
diff --git a/src/main/resources/application-pro5303.yml b/src/main/resources/application-pro5303.yml
index 5de0937..73f20e5 100644
--- a/src/main/resources/application-pro5303.yml
+++ b/src/main/resources/application-pro5303.yml
@@ -1,6 +1,6 @@
########################## 涓婃捣鍢夊畾 ##########################
server:
- port: 9999
+ port: 8090
jetty:
max-http-post-size: 209715200
tomcat:
@@ -53,4 +53,9 @@
default:
companyId: 5303
file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5tOvvBfAbNstnTjQU6VpcgE1Agy3ifXZovHEEnWEMSW5Z5H21VxHTQo2Jl6qi+NH03gKBR0pjOUuqnTMiv5oyZnNo8KKNmF4p+0dFTcEjQ72hsYrNDXjTIn1xzlzuABzGTeOP5W31VO7YsUlQQLj26bWRiwsojaXh7xiUdIUGywIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALm06+8F8Bs2y2dONBTpWlyATUCDLeJ9dmi8cQSdYQxJblnkfbVXEdNCjYmXqqL40fTeAoFHSmM5S6qdMyK/mjJmc2jwoo2YXin7R0VNwSNDvaGxis0NeNMifXHOXO4AHMZN44/lbfVU7tixSVBAuPbptZGLCyiNpeHvGJR0hQbLAgMBAAECgYAuispqwFk56NS3kmD5MLbF4h36YiYY0orfmwLUPkE5XBn9C4f579V21gI1Dr7kU2oDbbTBA8X/8jcljnpnZg/VzlVaY1TlnBFN7UQxNrMtIZbt3Tk2TyAKl+kGy/RvMu8y0y8/vVE2hyfXsdbwmGRXLw4o02fziOznwgDHBmU4sQJBAOhyMdIQfPrKCocVJ2fqqEyVqW05klVPxRqHeltXjTe2Nr8/dSxDS4TUH1VK63ZBTWcBNiMS7u7OhpaygYwLFQMCQQDMhkb9qgGDZT2CqGA3yGylRDBfw1d8YfK1qDZuvzEhc+v16aZ5X7hxQgDLgGvArjBGyV5rxq2ZCVCbpNqT3yiZAkEAnq4OKqwM1ZuFck/TldIQUC+++IxbxBdvo7umoKJ1Cfo/B3HHiI7sB+JS/YPml9TehRnDnk/3gljEci2r2DFchwJAIsPgZVX0k+Uto3wDfvfun9kLb/vAb0AnBYHmXsTZERqnTVG+HnuK2pWhlPXrWwFA64dnKWLIN29B6HMJRIF2YQJAC8cUhkAX80EVIAz/9JK+4X8yJk0lUFpi+6meE0hhaABtTXNq4kxv7+2gu5Bs64k9R2ZFdJUKTtbcdH++DNKL9Q==
\ No newline at end of file
--
Gitblit v1.9.3