From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
index c960084..b1b4a19 100644
--- a/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
@@ -1,3 +1,4 @@
+/*
package com.matrix.config;
@@ -5,9 +6,11 @@
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.component.rabbitmq.RabiitMqTemplateFactory;
import com.matrix.core.tools.LogUtil;
-import com.matrix.system.shopXcx.mqTask.*;
+import com.matrix.system.shopXcx.mqTask.OrderOutSotoreTask;
+import com.matrix.system.shopXcx.mqTask.SalesOrderRefundTask;
+import com.matrix.system.shopXcx.mqTask.SalesOrderTask;
+import com.matrix.system.shopXcx.mqTask.TemplateMsgTask;
import com.matrix.system.wechart.templateMsg.Task.UniformMsgSentTask;
-import com.rabbitmq.client.DeliverCallback;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -16,7 +19,12 @@
import java.util.ArrayList;
import java.util.List;
-@Configuration
+*/
+/**
+ * 小型应用弃用rabbitmq，直接通过观察者模式对消息进行同步消费 参考 AsyncMessageManager
+ *//*
+
+//@Configuration
public class RabbitMqConfig {
@Value("${rabbitmq.host}")
@@ -39,20 +47,10 @@
//订阅模式
public static final String MQ_EXCHANGE_TOPIC = "hive_exchange_fanout";
- @Bean
- ScoreOrderTask ScoreOrderTask() {
- return new ScoreOrderTask();
- }
-
- @Bean
- DeliverCallback OrderDingDingNoticeTask() {
- return new OrderDingDingNoticeTask();
- }
- OrderTask OrderrCreateTask() {
- return new OrderTask();
- }
+
+
@Bean
SalesOrderTask SalesOrderTask() {
return new SalesOrderTask();
@@ -90,16 +88,7 @@
List<MqTask> taskList = new ArrayList<>();
//注册RabbitMq任务
- taskList.add(new MqTask(MQ_EXCHANGE_A + evn, MQTaskRouting.SEND_TEMPLATE_MSG + evn,MQTaskRouting.SEND_TEMPLATE_MSG + evn, TemplateMsgTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_A + evn, MQTaskRouting.ORDER_OUT_SOTORE + evn,MQTaskRouting.ORDER_OUT_SOTORE + evn, OrderOutSotoreTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_A + evn, MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG + evn,MQTaskRouting.SEND_UNIFORM_TEMPLATE_MSG + evn, UniformMsgSentTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_A + evn, MQTaskRouting.SHOP_ORDER_REFUND + evn,MQTaskRouting.SHOP_ORDER_REFUND + evn, SalesOrderRefundTask()));
- //不同任务在不同的队列，但是routingKey一样则可以收到生产者消息
- taskList.add(new MqTask(MQ_EXCHANGE_TOPIC + evn, MQTaskRouting.CREATE_ORDER + evn,MQTaskRouting.CREATE_ORDER + evn,OrderrCreateTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_TOPIC + evn, MQTaskRouting.SALES_ORDER + evn,MQTaskRouting.CREATE_ORDER + evn,SalesOrderTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_TOPIC + evn, MQTaskRouting.SCORE_ORDER + evn,MQTaskRouting.CREATE_ORDER + evn,ScoreOrderTask()));
- taskList.add(new MqTask(MQ_EXCHANGE_TOPIC + evn, MQTaskRouting.DINGDING_NOTICE + evn,MQTaskRouting.CREATE_ORDER + evn, OrderDingDingNoticeTask()));
rabiitMqTemplate.binding(taskList);
@@ -110,3 +99,4 @@
}
+*/
--
Gitblit v1.9.1