Merge remote-tracking branch 'origin/feature-cluster' into feature-cluster

core/src/main/java/com/wecloud/dispatch/general/GeneralMessageHandler.java

@@ -82,7 +82,7 @@ public class GeneralMessageHandler {
                 // 处理自定义异常
                 // 处理自定义异常
                 ApiCode errorCode;
                 ApiCode errorCode;
                 if (exception instanceof BusinessException) {
                 if (exception instanceof BusinessException) {
-                    errorCode = ApiCode.BUSINESS_EXCEPTION;
+                    errorCode = ApiCode.getApiCode(((BusinessException) exception).getErrorCode());
                 } else if (exception instanceof DaoException) {
                 } else if (exception instanceof DaoException) {
                     errorCode = ApiCode.DAO_EXCEPTION;
                     errorCode = ApiCode.DAO_EXCEPTION;
                 } else if (exception instanceof VerificationCodeException) {
                 } else if (exception instanceof VerificationCodeException) {

core/src/main/java/com/wecloud/im/action/RtcAction.java

 package com.wecloud.im.action;
 package com.wecloud.im.action;
 
 
+import com.alibaba.fastjson.JSON;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -38,6 +39,7 @@ public class RtcAction {
     @ActionMapping("/createAndCall")
     @ActionMapping("/createAndCall")
     @ApiOperation(value = "创建频道,并邀请客户端加入", notes = "创建频道,并邀请客户端加入")
     @ApiOperation(value = "创建频道,并邀请客户端加入", notes = "创建频道,并邀请客户端加入")
     public WsResponse<CreateRtcChannelResult> createAndCall(CreateRtcChannelParam data) {
     public WsResponse<CreateRtcChannelResult> createAndCall(CreateRtcChannelParam data) {
+        log.info("音频通话，创建频道并邀请客户端加入，入参 {}", JSON.toJSONString(data));
         if (BaseEnum.valueOf(CallTypeEnum.class, data.getCallType()) == null) {
         if (BaseEnum.valueOf(CallTypeEnum.class, data.getCallType()) == null) {
             return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
             return WsResponse.fail(ApiCode.PARAMETER_EXCEPTION);
         }
         }
@@ -48,6 +50,7 @@ public class RtcAction {
     @ActionMapping("/join")
     @ActionMapping("/join")
     @ApiOperation(value = "同意进入频道", notes = "")
     @ApiOperation(value = "同意进入频道", notes = "")
     public WsResponse<Map<String, Boolean>> join(JoinRtcChannelParam data) {
     public WsResponse<Map<String, Boolean>> join(JoinRtcChannelParam data) {
+        log.info("音频通话，同意进入频道，入参 {}", JSON.toJSONString(data));
         rtcService.join(data);
         rtcService.join(data);
         return WsResponse.ok();
         return WsResponse.ok();
     }
     }
@@ -55,6 +58,7 @@ public class RtcAction {
     @ActionMapping("/reject")
     @ActionMapping("/reject")
     @ApiOperation(value = "拒接进入频道", notes = "")
     @ApiOperation(value = "拒接进入频道", notes = "")
     public WsResponse<Map<String, Boolean>> reject(RejectRtcChannelParam data) {
     public WsResponse<Map<String, Boolean>> reject(RejectRtcChannelParam data) {
+        log.info("音频通话，拒接进入频道，入参 {}", JSON.toJSONString(data));
         rtcService.reject(data);
         rtcService.reject(data);
         return WsResponse.ok();
         return WsResponse.ok();
     }
     }
@@ -62,6 +66,7 @@ public class RtcAction {
     @ActionMapping("/leave")
     @ActionMapping("/leave")
     @ApiOperation(value = "主动挂断(离开频道)", notes = "")
     @ApiOperation(value = "主动挂断(离开频道)", notes = "")
     public WsResponse<Map<String, Boolean>> leave(LeaveRtcChannelParam data) {
     public WsResponse<Map<String, Boolean>> leave(LeaveRtcChannelParam data) {
+        log.info("音频通话，主动挂断(离开频道)，入参 {}", JSON.toJSONString(data));
         rtcService.leave(data);
         rtcService.leave(data);
         return WsResponse.ok();
         return WsResponse.ok();
     }
     }
@@ -69,6 +74,7 @@ public class RtcAction {
     @ActionMapping("/sdpForward")
     @ActionMapping("/sdpForward")
     @ApiOperation(value = "SDP数据转发", notes = "")
     @ApiOperation(value = "SDP数据转发", notes = "")
     public WsResponse<Map<String, Boolean>> sdpForward(SdpForwardParam data) {
     public WsResponse<Map<String, Boolean>> sdpForward(SdpForwardParam data) {
+        log.info("音频通话，SDP数据转发，入参 {}", JSON.toJSONString(data));
         rtcService.sdpForward(data);
         rtcService.sdpForward(data);
         return WsResponse.ok();
         return WsResponse.ok();
     }
     }
@@ -76,6 +82,7 @@ public class RtcAction {
     @ActionMapping("/candidateForward")
     @ActionMapping("/candidateForward")
     @ApiOperation(value = "candidate候选者数据转发", notes = "")
     @ApiOperation(value = "candidate候选者数据转发", notes = "")
     public WsResponse<Map<String, Boolean>> candidateForward(CandidateForwardParam data) {
     public WsResponse<Map<String, Boolean>> candidateForward(CandidateForwardParam data) {
+        log.info("音频通话，candidate候选者数据转发，入参 {}", JSON.toJSONString(data));
         rtcService.candidateForward(data);
         rtcService.candidateForward(data);
         return WsResponse.ok();
         return WsResponse.ok();
     }
     }

core/src/main/java/com/wecloud/im/param/ListConversationMembersParam.java

@@ -26,7 +26,7 @@ public class ListConversationMembersParam implements Serializable {
     @ApiModelProperty(value = "会话表id", required = true)
     @ApiModelProperty(value = "会话表id", required = true)
     private Long conversationId;
     private Long conversationId;
 
 
-    @ApiModelProperty(value = "角色列表 可多选，不传则查全部", required = true)
+    @ApiModelProperty(value = "角色列表 可多选，不传则查全部")
     private List<Integer> roles;
     private List<Integer> roles;
 
 
     /**
     /**