Commit 0effdb2f authored by 吴问发's avatar 吴问发

跳版本

parent ebbd5c0a
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<groupId>com.qmai.basic</groupId> <groupId>com.qmai.basic</groupId>
<artifactId>java-basic</artifactId> <artifactId>java-basic</artifactId>
<version>2.2.5-RELEASE</version> <version>2.3.0-RELEASE</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<description>java基础组件项目</description> <description>java基础组件项目</description>
......
package com.qmai.basic.configcenter; package com.qmai.basic.configcenter;
import com.alibaba.fastjson.JSON;
import com.aliyun.openservices.ons.api.MessageListener; import com.aliyun.openservices.ons.api.MessageListener;
import com.aliyun.openservices.ons.api.PropertyKeyConst; import com.aliyun.openservices.ons.api.PropertyKeyConst;
import com.aliyun.openservices.ons.api.PropertyValueConst; import com.aliyun.openservices.ons.api.PropertyValueConst;
...@@ -9,6 +8,7 @@ import com.aliyun.openservices.ons.api.bean.Subscription; ...@@ -9,6 +8,7 @@ import com.aliyun.openservices.ons.api.bean.Subscription;
import com.qmai.basic.configcenter.enums.EnvEnum; import com.qmai.basic.configcenter.enums.EnvEnum;
import com.qmai.basic.configcenter.enums.MqConnInfoEnum; import com.qmai.basic.configcenter.enums.MqConnInfoEnum;
import com.qmai.basic.util.RocketMqConfigProperty; import com.qmai.basic.util.RocketMqConfigProperty;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -79,8 +79,8 @@ public class ConfigCenterConfig { ...@@ -79,8 +79,8 @@ public class ConfigCenterConfig {
} }
private Properties syncProperties() { private Properties syncProperties() {
if (rocketMqConfigProperty.getGid() != null) { if (StringUtils.isNotBlank(rocketMqConfigProperty.getGid())) {
logger.info("configCenterSdkConsumer:: init selfConfig {}", JSON.toJSON(rocketMqConfigProperty.getGid())); logger.info("configCenterSdkConsumer:: init selfConfig");
Properties properties = new Properties(); Properties properties = new Properties();
properties.setProperty(PropertyKeyConst.MessageModel, PropertyValueConst.BROADCASTING); properties.setProperty(PropertyKeyConst.MessageModel, PropertyValueConst.BROADCASTING);
properties.setProperty(PropertyKeyConst.NAMESRV_ADDR, rocketMqConfigProperty.getAddr()); properties.setProperty(PropertyKeyConst.NAMESRV_ADDR, rocketMqConfigProperty.getAddr());
...@@ -89,7 +89,7 @@ public class ConfigCenterConfig { ...@@ -89,7 +89,7 @@ public class ConfigCenterConfig {
properties.setProperty(PropertyKeyConst.GROUP_ID, rocketMqConfigProperty.getGid()); properties.setProperty(PropertyKeyConst.GROUP_ID, rocketMqConfigProperty.getGid());
return properties; return properties;
} }
logger.info("configCenterSdkConsumer:: init defaultConfig "); logger.info("configCenterSdkConsumer:: init defaultConfig");
EnvEnum envEnum = EnvEnum.getByType(env); EnvEnum envEnum = EnvEnum.getByType(env);
if (envEnum == null) { if (envEnum == null) {
logger.error("configCenterSdkConsumer:: init error env:{} invalid", env); logger.error("configCenterSdkConsumer:: init error env:{} invalid", env);
......
...@@ -35,7 +35,7 @@ public class ConfigCenterHelper { ...@@ -35,7 +35,7 @@ public class ConfigCenterHelper {
/** /**
* 配置中心SDK版本号 * 配置中心SDK版本号
*/ */
public final static String VERSION = "2.2.5-RELEASE"; public final static String VERSION = "2.3.0-RELEASE";
private final static String KEY_SPIT = "_##_"; private final static String KEY_SPIT = "_##_";
private final static String ERROR_NOT_CONFIG = "未正确配置config-center"; private final static String ERROR_NOT_CONFIG = "未正确配置config-center";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment