From 2fe99f0d876377f7d20cb922c83d31cfbf766020 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 27 十二月 2023 16:33:33 +0800
Subject: [PATCH] 上海嘉定纪委接口-提交2
---
src/main/java/com/fzzy/api/utils/AESUtils.java | 2 +-
src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java | 18 +++++++++---------
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 23 +++++++++++++----------
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java | 2 +-
4 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/fzzy/api/utils/AESUtils.java b/src/main/java/com/fzzy/api/utils/AESUtils.java
index ef9d6d1..f68702e 100644
--- a/src/main/java/com/fzzy/api/utils/AESUtils.java
+++ b/src/main/java/com/fzzy/api/utils/AESUtils.java
@@ -102,7 +102,7 @@
// System.out.print("Key闀垮害涓嶆槸16浣�");
// return null;
// }
- SecretKey secretKey = new SecretKeySpec(key.getBytes(ENCODING), ALGORITHM_ECB);
+ SecretKey secretKey = new SecretKeySpec(key.getBytes(ENCODING), ALGORITHM);
// AES鍔犲瘑閲囩敤pkcs5padding濉厖
Cipher cipher = Cipher.getInstance(PATTERN);
//鐢ㄥ瘑鍖欏垵濮嬪寲Cipher瀵硅薄
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
index b713bb0..e33305d 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/Shjdjw2023HttpClientUtil.java
@@ -32,10 +32,8 @@
HttpURLConnection connection = null;
OutputStream outputStream = null;
String rs = "";
- ShjdjwRespDto responseDto = null;
+ ShjdjwRespDto responseDto;
try {
- String md = AESUtils.encrypt(data, apiConfs.getPublicKey());
- log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------瀵嗘枃鍙傛暟锛�" + md +"---------");
connection = (HttpURLConnection) urls.openConnection();
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
connection.setDoOutput(true);
@@ -47,10 +45,10 @@
connection.setConnectTimeout(20000);
connection.setReadTimeout(30000);
connection.setRequestMethod("POST");
- StringBuffer buffer = new StringBuffer();
- buffer.append(md);
+
outputStream = connection.getOutputStream();
- outputStream.write(buffer.toString().getBytes("UTF-8"));
+
+ outputStream.write(data.getBytes("UTF-8"));
try {
connection.connect();
if (connection.getResponseCode() == 200) {
@@ -71,9 +69,11 @@
return new ShjdjwRespDto(99,e.getMessage());
}
log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
- responseDto = JSON.parseObject(rs,ShjdjwRespDto.class);
- if(responseDto == null ) return new ShjdjwRespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
- return responseDto;
+ if(StringUtils.isEmpty(rs)){
+ return new ShjdjwRespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
+ }
+// responseDto = JSON.parseObject(rs, ShjdjwRespDto.class);
+ return new ShjdjwRespDto(1,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
} finally {
try {
outputStream.close();
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index aa07138..2652a3d 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -106,9 +106,14 @@
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
//鑾峰彇json鏁版嵁
- String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+ List<Object> list = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+ ShjdjwReqDto reqData = new ShjdjwReqDto();
+ //鎺ュ彛ID
+ reqData.setId(getInteId(inteId));
+ //涓婁紶鏁版嵁锛屽姞瀵�
+ reqData.setData(list);
- apiLog.setData(jsonData);
+ apiLog.setData(JSON.toJSONString(reqData));
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
if (conf == null) {
@@ -119,13 +124,11 @@
return responseDto;
}
- ShjdjwReqDto reqData = new ShjdjwReqDto();
- //鎺ュ彛ID
- reqData.setId(getInteId(inteId));
- //涓婁紶鏁版嵁锛屽姞瀵�
- reqData.setData(AESUtils.encryptByEcb(jsonData, conf.getPublicKey()));
+ String jsonStr = JSON.toJSONString(reqData);
+ log.info("涓婃姤鏁版嵁淇℃伅=" + jsonStr);
+ jsonStr = AESUtils.encryptByEcb(jsonStr, conf.getPublicKey());
- ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData), conf);
+ ShjdjwRespDto responseDto = Shjdjw2023HttpClientUtil.postPushData(conf.getApiUrl(), jsonStr, conf);
responseDto.setBizId(bizId);
apiLog.setStatus(responseDto.getCode() == 1 ? 0 : responseDto.getCode());
@@ -186,12 +189,12 @@
* @param code
* @return
*/
- private String getJsonData(String inteId, Object data, String code) {
+ private List<Object> getJsonData(String inteId, Object data, String code) {
List<Object> list = new ArrayList<>();
Object object = getJsonApiData(inteId, data, code);
list.add(object);
- return JSON.toJSONString(list);
+ return list;
}
/**
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
index 7ff78e2..6206008 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwReqDto.java
@@ -19,5 +19,5 @@
/**
* 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
*/
- private String data;
+ private Object data;
}
--
Gitblit v1.9.3