接入elk

src/main/java/com/fdkankan/contro/mq/listener/BuildObjListener.java

@@ -1,66 +1,66 @@
-//package com.fdkankan.contro.mq.listener;
-//
-//import com.fdkankan.contro.mq.service.impl.BuildObjServiceImpl;
-//import com.rabbitmq.client.Channel;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * <p>
-// * TODO
-// * </p>
-// *
-// * @author dengsixing
-// * @since 2022/4/19
-// **/
-//@Slf4j
-//@Component
-//public class BuildObjListener extends AbstrackBuildSceneListener {
-//
-//
-//    @Value("${queue.modeling.obj.modeling-pre}")
-//    private String queueObjModelingPre;
-//    @Value("${queue.modeling.obj.modeling-post}")
-//    private String queueObjModelingPost;
-//
-//    @Autowired
-//    private BuildObjServiceImpl buildObjService;
-//
-//
-//    /**
-//     * 场景计算前置资源准备处理
-//     *
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-pre}"),
-//            concurrency = "${maxThread.modeling.modeling-pre}"
-//    )
-//    public void buildObjScenePreHandler(Channel channel, Message message) throws Exception {
-//        preHandle(channel, queueObjModelingPre, message, buildObjService);
-//    }
-//
-//
-//    /**
-//     * 场景计算后置结果处理
-//     *
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-post}"),
-//            concurrency = "${maxThread.modeling.modeling-post}"
-//    )
-//    public void buildObjScenePostHandler(Channel channel, Message message) throws Exception {
-//        postHandle(channel, queueObjModelingPost, message, buildObjService);
-//
-//    }
-//}
+package com.fdkankan.contro.mq.listener;
+
+import com.fdkankan.contro.mq.service.impl.BuildObjServiceImpl;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/4/19
+ **/
+@Slf4j
+@Component
+public class BuildObjListener extends AbstrackBuildSceneListener {
+
+
+    @Value("${queue.modeling.obj.modeling-pre}")
+    private String queueObjModelingPre;
+    @Value("${queue.modeling.obj.modeling-post}")
+    private String queueObjModelingPost;
+
+    @Autowired
+    private BuildObjServiceImpl buildObjService;
+
+
+    /**
+     * 场景计算前置资源准备处理
+     *
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-pre}"),
+            concurrency = "${maxThread.modeling.modeling-pre}"
+    )
+    public void buildObjScenePreHandler(Channel channel, Message message) throws Exception {
+        preHandle(channel, queueObjModelingPre, message, buildObjService);
+    }
+
+
+    /**
+     * 场景计算后置结果处理
+     *
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.obj.modeling-post}"),
+            concurrency = "${maxThread.modeling.modeling-post}"
+    )
+    public void buildObjScenePostHandler(Channel channel, Message message) throws Exception {
+        postHandle(channel, queueObjModelingPost, message, buildObjService);
+
+    }
+}

src/main/java/com/fdkankan/contro/mq/listener/BuildSceneListener.java

@@ -1,53 +1,53 @@
-//package com.fdkankan.contro.mq.listener;
-//
-//import com.fdkankan.contro.mq.service.impl.BuildSceneServiceImpl;
-//import com.rabbitmq.client.Channel;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Slf4j
-//@Component
-//public class BuildSceneListener extends AbstrackBuildSceneListener {
-//
-//    @Value("${queue.modeling.modeling-pre}")
-//    private String queueModelingPre;
-//    @Value("${queue.modeling.modeling-post}")
-//    private String queueModelingPost;
-//
-//    @Autowired
-//    private BuildSceneServiceImpl buildSceneService;
-//
-//    /**
-//     * 场景计算前置资源准备处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.modeling-pre}"),
-//            concurrency = "${maxThread.modeling.modeling-pre}"
-//    )
-//    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-//        preHandle(channel,queueModelingPre,message,buildSceneService);
-//    }
-//
-//    /**
-//     * 场景计算后置结果处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.modeling-post}"),
-//            concurrency = "${maxThread.modeling.modeling-post}"
-//    )
-//    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-//        postHandle(channel,queueModelingPost,message,buildSceneService);
-//
-//    }
-//}
+package com.fdkankan.contro.mq.listener;
+
+import com.fdkankan.contro.mq.service.impl.BuildSceneServiceImpl;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class BuildSceneListener extends AbstrackBuildSceneListener {
+
+    @Value("${queue.modeling.modeling-pre}")
+    private String queueModelingPre;
+    @Value("${queue.modeling.modeling-post}")
+    private String queueModelingPost;
+
+    @Autowired
+    private BuildSceneServiceImpl buildSceneService;
+
+    /**
+     * 场景计算前置资源准备处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.modeling-pre}"),
+            concurrency = "${maxThread.modeling.modeling-pre}"
+    )
+    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
+        preHandle(channel,queueModelingPre,message,buildSceneService);
+    }
+
+    /**
+     * 场景计算后置结果处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.modeling-post}"),
+            concurrency = "${maxThread.modeling.modeling-post}"
+    )
+    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
+        postHandle(channel,queueModelingPost,message,buildSceneService);
+
+    }
+}

src/main/java/com/fdkankan/contro/mq/listener/BuildV3SceneListener.java

@@ -1,53 +1,53 @@
-//package com.fdkankan.contro.mq.listener;
-//
-//import com.fdkankan.contro.mq.service.impl.BuildV3SceneServiceImpl;
-//import com.rabbitmq.client.Channel;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//@Slf4j
-//@Component
-//public class BuildV3SceneListener extends AbstrackBuildSceneListener {
-//
-//    @Value("${queue.modeling.v3.modeling-pre}")
-//    private String queueModelingPre;
-//    @Value("${queue.modeling.v3.modeling-post}")
-//    private String queueModelingPost;
-//
-//    @Autowired
-//    private BuildV3SceneServiceImpl buildSceneService;
-//
-//    /**
-//     * 场景计算前置资源准备处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-pre}"),
-//            concurrency = "${maxThread.modeling.modeling-pre}"
-//    )
-//    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-//        preHandle(channel,queueModelingPre,message,buildSceneService);
-//    }
-//
-//    /**
-//     * 场景计算后置结果处理
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-post}"),
-//            concurrency = "${maxThread.modeling.modeling-post}"
-//    )
-//    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-//        postHandle(channel,queueModelingPost,message,buildSceneService);
-//
-//    }
-//}
+package com.fdkankan.contro.mq.listener;
+
+import com.fdkankan.contro.mq.service.impl.BuildV3SceneServiceImpl;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class BuildV3SceneListener extends AbstrackBuildSceneListener {
+
+    @Value("${queue.modeling.v3.modeling-pre}")
+    private String queueModelingPre;
+    @Value("${queue.modeling.v3.modeling-post}")
+    private String queueModelingPost;
+
+    @Autowired
+    private BuildV3SceneServiceImpl buildSceneService;
+
+    /**
+     * 场景计算前置资源准备处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-pre}"),
+            concurrency = "${maxThread.modeling.modeling-pre}"
+    )
+    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
+        preHandle(channel,queueModelingPre,message,buildSceneService);
+    }
+
+    /**
+     * 场景计算后置结果处理
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-post}"),
+            concurrency = "${maxThread.modeling.modeling-post}"
+    )
+    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
+        postHandle(channel,queueModelingPost,message,buildSceneService);
+
+    }
+}

src/main/java/com/fdkankan/contro/mq/listener/DingTalkMessageListener.java

@@ -1,47 +1,47 @@
-//package com.fdkankan.contro.mq.listener;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.contro.constant.DingTalkConst;
-//import com.fdkankan.contro.service.IBuildSceneDTService;
-//import com.fdkankan.rabbitmq.bean.BuildSceneFailDTMqMessage;
-//import com.rabbitmq.client.Channel;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.core.Message;
-//import org.springframework.amqp.rabbit.annotation.Queue;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Component;
-//
-//import java.nio.charset.StandardCharsets;
-//
-//@Slf4j
-//@Component
-//public class DingTalkMessageListener {
-//
-//    @Value("${queue.modeling.modeling-dt}")
-//    private String queueModelingDt;
-//
-//    @Autowired
-//    private IBuildSceneDTService buildSceneDTService;
-//
-//    /**
-//     * 场景计算发送钉钉消息
-//     * @param channel
-//     * @param message
-//     * @throws Exception
-//     */
-//    @RabbitListener(
-//            queuesToDeclare = @Queue("${queue.modeling.modeling-dt}"),
-//            concurrency = "${maxThread.modeling.modeling-dt}"
-//    )
-//    public void buildSceneDTHandler(Channel channel, Message message) throws Exception {
-//        String messageId = message.getMessageProperties().getMessageId();
-//        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
-//        log.info("发送钉钉消息处理，队列名：{}，id：{},消息体:{}", queueModelingDt, messageId, msg);
-//        BuildSceneFailDTMqMessage dtMessage = JSONObject.parseObject(msg, BuildSceneFailDTMqMessage.class);
-//        buildSceneDTService.handModelFail(dtMessage.getReason(), dtMessage.getServerPath(),
-//                dtMessage.getNum(), dtMessage.getHostName());
-//        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
-//    }
-//}
+package com.fdkankan.contro.mq.listener;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.contro.constant.DingTalkConst;
+import com.fdkankan.contro.service.IBuildSceneDTService;
+import com.fdkankan.rabbitmq.bean.BuildSceneFailDTMqMessage;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+
+@Slf4j
+@Component
+public class DingTalkMessageListener {
+
+    @Value("${queue.modeling.modeling-dt}")
+    private String queueModelingDt;
+
+    @Autowired
+    private IBuildSceneDTService buildSceneDTService;
+
+    /**
+     * 场景计算发送钉钉消息
+     * @param channel
+     * @param message
+     * @throws Exception
+     */
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.modeling.modeling-dt}"),
+            concurrency = "${maxThread.modeling.modeling-dt}"
+    )
+    public void buildSceneDTHandler(Channel channel, Message message) throws Exception {
+        String messageId = message.getMessageProperties().getMessageId();
+        String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+        log.info("发送钉钉消息处理，队列名：{}，id：{},消息体:{}", queueModelingDt, messageId, msg);
+        BuildSceneFailDTMqMessage dtMessage = JSONObject.parseObject(msg, BuildSceneFailDTMqMessage.class);
+        buildSceneDTService.handModelFail(dtMessage.getReason(), dtMessage.getServerPath(),
+                dtMessage.getNum(), dtMessage.getHostName());
+        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+    }
+}

src/main/resources/bootstrap-test.yml

@@ -1,8 +1,4 @@
 spring:
-  profiles:
-    active: test
-    application:
-      name: model-control
   cloud:
     nacos:
       config:
@@ -43,7 +39,7 @@ spring:
             refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: public
+        namespace: ${spring.cloud.nacos.config.namespace}