修复ActionDispatcher处理异常时报错的问题

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

@@ -90,10 +90,10 @@ public class GeneralMessageHandler {
                 } else {
                 } else {
                     errorCode = ApiCode.SPRING_BOOT_PLUS_EXCEPTION;
                     errorCode = ApiCode.SPRING_BOOT_PLUS_EXCEPTION;
                 }
                 }
-                res = WsResponse.result(errorCode, exception.getMessage(), false);
+                res = WsResponse.result(errorCode, exception.getMessage(), null).setReqId(am.getMessage().getReqId());
             } else {
             } else {
                 // 其他默认的全局异常处理
                 // 其他默认的全局异常处理
-                res = WsResponse.result(ApiCode.SYSTEM_EXCEPTION);
+                res = WsResponse.result(ApiCode.SYSTEM_EXCEPTION, "", null).setReqId(am.getMessage().getReqId());
             }
             }
         }
         }
         if (res != null) {
         if (res != null) {

core/src/main/java/com/wecloud/im/ws/model/WsResponse.java

@@ -71,7 +71,10 @@ public class WsResponse<T> implements Serializable {
             message = success;
             message = success;
         }
         }
         WsResponse<T> response = new WsResponse<>();
         WsResponse<T> response = new WsResponse<>();
-        response.setCmd(cmd).setCode(apiCode.getCode()).setMsg(message).setData(data).setReqId(ActionRequestHolder.getReqId());
+        response.setCmd(cmd).setCode(apiCode.getCode()).setMsg(message).setData(data);
+        if (ActionRequestHolder.getActionRequest() != null) {
+            response.setReqId(ActionRequestHolder.getReqId());
+        }
         return response;
         return response;
     }
     }