Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2

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

@@ -155,12 +155,12 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     public  void upRelationTemp(Integer pid,Integer userid){
 
         AppUserRelationTemp relationTemp=new AppUserRelationTemp();
-        relationTemp.setUserId(pid);
         relationTemp.setTempId(userid);
         relationTemp.setIsDel(0);
         relationTemp.setType(1);
         AppUserRelationTemp relationTemp1= relationTempBiz.selectOne(relationTemp);
         if(relationTemp1==null){
+            relationTemp.setUserId(pid);
             relationTempBiz.insertSelective(relationTemp);
         }
 

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

@@ -24,6 +24,7 @@ import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.dto.SendMsgDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -434,19 +435,24 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
         try {
             orderMQDTO.setSign(sign);
+            SendMsgDTO sendMsgDTO = new SendMsgDTO(){{
+                setExchange(ORDER_TOPIC);
+                setJson(JSONUtil.toJsonStr(orderMQDTO));
+            }};
             switch (sign) {
                 case 2:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_CANCEL, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_CANCEL);
                     break;
                 case 4:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_PAY, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_PAY);
                     break;
                 case 6:
-                    mqSenderFeign.sendMessage(ORDER_TOPIC, KEY_ORDER_FINLISH, JSONUtil.toJsonStr(orderMQDTO));
+                    sendMsgDTO.setRoutKey(KEY_ORDER_FINLISH);
                     break;
                 default:
                     break;
             }
+            mqSenderFeign.postSendMessage(BeanUtil.beanToMap(sendMsgDTO, Boolean.FALSE, Boolean.TRUE));
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SendMsgDTO.java

+package com.xxfc.platform.universal.dto;
+
+import lombok.Data;
+
+@Data
+public class SendMsgDTO {
+    String exchange;
+    String routKey;
+    String json;
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/MQSenderFeign.java

@@ -3,12 +3,18 @@ package com.xxfc.platform.universal.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.Map;
+
 @FeignClient(value = "xx-universal", contextId = "sendMessage")
 public interface MQSenderFeign {
 
     @GetMapping(value = "/message/sendMessage")
     public ObjectRestResponse sendMessage(@RequestParam(value = "exchange") String exchange, @RequestParam(value = "routKey")String routKey, @RequestParam(value = "json") String json);
 
+    @PostMapping(value = "/message/sendMessage")
+    public ObjectRestResponse postSendMessage(@RequestParam("entity") Map<String, Object> entity);
+
 }

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

@@ -2,8 +2,10 @@ package com.xxfc.platform.universal.controller;
 
 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;
 
@@ -19,4 +21,10 @@ public class MQSenderController {
         return mqServiceBiZ.sendMessage(exchange, routKey, json);
     }
 
+    @PostMapping(value = "/sendMessage")
+    public ObjectRestResponse sendMessage(SendMsgDTO dto) {
+        return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
+    }
+
+
 }