Merge remote-tracking branch 'origin/master'

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -9,15 +9,12 @@ import com.fdkankan.common.util.UploadToOssUtil;
 import com.fdkankan.modeling.constants.RedisKey;
 import com.fdkankan.modeling.constants.SysConstants;
 import com.fdkankan.modeling.entity.SceneFileBuild;
-import com.fdkankan.modeling.entity.ScenePro;
-import com.fdkankan.modeling.entity.SceneProExt;
 import com.fdkankan.modeling.push.PushMessageConfig;
 import com.fdkankan.modeling.utils.DingDingUtils;
 import com.fdkankan.modeling.utils.PushMsgUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.mq.message.BuildSceneResultMqMessage;
 import com.fdkankan.mq.util.RocketMQProducer;
-import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.utils.constant.ConstantFilePath;
 import com.fdkankan.utils.constant.ConstantUrl;
@@ -37,7 +34,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 
-import javax.annotation.Resource;
 import java.io.*;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -93,13 +89,9 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
 
     @Override
     public void onMessage(String message) {
-
-        BuildSceneMqMessage buildSceneMqMessage = JSONObject.parseObject(message, BuildSceneMqMessage.class);
         log.info("开始处理消息，消费者组：{}，主题名：{}， 消息内容：{}", consumerGroup, topicName, message);
-
+        BuildSceneMqMessage buildSceneMqMessage = JSONObject.parseObject(message, BuildSceneMqMessage.class);
         process(buildSceneMqMessage);
-
-
     }
 
     public void process(BuildSceneMqMessage message) {

4dkankan-common-mq/src/main/java/com/fdkankan/mq/util/RocketMQProducer.java

@@ -1,6 +1,8 @@
 package com.fdkankan.mq.util;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.producer.SendCallback;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Component;
 import java.util.Objects;
 
 @Component
+@Slf4j
 public class RocketMQProducer {
 
     @Autowired
@@ -161,12 +164,12 @@ public class RocketMQProducer {
         if(StrUtil.isNotEmpty(tag)){
             topic = topic + ":" + tag;
         }
+        log.info("MQ推送消息---topic:{},tag:{},key:{},msg:{}",topic,tag,key, JSONObject.toJSONString(body));
         MessageBuilder messageBuilder = MessageBuilder.withPayload(body);
         if(StrUtil.isNotEmpty(key)){
             messageBuilder.setHeader("KEYS", key);
         }
         Message message = messageBuilder.build();
-
         rocketMQTemplate.sendOneWay(topic, message);
     }