From a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/rabbitmq.xml |   41 ++++++++++++++++++++++++++++++-----------
 1 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index 737f4f6..5335899 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -17,19 +17,38 @@
 
     <rabbit:admin connection-factory="rabbitConnectionFactory"/>
 
-    <rabbit:queue  name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>
-
-    <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
-
-    <bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>
-
-    <rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
-        <rabbit:listener  queues="monitors_storage_data"   ref="amqpMsgListener" />
-    </rabbit:listener-container>
-
     <bean id="rabbitTemplate" class="org.springframework.amqp.rabbit.core.RabbitTemplate">
         <constructor-arg ref="rabbitConnectionFactory"></constructor-arg>
     </bean>
 
-    <rabbit:fanout-exchange name="exchange_alarm" durable="false"  xmlns="http://www.springframework.org/schema/rabbit"></rabbit:fanout-exchange>
+    <rabbit:queue  name="monitors_storage_data" durable="false" exclusive="false" auto-delete="true"/>
+
+    <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.MonitorListener"/>-->
+    <!--<bean id="amqpMsgListener" class="com.moral.monitor.listener.Listener"/>-->
+    <bean id="amqpMsgListener" class="com.moral.monitor.listener.TaskListener"/>
+
+    <rabbit:listener-container connection-factory="rabbitConnectionFactory" acknowledge="auto" >
+        <rabbit:listener  queues="monitors_storage_data" ref="amqpMsgListener" />
+    </rabbit:listener-container>
+
+    <rabbit:queue name="monitors_storage_data_2" durable="true" auto-delete="false" exclusive="false" />
+
+    <rabbit:fanout-exchange name="monitors_data_2" durable="true" auto-delete="false">
+        <rabbit:bindings>
+            <rabbit:binding queue="monitors_storage_data_2"></rabbit:binding>
+        </rabbit:bindings>
+    </rabbit:fanout-exchange>
+
+    <!--http://blog.csdn.net/u012204058/article/details/54292888-->
+    <!--http://blog.csdn.net/itmrchen/article/details/53285648-->
+
+    <!--<rabbit:queue name="monitors_storage_alarm" durable="true" auto-delete="false" exclusive="false" />-->
+
+    <!--<rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false">-->
+        <!--<rabbit:bindings>-->
+            <!--<rabbit:binding queue="monitors_storage_alarm"></rabbit:binding>-->
+        <!--</rabbit:bindings>-->
+    <!--</rabbit:fanout-exchange>-->
+
+    <rabbit:fanout-exchange name="monitors_alarm" durable="true" auto-delete="false" />
 </beans>
\ No newline at end of file

--
Gitblit v1.8.0