Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -62,7 +62,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
      * @param parentId
      */
     public   void bindRelation(Integer userId,Integer parentId,Integer type){
-        if (userId==parentId){
+        if (userId.equals(parentId)){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
             return;
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -437,8 +437,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             orderMQDTO.setSign(sign);
             SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
                 setExchange(ORDER_TOPIC);
-                setJson(JSONUtil.toJsonStr(orderMQDTO));
             }};
+            sendMsgDTO.setJson(JSONUtil.toJsonStr(orderMQDTO));
             switch (sign) {
                 case 2:
                     sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -4,10 +4,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.biz.MQServiceBiZ;
 import com.xxfc.platform.universal.dto.SendMsgDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping(value = "message")
@@ -22,7 +19,7 @@ public class MQSenderController {
     }
 
     @PostMapping(value = "/sendMessage")
-    public ObjectRestResponse sendMessage(SendMsgDTO dto) {
+    public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {
         return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
     }