From 8da101629c47cec91d68f785b0f5e829d4a9bab1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 24 一月 2024 15:18:46 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
index 11c4e89..cb306b8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java
@@ -41,6 +41,7 @@
String timestamp = request.getParameter("timestamp");
String signature = request.getParameter("signature");
String msgSignature = request.getParameter("msg_signature");
+ String echostr = request.getParameter("echostr");
String encType = request.getParameter("encrypt_type");
String xml = IOUtils.toString(request.getReader());
log.info("企业微信回调参数nonce"+nonce);
@@ -49,10 +50,19 @@
log.info("企业微信回调参数msgSignature"+msgSignature);
log.info("企业微信回调参数encType"+encType);
log.info("企业微信回调参数xml"+xml);
+ log.info("企业微信回调参数echostr"+echostr);
if(StringUtils.isNotBlank(msgSignature)&&StringUtils.isNotBlank(timestamp)&&StringUtils.isNotBlank(nonce)&&StringUtils.isNotBlank(xml)){
String reponseStr = wxCryptUtil.decryptXml(msgSignature,timestamp,nonce,xml);
log.info("企业微信回调参数xml解析"+reponseStr);
}
+ if(StringUtils.isNotBlank(msgSignature)&&StringUtils.isNotBlank(timestamp)&&StringUtils.isNotBlank(nonce)&&StringUtils.isNotBlank(echostr)){
+ String reponseStr = wxCryptUtil.decryptContent(msgSignature,timestamp,nonce,echostr);
+ log.info("企业微信回调参数xml解析"+reponseStr);
+ return reponseStr;
+ }
return "SUCCESS";
}
+
+
+
}
--
Gitblit v1.7.1