From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/resource/env-dev/rocket/consumer.xml |   64 ++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/fanli/src/main/resource/env-dev/rocket/consumer.xml b/fanli/src/main/resource/env-dev/rocket/consumer.xml
index 75300cd..4204b6b 100644
--- a/fanli/src/main/resource/env-dev/rocket/consumer.xml
+++ b/fanli/src/main/resource/env-dev/rocket/consumer.xml
@@ -2,7 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-	<bean id="inviteOrderSubsidyMsgListener" class="com.yeshi.fanli.util.rocketmq.consumer.order.InviteOrderSubsidyMessageListener"></bean> <!--Listener 閰嶇疆 -->
+	<bean id="inviteOrderSubsidyMsgListener"
+		class="com.yeshi.fanli.util.rocketmq.consumer.order.InviteOrderSubsidyMessageListener"></bean> <!--Listener 閰嶇疆 -->
 	<!-- Group ID 璁㈤槄鍚屼竴涓� Topic锛屽彲浠ュ垱寤哄涓� ConsumerBean -->
 	<bean id="orderTransactionConsumer" class="com.aliyun.openservices.ons.api.bean.ConsumerBean"
 		init-method="start" destroy-method="shutdown">
@@ -18,38 +19,63 @@
 		</property>
 		<property name="subscriptionTable">
 			<map>
-				<!-- 璁㈠崟琛ヨ创璁㈤槄  -->
+				<!-- 璁㈠崟琛ヨ创璁㈤槄 -->
 				<entry value-ref="inviteOrderSubsidyMsgListener">
 					<key>
 						<bean class="com.aliyun.openservices.ons.api.bean.Subscription">
 							<property name="topic" value="TOPIC_ORDER" />
-							<property name="expression" value="*" /><!--expression 鍗� 
-								Tag锛屽彲浠ヨ缃垚鍏蜂綋鐨� Tag锛屽 taga||tagb||tagc锛屼篃鍙缃垚 *銆� * 浠呬唬琛ㄨ闃呮墍鏈� Tag锛屼笉鏀寔閫氶厤 -->
+							<property name="expression"
+								value="orderStatistic||orderUpdate||orderFanLiActual||orderFanLiDelay" /><!--expression 
+								鍗� Tag锛屽彲浠ヨ缃垚鍏蜂綋鐨� Tag锛屽 taga||tagb||tagc锛屼篃鍙缃垚 *銆� * 浠呬唬琛ㄨ闃呮墍鏈� Tag锛屼笉鏀寔閫氶厤 -->
 						</bean>
 					</key>
 				</entry>
-				
+
+
 				<entry value-ref="inviteOrderSubsidyMsgListener">
 					<key>
 						<bean class="com.aliyun.openservices.ons.api.bean.Subscription">
-							<property name="topic" value="TOPIC_FANLI" />
-							<property name="expression" value="*" /><!--expression 鍗� 
-								Tag锛屽彲浠ヨ缃垚鍏蜂綋鐨� Tag锛屽 taga||tagb||tagc锛屼篃鍙缃垚 *銆� * 浠呬唬琛ㄨ闃呮墍鏈� Tag锛屼笉鏀寔閫氶厤 -->
+							<property name="topic" value="TOPIC_USER" />
+							<property name="expression" value="useSystemCoupon" />
 						</bean>
 					</key>
 				</entry>
-				
-				
-				<entry value-ref="inviteOrderSubsidyMsgListener">
-					<key>
-						<bean class="com.aliyun.openservices.ons.api.bean.Subscription">
-							<property name="topic" value="TOPIC_SYSTEM_COUPON_USE" />
-							<property name="expression" value="rebatePercentCoupon" />
-						</bean>
-					</key>
-				</entry>
-				
+
 			</map>
 		</property>
 	</bean>
+
+	<!-- 鏉挎牀鍟嗗煄璁㈠崟娑堟伅璁㈤槄 -->
+	<bean id="banLiShopOrderMessageListener"
+		class="com.yeshi.fanli.util.rocketmq.consumer.order.BanLiShopOrderMessageListener"></bean> <!--Listener 閰嶇疆 -->
+	<!-- Group ID 璁㈤槄鍚屼竴涓� Topic锛屽彲浠ュ垱寤哄涓� ConsumerBean -->
+	<bean id="orderTransactionConsumer" class="com.aliyun.openservices.ons.api.bean.ConsumerBean"
+		init-method="start" destroy-method="shutdown">
+		<property name="properties"> <!--娑堣垂鑰呴厤缃俊鎭� -->
+			<props>
+				<prop key="AccessKey">LTAI4FwmTxVCuzTaoZtDiV8z</prop>
+				<prop key="SecretKey">ixWg90QbYFKP6ae5xpAo2P1qwIyll5</prop>
+				<prop key="GROUP_ID">GID_BANLI_SHOP_ORDER</prop>
+				<prop key="NAMESRV_ADDR">http://MQ_INST_1205444665315884_BbaMbxF4.mq-internet-access.mq-internet.aliyuncs.com:80
+				</prop>
+				<!--灏嗘秷璐硅�呯嚎绋嬫暟鍥哄畾涓� 50 涓� <prop key="ConsumeThreadNums">50</prop> -->
+			</props>
+		</property>
+		<property name="subscriptionTable">
+			<map>
+				<!-- 璁㈤槄涓嬪崟寤舵椂娑堟伅 -->
+				<entry value-ref="inviteOrderSubsidyMsgListener">
+					<key>
+						<bean class="com.aliyun.openservices.ons.api.bean.Subscription">
+							<property name="topic" value="TOPIC_ORDER" />
+							<property name="expression" value="banLiShopOrderDelay" /><!--expression 
+								鍗� Tag锛屽彲浠ヨ缃垚鍏蜂綋鐨� Tag锛屽 taga||tagb||tagc锛屼篃鍙缃垚 *銆� * 浠呬唬琛ㄨ闃呮墍鏈� Tag锛屼笉鏀寔閫氶厤 -->
+						</bean>
+					</key>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+
 </beans>
\ No newline at end of file

--
Gitblit v1.8.0