diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java index 4da9d954..d2ef0a67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/YxNotifyController.java @@ -109,19 +109,16 @@ public class YxNotifyController { String md5 = request.getHeader("MD5"); String checkSum = request.getHeader("CheckSum"); String requestBody = readBody(request); - log.warn("收到云信"); boolean check = yunxinManager.checkNotify(requestBody, curTime, checkSum,md5); if(!check){ log.info("检验失败!"); return ImCheckResp.ok(); } - log.warn("检验云信"); JSONObject body = JSON.parseObject(requestBody); if(body == null){ return ImCheckResp.ok(); } boolean message = imManager.filterMessage(body); - log.warn("完成云信 me{}",message); if(message){ return ImCheckResp.ok(); }else{ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java index 6dc13959..ba4a273b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/im/ImManager.java @@ -160,7 +160,14 @@ public class ImManager { if(filterSet.contains(RECORD_ID_FILTER)){ String ext = body.getString("ext"); JSONObject extJson = JSON.parseObject(ext); + if(extJson == null){ + log.error("IM拦截成功! 拦截到用户脚本请求数据={}",body.toJSONString()); + return false; + } String recordId = extJson.getString("recordId"); + if(StringUtils.isBlank(recordId)){ + recordId = extJson.getString("record_id"); + } if(StringUtils.isEmpty(recordId) || "0".equals(recordId)){ log.error("IM拦截成功! 拦截到用户脚本请求数据={}",body.toJSONString()); return false;