From 980a9569a3786556d9ea4fc5b22fa60e63ecc7bb Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 19 Jun 2026 19:18:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mq):=20=E6=8F=90=E5=8F=96=20ArtemisBea?= =?UTF-8?q?nNames=20=E5=B8=B8=E9=87=8F=E7=B1=BB=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=20Bean=20=E5=90=8D=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=AD=97?= =?UTF-8?q?=E9=9D=A2=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 common-artemis 模块引用的 JMS Bean 名（jmsTemplate / topicJmsTemplate / topicListenerFactory）集中到新建的 ArtemisBeanNames 接口，替换 ArtemisCommonAutoConfiguration、ArtemisTemplateService 及消费端 （DemoTopicConsumer、CacheInvalidationConsumer）中的字符串字面量。 同时清理遗留的对账单模板.xlsx（对账模块已删除）。 --- .../demo/consumer/DemoTopicConsumer.java | 5 +++-- .../main/resources/template/对账单模板.xlsx | Bin 11090 -> 0 bytes .../consumer/CacheInvalidationConsumer.java | 3 ++- .../common/artemis/ArtemisBeanNames.java | 21 ++++++++++++++++++ .../ArtemisCommonAutoConfiguration.java | 14 ++++-------- .../service/ArtemisTemplateService.java | 5 +++-- 6 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 daxpay-payment/daxpay-payment-common/src/main/resources/template/对账单模板.xlsx create mode 100644 daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/org/dromara/daxpay/platform/common/artemis/ArtemisBeanNames.java diff --git a/daxpay-payment/daxpay-payment-admin/src/main/java/org/dromara/daxpay/payment/admin/controller/demo/consumer/DemoTopicConsumer.java b/daxpay-payment/daxpay-payment-admin/src/main/java/org/dromara/daxpay/payment/admin/controller/demo/consumer/DemoTopicConsumer.java index b929f73da..6cea13a13 100644 --- a/daxpay-payment/daxpay-payment-admin/src/main/java/org/dromara/daxpay/payment/admin/controller/demo/consumer/DemoTopicConsumer.java +++ b/daxpay-payment/daxpay-payment-admin/src/main/java/org/dromara/daxpay/payment/admin/controller/demo/consumer/DemoTopicConsumer.java @@ -6,6 +6,7 @@ import org.dromara.daxpay.payment.admin.controller.demo.constant.DemoArtemisCons import org.dromara.daxpay.payment.admin.controller.demo.message.DemoArtemisMessage; import org.dromara.daxpay.payment.admin.controller.demo.result.DemoMessageResult; import org.dromara.daxpay.payment.admin.controller.demo.store.DemoMessageStore; +import org.dromara.daxpay.platform.common.artemis.ArtemisBeanNames; import org.dromara.daxpay.platform.common.json.util.JacksonUtil; import org.springframework.jms.annotation.JmsListener; import org.springframework.stereotype.Component; @@ -25,13 +26,13 @@ public class DemoTopicConsumer { private final DemoMessageStore store; /// 订阅者 A - @JmsListener(destination = DemoArtemisConstants.TOPIC, containerFactory = "topicListenerFactory") + @JmsListener(destination = DemoArtemisConstants.TOPIC, containerFactory = ArtemisBeanNames.TOPIC_LISTENER_FACTORY) public void onMessageA(String json) { handle(json, "demo-topic-consumer-A"); } /// 订阅者 B（同节点模拟多订阅者） - @JmsListener(destination = DemoArtemisConstants.TOPIC, containerFactory = "topicListenerFactory") + @JmsListener(destination = DemoArtemisConstants.TOPIC, containerFactory = ArtemisBeanNames.TOPIC_LISTENER_FACTORY) public void onMessageB(String json) { handle(json, "demo-topic-consumer-B"); } diff --git a/daxpay-payment/daxpay-payment-common/src/main/resources/template/对账单模板.xlsx b/daxpay-payment/daxpay-payment-common/src/main/resources/template/对账单模板.xlsx deleted file mode 100644 index 1690d0d6cfee6fea89caa4661076339580e0df89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11090 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 I topicListenerFactory(ConnectionFactory connectionFactory) { DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory(); factory.setConnectionFactory(connectionFactory); diff --git a/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/org/dromara/daxpay/platform/common/artemis/service/ArtemisTemplateService.java b/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/org/dromara/daxpay/platform/common/artemis/service/ArtemisTemplateService.java index eb484dc41..98ecfb778 100644 --- a/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/org/dromara/daxpay/platform/common/artemis/service/ArtemisTemplateService.java +++ b/daxpay-platform/daxpay-platform-common/common-artemis/src/main/java/org/dromara/daxpay/platform/common/artemis/service/ArtemisTemplateService.java @@ -1,5 +1,6 @@ package org.dromara.daxpay.platform.common.artemis.service; +import org.dromara.daxpay.platform.common.artemis.ArtemisBeanNames; import org.dromara.daxpay.platform.common.artemis.ArtemisCommonAutoConfiguration; import org.dromara.daxpay.platform.common.artemis.exception.ArtemisException; import cn.hutool.core.lang.UUID; @@ -52,8 +53,8 @@ public class ArtemisTemplateService { /// Topic 模板（pubSubDomain=true），见 [ArtemisCommonAutoConfiguration#topicJmsTemplate] private final JmsTemplate topicJmsTemplate; - public ArtemisTemplateService(@Qualifier("jmsTemplate") JmsTemplate queueJmsTemplate, - @Qualifier(ArtemisCommonAutoConfiguration.TOPIC_JMS_TEMPLATE) JmsTemplate topicJmsTemplate) { + public ArtemisTemplateService(@Qualifier(ArtemisBeanNames.QUEUE_JMS_TEMPLATE) JmsTemplate queueJmsTemplate, + @Qualifier(ArtemisBeanNames.TOPIC_JMS_TEMPLATE) JmsTemplate topicJmsTemplate) { this.queueJmsTemplate = queueJmsTemplate; this.topicJmsTemplate = topicJmsTemplate; }