From d0a7ad5e3a1c147a70a0e792c3eafa3b7613fff7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/rabbitmq.xml | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/rabbitmq.xml b/src/main/resources/rabbitmq.xml
index fafc954..fb5c2dc 100644
--- a/src/main/resources/rabbitmq.xml
+++ b/src/main/resources/rabbitmq.xml
@@ -8,7 +8,7 @@
<!-- rabbitMQ������ -->
<bean id="rabbitConnectionFactory" class="org.springframework.amqp.rabbit.connection.CachingConnectionFactory">
- <constructor-arg value="101.37.22.173"/>
+ <constructor-arg value="116.62.12.115"/>
<property name="username" value="guest"/>
<property name="password" value="guest"/>
<property name="channelCacheSize" value="8"/>
@@ -17,19 +17,38 @@
<rabbit:admin connection-factory="rabbitConnectionFactory"/>
- <rabbit:queue name="monitor" durable="false" exclusive="false" auto-delete="false" />
-
- <!--<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="monitor" 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