From cb6d498143f5a6ba7bcf1e87f3af4a145edac260 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Fri, 16 Nov 2018 10:26:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=B6=88=E6=81=AF=E9=98=9F?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java     | 1 -
 .../cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java   | 3 +--
 .../cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java     | 8 +-------
 .../src/main/resources/application.properties                     | 5 +----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
index df83638..2fb0093 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/I3CoreQueueConfig.java
@@ -14,7 +14,6 @@ import org.springframework.context.annotation.Configuration;
  * @CreateDate : 2018-09-26 16:57
  * @Modify:
  **/
-@ConditionalOnExpression("'${spring.core.rabbitmq:true}' == 'true'")
 @Configuration
 public class I3CoreQueueConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(I3CoreQueueConfig.class);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
index c547242..04b505b 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
@@ -37,8 +37,7 @@ public class LetterQueueReceiver {
      * @param message
      * 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....));
      */
-//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_QUEUE)
-    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE)
+//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE)
     public void processImppMessage(RefUserMessage msg, Channel channel, Message message) {
         try {
             LOGGER.info("【MQ-IMPP_MESSAGE_QUEUE】数据接收成功：{}",msg);
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
index 9fd3e04..e02123b 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java
@@ -2,18 +2,15 @@ package cn.estsh.i3plus.core.apiservice.mq;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
-import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysMessageService;
 import cn.estsh.i3plus.core.apiservice.util.MailUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.i3plus.pojo.platform.repository.RefUserMessageRepository;
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -43,10 +40,9 @@ public class MailQueueReceiver {
      * @param channel
      * @param message
      */
-    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
+//    @RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE)
     public void processImppMail(RefUserMessage msg, Channel channel, Message message) {
         try {
-            Thread.sleep(18000);
             LOGGER.info("【MQ-IMPP_MESSAGE_QUEUE】数据接收成功：{}",msg);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             msg.setReceiverTime(sdf.format(new Date()));
@@ -73,8 +69,6 @@ public class MailQueueReceiver {
             } catch (IOException e1) {
                 e1.printStackTrace();
             }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
         }
     }
 }
diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties
index 8155487..58de670 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties
@@ -29,7 +29,4 @@ server.tomcat.uri-encoding=UTF-8
 spring.mvc.view.prefix=/upload_demo
 spring.mvc.view.suffix=.jsp
 #静态文件访问配置
-spring.resources.static-locations=/static/**,/**
-
-########## CORE-MQ ########
-spring.core.rabbitmq=false
\ No newline at end of file
+spring.resources.static-locations=/static/**,/**
\ No newline at end of file