Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/QYWXCallBackController.java

@@ -56,10 +56,13 @@
            log.info("企业微信回调参数xml解析"+reponseStr);
        }
        if(StringUtils.isNotBlank(msgSignature)&&StringUtils.isNotBlank(timestamp)&&StringUtils.isNotBlank(nonce)&&StringUtils.isNotBlank(echostr)){
            String reponseStr = wxCryptUtil.decryptXml(msgSignature,timestamp,nonce,echostr);
            String reponseStr = wxCryptUtil.decryptContent(msgSignature,timestamp,nonce,echostr);
            log.info("企业微信回调参数xml解析"+reponseStr);
            return reponseStr;
        }
        return "SUCCESS";
        return echostr;
    }



}