From dfdd615c4cab8c142c76caebc70bdf16f4e12b10 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 13 九月 2023 10:04:21 +0800
Subject: [PATCH] 优化上海接口指令时效问题
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 606d808..0dc1763 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -106,13 +106,24 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
SH2023ReqDto reqData = new SH2023ReqDto();
reqData.setId(ContextUtil.getUUID());
//鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
reqData.setUid(conf.getUserName());
//鎸囦护id
- reqData.setOrderid(param.getOrderid());
+ reqData.setOrderid(orderId);
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
@@ -182,27 +193,31 @@
return responseDto;
}
+ //鑾峰彇鎸囦护id
+ String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
+ String orderId = (String)redisUtil.get(key);
+ if(StringUtils.isEmpty(orderId)){
+ ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
+ apiLog.setStatus(99);
+ apiLog.setResult("鎸囦护id澶辨晥");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
//灏佽鎺ㄩ�佹暟鎹�
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()));
+ reqData.setOrderid(orderId);
+ //韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕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));
--
Gitblit v1.9.3