From 564613d50e50e13dc188d1d03e3875e7fa0745a9 Mon Sep 17 00:00:00 2001 From: dingzhiwei Date: Thu, 16 Dec 2021 22:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=98=BF=E9=87=8C=E4=BA=91ro?= =?UTF-8?q?cketMQ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/devCommons/config/application.yml | 12 ++++++------ conf/manager/application.yml | 12 +++++------- conf/merchant/application.yml | 12 +++++------- conf/payment/application.yml | 12 +++++------- jeepay-components/jeepay-components-mq/pom.xml | 1 - .../AbstractAliYunRocketMQReceiver.java | 2 +- .../aliyunrocketmq/AliYunRocketMQFactory.java | 14 +++++--------- 7 files changed, 27 insertions(+), 38 deletions(-) diff --git a/conf/devCommons/config/application.yml b/conf/devCommons/config/application.yml index c68b63c..aa24517 100644 --- a/conf/devCommons/config/application.yml +++ b/conf/devCommons/config/application.yml @@ -76,12 +76,12 @@ spring: # producer: # group: JEEPAY-GROUP -## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！ ) +## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！需要阿里云开通rocketMQ产品，创建Group和Topic ) #aliyun-rocketmq: -# namesrvAddr: 127.0.0.1:9876 -# accessKey: accessKey -# secretKey: secretKey -# producerId: JEEPAY-GROUP +# namesrvAddr: xxx +# accessKey: xxx +# secretKey: xxx +# groupId: GID_JEEPAY_T #日志配置参数。 # 当存在logback-spring.xml文件时： 该配置将引进到logback配置， springboot配置不生效。 @@ -98,7 +98,7 @@ isys: allow-cors: true #是否内存缓存配置信息: true表示开启如支付网关地址/商户应用配置/服务商配置等， 开启后需检查MQ的广播模式是否正常； false表示直接查询DB. - cache-config: false + cache-config: true oss: file-root-path: /home/jeepay/upload #存储根路径 ( 无需以‘/’结尾 ) diff --git a/conf/manager/application.yml b/conf/manager/application.yml index bd39459..ebc9aed 100644 --- a/conf/manager/application.yml +++ b/conf/manager/application.yml @@ -86,14 +86,12 @@ spring: # producer: # group: JEEPAY-GROUP -## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！ ) +## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！需要阿里云开通rocketMQ产品，创建Group和Topic ) #aliyun-rocketmq: -# namesrvAddr: 127.0.0.1:9876 -# accessKey: accessKey -# secretKey: secretKey -# consumerId: JEEPAY-GROUP-MGR -# broadcastConsumerId: JEEPAY-GROUP-MGR-BROADCAST # 广播模式消费者ID -# producerId: JEEPAY-GROUP +# namesrvAddr: xxx +# accessKey: xxx +# secretKey: xxx +# groupId: GID_JEEPAY_T #日志配置参数。 # 当存在logback-spring.xml文件时： 该配置将引进到logback配置， springboot配置不生效。 diff --git a/conf/merchant/application.yml b/conf/merchant/application.yml index fb773b3..2b3f0ec 100644 --- a/conf/merchant/application.yml +++ b/conf/merchant/application.yml @@ -86,14 +86,12 @@ spring: # producer: # group: JEEPAY-GROUP -## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！ ) +## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！需要阿里云开通rocketMQ产品，创建Group和Topic ) #aliyun-rocketmq: -# namesrvAddr: 127.0.0.1:9876 -# accessKey: accessKey -# secretKey: secretKey -# consumerId: JEEPAY-GROUP-MCH -# broadcastConsumerId: JEEPAY-GROUP-MCH-BROADCAST # 广播模式消费者ID -# producerId: JEEPAY-GROUP +# namesrvAddr: xxx +# accessKey: xxx +# secretKey: xxx +# groupId: GID_JEEPAY_T #日志配置参数。 # 当存在logback-spring.xml文件时： 该配置将引进到logback配置， springboot配置不生效。 diff --git a/conf/payment/application.yml b/conf/payment/application.yml index 4f2bc8e..1e98bab 100644 --- a/conf/payment/application.yml +++ b/conf/payment/application.yml @@ -86,14 +86,12 @@ spring: # producer: # group: JEEPAY-GROUP -## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！ ) +## 阿里云rocketmq配置 ( 注意：aliyun-rocketmq配置项请放置到根目录， 不是spring的二级配置！需要阿里云开通rocketMQ产品，创建Group和Topic ) #aliyun-rocketmq: -# namesrvAddr: 127.0.0.1:9876 -# accessKey: accessKey -# secretKey: secretKey -# consumerId: JEEPAY-GROUP-PAY -# broadcastConsumerId: JEEPAY-GROUP-PAY-BROADCAST # 广播模式消费者ID -# producerId: JEEPAY-GROUP +# namesrvAddr: xxx +# accessKey: xxx +# secretKey: xxx +# groupId: GID_JEEPAY_T #日志配置参数。 diff --git a/jeepay-components/jeepay-components-mq/pom.xml b/jeepay-components/jeepay-components-mq/pom.xml index c8b53bd..b398f9b 100644 --- a/jeepay-components/jeepay-components-mq/pom.xml +++ b/jeepay-components/jeepay-components-mq/pom.xml @@ -51,7 +51,6 @@ - org.springframework.boot diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java index aaeff6c..6aa4554 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AbstractAliYunRocketMQReceiver.java @@ -48,7 +48,7 @@ public abstract class AbstractAliYunRocketMQReceiver implements IMQMsgReceiver, public Action consume(Message message, ConsumeContext context) { try { receiveMsg(new String(message.getBody())); - log.info("【{}】MQ消息消费成功topic:{}, messageId:{}", getConsumerName(), message.getTopic(), message.getMsgID()); + log.debug("【{}】MQ消息消费成功topic:{}, messageId:{}", getConsumerName(), message.getTopic(), message.getMsgID()); return Action.CommitMessage; } catch (Exception e) { log.error("【{}】MQ消息消费失败topic:{}, messageId:{}", getConsumerName(), message.getTopic(), message.getMsgID(), e); diff --git a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java index 0c15db5..cf5d4d9 100644 --- a/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java +++ b/jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/aliyunrocketmq/AliYunRocketMQFactory.java @@ -22,17 +22,13 @@ public class AliYunRocketMQFactory { private String accessKey; @Value("${aliyun-rocketmq.secretKey}") private String secretKey; - @Value("${aliyun-rocketmq.consumerId}") - private String consumerId; - @Value("${aliyun-rocketmq.broadcastConsumerId}") - private String broadcastConsumerId; - @Value("${aliyun-rocketmq.producerId}") - private String producerId; + @Value("${aliyun-rocketmq.groupId}") + private String groupId; @Bean(name = "producerClient") public Producer producerClient() { Properties properties = new Properties(); - properties.put(PropertyKeyConst.ProducerId, producerId); + properties.put(PropertyKeyConst.GROUP_ID, groupId); properties.put(PropertyKeyConst.AccessKey, accessKey); properties.put(PropertyKeyConst.SecretKey, secretKey); // 判断是否为空（生产环境走k8s集群环境变量自动注入，不获取本地配置文件的值） @@ -45,7 +41,7 @@ public class AliYunRocketMQFactory { @Bean(name = "consumerClient") public Consumer consumerClient() { Properties properties = new Properties(); - properties.put(PropertyKeyConst.ConsumerId, consumerId); + properties.put(PropertyKeyConst.GROUP_ID, groupId); properties.put(PropertyKeyConst.AccessKey, accessKey); properties.put(PropertyKeyConst.SecretKey, secretKey); // 判断是否为空（生产环境走k8s集群环境变量自动注入，不获取本地配置文件的值） @@ -58,7 +54,7 @@ public class AliYunRocketMQFactory { @Bean(name = "broadcastConsumerClient") public Consumer broadcastConsumerClient() { Properties properties = new Properties(); - properties.put(PropertyKeyConst.ConsumerId, broadcastConsumerId); + properties.put(PropertyKeyConst.GROUP_ID, groupId); properties.put(PropertyKeyConst.AccessKey, accessKey); properties.put(PropertyKeyConst.SecretKey, secretKey); // 广播订阅方式设置