From c648fdb4b8f592fb8f7778ddd5add14196132e3f Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 25 Apr 2018 14:04:48 +0800
Subject: [PATCH] merge

---
 boot-service/pom.xml                        |  5 +++++
 boot-web/src/main/resources/application.yml | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index bfac005..4888594 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -120,5 +120,10 @@
             <artifactId>alipay</artifactId>
             <version>${alipay-version}</version>
         </dependency>
+        <!-- 消息队列 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/boot-web/src/main/resources/application.yml b/boot-web/src/main/resources/application.yml
index 8493abe..a7d854c 100644
--- a/boot-web/src/main/resources/application.yml
+++ b/boot-web/src/main/resources/application.yml
@@ -46,8 +46,14 @@ spring:
       charset: UTF-8
       enabled: true
       force: true
-
-
+  #消息队列
+  rabbitmq:
+     host:
+     port:
+     username:
+     password:
+     virtual-host:
+     connection-timeout:
 #log
 logging:
   config: classpath:log4j2.xml