From 2238632af10e6628f3a00fa9cc31ca17adcb7200 Mon Sep 17 00:00:00 2001 From: wangbiao Date: Mon, 3 Jun 2019 12:12:11 +0800 Subject: [PATCH] C_G --- pom.xml | 26 +++++++++++++------------- src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java | 13 ++++++++----- src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java | 2 ++ src/main/java/org/apache/rocketmq/spring/starter/core/DefaultRocketMQListenerContainerConstants.java | 2 ++ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 3457b0a..bc67d15 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.rocketmq spring-boot-starter-rocketmq - 1.0.6-SNAPSHOT + 1.0.8-SNAPSHOT Spring Boot Rocket Starter Starter for messaging using Apache RocketMQ @@ -103,18 +103,18 @@ - - - nexus_releases - core Release Repository - http://192.168.1.195:9999/nexus/content/repositories/releases/ - - - nexus_snapshots - core Snapshots Repository - http://192.168.1.195:9999/nexus/content/repositories/snapshots/ - - + + + nexus_releases + core Release Repository + http://maven.renniting.cn/nexus/content/repositories/releases/ + + + nexus_snapshots + core Snapshots Repository + http://maven.renniting.cn/nexus/content/repositories/snapshots/ + + diff --git a/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java b/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java index f21de49..e950fe0 100644 --- a/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java +++ b/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java @@ -76,8 +76,8 @@ import lombok.extern.slf4j.Slf4j; public class AliyunRocketMQAutoConfiguration { @Bean - @ConditionalOnClass(Producer.class) - @ConditionalOnMissingBean(Producer.class) + @ConditionalOnClass(RocketMQProperties.Producer.class) + @ConditionalOnMissingBean(RocketMQProperties.Producer.class) @ConditionalOnProperty(prefix = "spring.rocketmq", value = {"environmentPrefix", "producer.group"}) public Producer mqProducer(RocketMQProperties rocketMQProperties) { @@ -88,7 +88,8 @@ public class AliyunRocketMQAutoConfiguration { Assert.hasText(accessKey, "[spring.rocketmq.accessKey] must not be null"); String secretKey = rocketMQProperties.getSecretKey(); Assert.hasText(secretKey, "[spring.rocketmq.secretKey] must not be null"); - String onsAddr = rocketMQProperties.getOnsAddr(); + // String onsAddr = rocketMQProperties.getOnsAddr(); + String namesrvAdder = rocketMQProperties.getNamesrvAdder(); Assert.hasText(secretKey, "[spring.rocketmq.onsAddr] must not be null"); String environmentPrefix = rocketMQProperties.getEnvironmentPrefix(); Assert.hasText(secretKey, "[spring.rocketmq.environmentPrefix] must not be null"); @@ -100,7 +101,8 @@ public class AliyunRocketMQAutoConfiguration { producerProperties.setProperty(PropertyKeyConst.ProducerId, pid); producerProperties.setProperty(PropertyKeyConst.AccessKey, accessKey); producerProperties.setProperty(PropertyKeyConst.SecretKey, secretKey); - producerProperties.setProperty(PropertyKeyConst.ONSAddr, onsAddr); + producerProperties.setProperty(PropertyKeyConst.NAMESRV_ADDR, namesrvAdder); + //producerProperties.setProperty(PropertyKeyConst.ONSAddr, onsAddr); Producer producer = ONSFactory.createProducer(producerProperties); return producer; } @@ -182,7 +184,8 @@ public class AliyunRocketMQAutoConfiguration { RocketMQListener rocketMQListener = (RocketMQListener) bean; RocketMQMessageListener annotation = clazz.getAnnotation(RocketMQMessageListener.class); BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.rootBeanDefinition(AliyunRocketMQListenerContainer.class); - beanBuilder.addPropertyValue(PROP_ONS_Addr, rocketMQProperties.getOnsAddr()); + beanBuilder.addPropertyValue(PROP_NAMESRV_Addr, rocketMQProperties.getNamesrvAdder()); + // beanBuilder.addPropertyValue(PROP_ONS_Addr, rocketMQProperties.getOnsAddr()); String topic = rocketMQProperties.getEnvironmentPrefix()+"_"+environment.resolvePlaceholders(annotation.topic()); log.info(uuid+"订阅的主题topic:"+topic); beanBuilder.addPropertyValue(PROP_TOPIC, topic); diff --git a/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java b/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java index c422df1..1b1c5bc 100644 --- a/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java +++ b/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java @@ -33,6 +33,8 @@ public class RocketMQProperties { */ private String onsAddr; + private String namesrvAdder; + /** * AccessKey, 用于标识、校验用户身份 */ diff --git a/src/main/java/org/apache/rocketmq/spring/starter/core/DefaultRocketMQListenerContainerConstants.java b/src/main/java/org/apache/rocketmq/spring/starter/core/DefaultRocketMQListenerContainerConstants.java index 209630d..12a069a 100644 --- a/src/main/java/org/apache/rocketmq/spring/starter/core/DefaultRocketMQListenerContainerConstants.java +++ b/src/main/java/org/apache/rocketmq/spring/starter/core/DefaultRocketMQListenerContainerConstants.java @@ -34,6 +34,8 @@ public final class DefaultRocketMQListenerContainerConstants { public static final String METHOD_DESTROY = "destroy"; public static final String PROP_ROCKETMQ_TEMPLATE = "rocketMQTemplate"; public static final String PROP_ONS_Addr = "onsAddr"; + + public static final String PROP_NAMESRV_Addr = "namesrvAdder"; public static final String PROP_ACCESS_KEY = "accessKey"; public static final String PROP_SECRET_KEY = "secretKey"; /** -- libgit2 0.21.4