xgb 1 napja
szülő
commit
dc6ea3177f

+ 5 - 4
fs-company-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -246,27 +246,28 @@ public class CommonController extends AppBaseController {
 	@ApiOperation("openIm创建群组之前的回调")
 	@PostMapping(value = "/callbackBeforeCreateGroupCommand")
 	public OpenImMsgCallBackResponse callbackBeforeCreateGroupCommand(@RequestBody String body) {
+		log.error("openIm创建群组之前的回调", body);
 		if (StringUtils.isBlank(body)) {
 			log.warn("OpenIM 回调 body 为空");
-			return OpenImMsgCallBackResponse.fail("body为空");
+			return OpenImMsgCallBackResponse.fail(5001,"body为空",1);
 		}
 		try {
 			OpenImBeforeCreateGroupVO messageInfo = JsonUtil.fromJson(body, OpenImBeforeCreateGroupVO.class);
 			if (messageInfo == null || StringUtils.isBlank(messageInfo.getCreatorUserID())) {
 				log.warn("OpenIM 回调参数无效: {}", body);
-				return OpenImMsgCallBackResponse.fail("参数无效");
+				return OpenImMsgCallBackResponse.fail(5001,"参数无效",1);
 			}
 
 			if(!messageInfo.getCreatorUserID().startsWith("C")){
 				log.info("非销售不允许创群");
-				return OpenImMsgCallBackResponse.fail("非销售不允许创群");
+				return OpenImMsgCallBackResponse.fail(5001,"非销售不允许创群",1);
 			}
 
 			return OpenImMsgCallBackResponse.success();
 		} catch (Exception e) {
 			// 解析失败仍返回成功,避免 OpenIM 反复重试;异常已记录便于排查
 			log.error("OpenIM 回调解析失败, body={}", body, e);
-			return OpenImMsgCallBackResponse.fail("参数异常");
+			return OpenImMsgCallBackResponse.fail(5001,"参数异常",1);
 		}
 	}
 

+ 9 - 0
fs-service/src/main/java/com/fs/im/dto/OpenImMsgCallBackResponse.java

@@ -21,4 +21,13 @@ public class OpenImMsgCallBackResponse {
         response.setErrMsg(errMsg);
         return response;
     }
+
+    public static OpenImMsgCallBackResponse fail(Integer errCode, String errMsg,Integer nextCode) {
+        OpenImMsgCallBackResponse response = new OpenImMsgCallBackResponse();
+        response.setActionCode(0);
+        response.setErrCode(errCode);
+        response.setErrMsg(errMsg);
+        response.setNextCode(nextCode);
+        return response;
+    }
 }

+ 2 - 0
fs-service/src/main/java/com/fs/im/vo/OpenImBeforeCreateGroupVO.java

@@ -1,11 +1,13 @@
 package com.fs.im.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class OpenImBeforeCreateGroupVO {
 
     private String callbackCommand;