From 1b2f04363ef45d604c05bdcb1710a054203797e7 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 2 May 2018 15:25:40 +0800
Subject: [PATCH] merge

---
 .../com/xwbing/rabbit/RabbitConstant.java     |  8 +++----
 .../main/java/com/xwbing/rabbit/Receiver.java | 10 ++++-----
 .../main/java/com/xwbing/rabbit/Sender.java   |  6 ++---
 .../xwbing/rabbit/TopicExchangeConfig.java    | 22 ++++++++++++++-----
 .../xwbing/controller/rest/TestControl.java   |  2 +-
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/boot-service/src/main/java/com/xwbing/rabbit/RabbitConstant.java b/boot-service/src/main/java/com/xwbing/rabbit/RabbitConstant.java
index 794e1b0..7b32883 100644
--- a/boot-service/src/main/java/com/xwbing/rabbit/RabbitConstant.java
+++ b/boot-service/src/main/java/com/xwbing/rabbit/RabbitConstant.java
@@ -12,17 +12,17 @@ public class RabbitConstant {
      */
     public static final String EMAIL_QUEUE = "email";
     /**
-     * http请求队列
+     * 短信队列
      */
-    public static final String HTTP_REQUEST_QUEUE = "http.request";
+    public static final String MESSAGE_QUEUE = "message";
     /**
      * 邮件队列路由键（*表示一个词,#表示零个或多个词）
      */
     public static final String EMAIL_ROUTING_KEY = "email.key";
     /**
-     * http请求路由键
+     * 短信队列路由键
      */
-    public static final String HTTP_REQUEST_ROUTING_KEY = "http.request.key";
+    public static final String MESSAGE_ROUTING_KEY = "message.key";
     /**
      * 交换机
      */
diff --git a/boot-service/src/main/java/com/xwbing/rabbit/Receiver.java b/boot-service/src/main/java/com/xwbing/rabbit/Receiver.java
index 68e37c1..cdda621 100644
--- a/boot-service/src/main/java/com/xwbing/rabbit/Receiver.java
+++ b/boot-service/src/main/java/com/xwbing/rabbit/Receiver.java
@@ -11,7 +11,7 @@ import javax.annotation.Resource;
 import java.text.MessageFormat;
 
 import static com.xwbing.rabbit.RabbitConstant.EMAIL_QUEUE;
-import static com.xwbing.rabbit.RabbitConstant.HTTP_REQUEST_QUEUE;
+import static com.xwbing.rabbit.RabbitConstant.MESSAGE_QUEUE;
 
 /**
  * 项目名称: boot-module-demo
@@ -40,13 +40,13 @@ public class Receiver {
     }
 
     /**
-     * 处理http队列消息
+     * 处理短信队列消息
      *
      * @param msg
      */
-    @RabbitListener(queues = HTTP_REQUEST_QUEUE)
-    public String processHttp(String[] msg) {
-        String response = MessageFormat.format("收到{0}队列的消息:{1}", HTTP_REQUEST_QUEUE, msg);
+    @RabbitListener(queues = MESSAGE_QUEUE)
+    public String processMessage(String[] msg) {
+        String response = MessageFormat.format("收到{0}队列的消息:{1}", MESSAGE_QUEUE, msg);
         return response.toUpperCase();
     }
 }
diff --git a/boot-service/src/main/java/com/xwbing/rabbit/Sender.java b/boot-service/src/main/java/com/xwbing/rabbit/Sender.java
index a970f1c..aee2ad9 100644
--- a/boot-service/src/main/java/com/xwbing/rabbit/Sender.java
+++ b/boot-service/src/main/java/com/xwbing/rabbit/Sender.java
@@ -63,12 +63,12 @@ public class Sender implements RabbitTemplate.ConfirmCallback, RabbitTemplate.Re
     }
 
     /**
-     * 发送信息到http队列
+     * 发送信息到message队列
      *
      * @param msg
      */
-    public void sendHttpRequest(String[] msg) {
-        send(msg, RabbitConstant.CONTROL_EXCHANGE, RabbitConstant.HTTP_REQUEST_ROUTING_KEY);
+    public void sendMessage(String[] msg) {
+        send(msg, RabbitConstant.CONTROL_EXCHANGE, RabbitConstant.MESSAGE_ROUTING_KEY);
     }
 
     /**
diff --git a/boot-service/src/main/java/com/xwbing/rabbit/TopicExchangeConfig.java b/boot-service/src/main/java/com/xwbing/rabbit/TopicExchangeConfig.java
index 2be2c50..5daa9c6 100644
--- a/boot-service/src/main/java/com/xwbing/rabbit/TopicExchangeConfig.java
+++ b/boot-service/src/main/java/com/xwbing/rabbit/TopicExchangeConfig.java
@@ -15,7 +15,11 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class TopicExchangeConfig {
-    //声明队列
+    /**
+     * 声明队列
+     *
+     * @return
+     */
     @Bean
     public Queue emailQueue() {
         return new Queue(RabbitConstant.EMAIL_QUEUE, true);//true表示持久化该队列
@@ -23,16 +27,24 @@ public class TopicExchangeConfig {
 
     @Bean
     public Queue httpRequestQueue() {
-        return new Queue(RabbitConstant.HTTP_REQUEST_QUEUE, true);
+        return new Queue(RabbitConstant.MESSAGE_QUEUE, true);
     }
 
-    //声明交换机
+    /**
+     * 声明交换机
+     *
+     * @return
+     */
     @Bean
     public TopicExchange topicExchange() {
         return new TopicExchange(RabbitConstant.CONTROL_EXCHANGE);
     }
 
-    //绑定
+    /**
+     * 绑定
+     *
+     * @return
+     */
     @Bean
     public Binding bindingEmail() {
         return BindingBuilder.bind(emailQueue()).to(topicExchange()).with(RabbitConstant.EMAIL_ROUTING_KEY);//*表示一个词,#表示零个或多个词
@@ -40,6 +52,6 @@ public class TopicExchangeConfig {
 
     @Bean
     public Binding bindingHttpRequest() {
-        return BindingBuilder.bind(httpRequestQueue()).to(topicExchange()).with(RabbitConstant.HTTP_REQUEST_ROUTING_KEY);
+        return BindingBuilder.bind(httpRequestQueue()).to(topicExchange()).with(RabbitConstant.MESSAGE_ROUTING_KEY);
     }
 }
diff --git a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java
index 3f996e9..e5da486 100644
--- a/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java
+++ b/boot-web/src/main/java/com/xwbing/controller/rest/TestControl.java
@@ -50,7 +50,7 @@ public class TestControl {
 
     @GetMapping("send")
     public void send(@RequestParam String[] msg) {
-        sender.sendHttpRequest(msg);
+        sender.sendMessage(msg);
     }
 
     @LogInfo("redis功能测试")