diff --git a/pom.xml b/pom.xml
index bc67d15..6ce8363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
com.aliyun.openservices
ons-client
- 1.7.1.Final
+ 1.8.0.Final
org.springframework
@@ -107,12 +107,12 @@
nexus_releases
core Release Repository
- http://maven.renniting.cn/nexus/content/repositories/releases/
+ http://maven.renniting.cn/repository/maven-releases/
nexus_snapshots
core Snapshots Repository
- http://maven.renniting.cn/nexus/content/repositories/snapshots/
+ http://maven.renniting.cn/repository/maven-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 e950fe0..2d65d3d 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/AliyunRocketMQAutoConfiguration.java
@@ -37,10 +37,12 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.Resource;
+import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON;
import org.apache.rocketmq.spring.starter.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.starter.core.AliyunRocketMQListenerContainer;
import org.apache.rocketmq.spring.starter.core.RocketMQListener;
import org.apache.rocketmq.spring.starter.core.RocketMQTemplate;
+import org.json.JSONObject;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
@@ -88,8 +90,7 @@ 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 namesrvAdder = rocketMQProperties.getNamesrvAdder();
+ String onsAddr = rocketMQProperties.getOnsAddr();
Assert.hasText(secretKey, "[spring.rocketmq.onsAddr] must not be null");
String environmentPrefix = rocketMQProperties.getEnvironmentPrefix();
Assert.hasText(secretKey, "[spring.rocketmq.environmentPrefix] must not be null");
@@ -101,9 +102,11 @@ public class AliyunRocketMQAutoConfiguration {
producerProperties.setProperty(PropertyKeyConst.ProducerId, pid);
producerProperties.setProperty(PropertyKeyConst.AccessKey, accessKey);
producerProperties.setProperty(PropertyKeyConst.SecretKey, secretKey);
- producerProperties.setProperty(PropertyKeyConst.NAMESRV_ADDR, namesrvAdder);
+ producerProperties.setProperty(PropertyKeyConst.NAMESRV_ADDR, onsAddr);
+ log.info("注册生产者producerProperties:"+ JSON.toJSONString(producerProperties));
//producerProperties.setProperty(PropertyKeyConst.ONSAddr, onsAddr);
Producer producer = ONSFactory.createProducer(producerProperties);
+ log.info("注册生产者完成:"+ JSON.toJSONString(producer));
return producer;
}
@@ -176,6 +179,8 @@ public class AliyunRocketMQAutoConfiguration {
private void registerContainer(String beanName, Object bean) {
String uuid = UUID.randomUUID().toString();
log.info(uuid+"开始注册消费者,beanName:"+beanName);
+ log.info(uuid+"开始注册消费者,rocketMQProperties:"+JSON.toJSONString(rocketMQProperties));
+
Class> clazz = AopUtils.getTargetClass(bean);
if (!RocketMQListener.class.isAssignableFrom(bean.getClass())) {
@@ -184,8 +189,8 @@ public class AliyunRocketMQAutoConfiguration {
RocketMQListener rocketMQListener = (RocketMQListener) bean;
RocketMQMessageListener annotation = clazz.getAnnotation(RocketMQMessageListener.class);
BeanDefinitionBuilder beanBuilder = BeanDefinitionBuilder.rootBeanDefinition(AliyunRocketMQListenerContainer.class);
- beanBuilder.addPropertyValue(PROP_NAMESRV_Addr, rocketMQProperties.getNamesrvAdder());
- // beanBuilder.addPropertyValue(PROP_ONS_Addr, rocketMQProperties.getOnsAddr());
+ // beanBuilder.addPropertyValue(PropertyKeyConst.NAMESRV_ADDR, rocketMQProperties.getOnsAddr());
+ beanBuilder.addPropertyValue(PROP_NAMESRV_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 1b1c5bc..c422df1 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/RocketMQProperties.java
@@ -33,8 +33,6 @@ public class RocketMQProperties {
*/
private String onsAddr;
- private String namesrvAdder;
-
/**
* AccessKey, 用于标识、校验用户身份
*/
diff --git a/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java b/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
index a53d826..b379593 100644
--- a/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
+++ b/src/main/java/org/apache/rocketmq/spring/starter/core/AliyunRocketMQListenerContainer.java
@@ -86,6 +86,10 @@ public class AliyunRocketMQListenerContainer implements InitializingBean, Rocket
@Setter
@Getter
+ private String nameServerAddr;
+
+ @Setter
+ @Getter
private String topic;
@Setter
@@ -392,14 +396,14 @@ public class AliyunRocketMQListenerContainer implements InitializingBean, Rocket
Assert.notNull(rocketMQListener, "Property 'rocketMQListener' is required");
Assert.notNull(consumerGroup, "Property 'consumerGroup' is required");
- Assert.notNull(onsAddr, "Property 'nameServer' is required");
+ Assert.notNull(nameServerAddr, "Property 'nameServer' is required");
Assert.notNull(topic, "Property 'topic' is required");
Properties consumerProperties = new Properties();
consumerProperties.setProperty(PropertyKeyConst.ConsumerId, consumerGroup);
consumerProperties.setProperty(PropertyKeyConst.AccessKey, accessKey);
consumerProperties.setProperty(PropertyKeyConst.SecretKey, secretKey);
- consumerProperties.setProperty(PropertyKeyConst.ONSAddr, onsAddr);
+ consumerProperties.setProperty(PropertyKeyConst.NAMESRV_ADDR, nameServerAddr);
consumerProperties.setProperty(PropertyKeyConst.ConsumeThreadNums, consumeThreadMax+"");
consumerProperties.setProperty(PropertyKeyConst.MessageModel, messageModel.getModeCN());
//允许用户自己设置该consumer的一些配置
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 12a069a..777b951 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,10 +34,9 @@ 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";
+ public static final String PROP_NAMESRV_ADDR = "nameServerAddr";
/**
* 环境前缀
*/