命名规范化

common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

config-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

logger-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-bigdata</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-bigdata/matrix-bigdata-spark-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-bigdata</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-bigdata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-bus/matrix-bus-canal-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-bus</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-bus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-client/matrix-client-openfeign-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-client</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datahelper/matrix-datahelper-redis-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datahelper</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datahelper/matrix-datahelper-redis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datahelper</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datahelper/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datahelper-redis-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

matrix-datasource/matrix-datasource-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datasource</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/matrix-datasource-druid/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datasource</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>

matrix-gracefulshutdown/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/autoconfigure/MatrixGracefulShutDownAutoConfiguration.java

 package com.secoo.mall.gracefulshutdown.autoconfigure;
 
-import com.secoo.mall.common.core.service.UpDatas;
-import com.secoo.mall.common.util.string.StringUtil;
+import com.secoo.mall.gracefulshutdown.component.service.UpDatas;
 import com.secoo.mall.gracefulshutdown.component.ShutDownDataReportAsyncHttp;
 import com.secoo.mall.gracefulshutdown.monitor.config.ConfigCenter;
-import com.secoo.mall.gracefulshutdown.monitor.dubbo.exception.ConfigurationException;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.ProviderService;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.RegistryServerSync;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.impl.ProviderServiceImpl;
 import com.secoo.mall.gracefulshutdown.monitor.utils.Tool;
 import com.secoo.mall.gracefulshutdown.component.GracefulShutDown;
-import com.secoo.mall.gracefulshutdown.component.ShutDownDataReport;
 import com.secoo.mall.gracefulshutdown.component.TomcatGracefulShutDown;
 import com.secoo.mall.gracefulshutdown.component.hook.DubboCustomerShutDownHook;
 import com.secoo.mall.gracefulshutdown.component.hook.TomcatShutDownHook;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.extension.ExtensionLoader;
 import org.apache.dubbo.registry.Registry;
@@ -67,11 +63,11 @@ public class MatrixGracefulShutDownAutoConfiguration {
     @Bean
     @ConditionalOnClass({ProviderService.class,RegistryServerSync.class})
     @ConditionalOnExpression("!T(org.springframework.util.StringUtils).isEmpty('${dubbo.registry.address:}')")
-    DubboCustomerShutDownHook createDubboConsumerDownHock(ProviderService providerService, RegistryServerSync registryServerSync) {
-        DubboCustomerShutDownHook hock= new DubboCustomerShutDownHook(providerService);
-        registryServerSync.addObserver(hock);
-        hock.setRegistryServerSync(registryServerSync);
-        return  hock;
+    DubboCustomerShutDownHook createDubboConsumerDownHook(ProviderService providerService, RegistryServerSync registryServerSync) {
+        DubboCustomerShutDownHook hook= new DubboCustomerShutDownHook(providerService);
+        registryServerSync.addObserver(hook);
+        hook.setRegistryServerSync(registryServerSync);
+        return  hook;
     }
 
     @Bean
@@ -97,7 +93,7 @@ public class MatrixGracefulShutDownAutoConfiguration {
     @Bean
     @ConditionalOnClass({TomcatGracefulShutDown.class,org.apache.catalina.connector.Connector.class})
     @TomcatGracefulShutDownJudgmentInterface()
-    TomcatShutDownHook createServletConnectShoutDownHock() {
+    TomcatShutDownHook createServletConnectShoutDownHook() {
         return new TomcatShutDownHook();
     }
 

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/AbstractShutDown.java

 package com.secoo.mall.gracefulshutdown.component;
 
-import com.secoo.mall.common.core.service.StopService;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
+import com.secoo.mall.gracefulshutdown.component.service.StopService;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetail;
 
 public abstract  class AbstractShutDown implements StopService<ExecutorDetail>,Comparable  {
     //定义执行顺序

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/GracefulShutDown.java

 package com.secoo.mall.gracefulshutdown.component;
 
 import com.alibaba.fastjson.JSON;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetails;
-import com.secoo.mall.common.core.service.StopService;
-import com.secoo.mall.common.core.service.UpDatas;
 import com.secoo.mall.common.util.date.DateUtil;
 import com.secoo.mall.common.util.log.LoggerUtil;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetail;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetails;
+import com.secoo.mall.gracefulshutdown.component.service.StopService;
+import com.secoo.mall.gracefulshutdown.component.service.UpDatas;
 import com.secoo.mall.gracefulshutdown.monitor.utils.Tool;
-import com.secoo.mall.gracefulshutdown.component.hook.TomcatShutDownHook;
 import org.apache.dubbo.common.utils.NetUtils;
 import org.apache.dubbo.config.DubboShutdownHook;
 import org.apache.dubbo.config.spring.extension.SpringExtensionFactory;
@@ -43,7 +42,7 @@ public class GracefulShutDown implements CommandLineRunner, ApplicationListener<
     @Override
     public void run(String... args) throws Exception {
         if (DubboShutdownHook.getDubboShutdownHook() != null) {
-            //hock卸载
+            //hook卸载
             DubboShutdownHook.getDubboShutdownHook().unregister();
             //listener 卸载
             ApplicationEventMulticaster multicaster = context.getBean(APPLICATION_EVENT_MULTICASTER_BEAN_NAME, ApplicationEventMulticaster.class);

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/ShutDownDataReport.java

 package com.secoo.mall.gracefulshutdown.component;
 
 import com.alibaba.fastjson.JSON;
-import com.secoo.mall.common.core.service.UpDatas;
+import com.secoo.mall.gracefulshutdown.component.service.UpDatas;
 import com.secoo.mall.common.util.log.LoggerUtil;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetails;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetails;
 import com.secoo.mall.common.util.string.StringUtil;
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.extension.ExtensionLoader;

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/ShutDownDataReportAsyncHttp.java

 package com.secoo.mall.gracefulshutdown.component;
 
 import com.alibaba.fastjson.JSON;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetails;
-import com.secoo.mall.common.core.service.UpDatas;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetails;
+import com.secoo.mall.gracefulshutdown.component.service.UpDatas;
 import com.secoo.mall.common.util.http.HttpClientUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;

common-core/src/main/java/com/secoo/mall/common/core/bean/gracefulshowtdownBean/AbstractTransportData.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/bean/gracefulshowtdownBean/AbstractTransportData.java

-package com.secoo.mall.common.core.bean.gracefulshowtdownBean;
+package com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean;
 
 public class AbstractTransportData<T> {
     T t;

common-core/src/main/java/com/secoo/mall/common/core/bean/gracefulshowtdownBean/ExecutorDetail.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/bean/gracefulshowtdownBean/ExecutorDetail.java

-package com.secoo.mall.common.core.bean.gracefulshowtdownBean;
+package com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean;
 
 import java.util.List;
 

common-core/src/main/java/com/secoo/mall/common/core/bean/gracefulshowtdownBean/ExecutorDetails.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/bean/gracefulshowtdownBean/ExecutorDetails.java

-package com.secoo.mall.common.core.bean.gracefulshowtdownBean;
+package com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean;
 
 import java.util.List;
 

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/hook/DubboCustomerShutDownHook.java

 package com.secoo.mall.gracefulshutdown.component.hook;
 
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
 import com.secoo.mall.common.util.date.DateUtil;
 import com.secoo.mall.common.util.log.LoggerUtil;
 import com.secoo.mall.common.util.string.StringUtil;
-import com.secoo.mall.gracefulshutdown.monitor.dubbo.Constants.Constants;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetail;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.ProviderService;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.RegistryServerSync;
 import com.secoo.mall.gracefulshutdown.monitor.utils.Stack;
@@ -56,7 +55,7 @@ public class DubboCustomerShutDownHook extends AbstractShutDown implements Obser
     public ExecutorDetail stop() {
         ExecutorDetail detail = new ExecutorDetail();
         detail.setBeginTime(DateUtil.getDateTime());
-        detail.setServiceName("dubboDownHock");
+        detail.setServiceName("dubboDownhook25");
         List<String> str = new ArrayList<String>();
         detail.setDetail(str);
         detail.setCode(0);
@@ -146,8 +145,8 @@ public class DubboCustomerShutDownHook extends AbstractShutDown implements Obser
                 if (protocol != null) {
                     protocol.destroy();
                 }
-            } catch (Throwable t) {
-                LoggerUtil.info(t.getMessage());
+            } catch (Exception t) {
+                LoggerUtil.info(Stack.errInfo(t));
             }
         }
     }

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/hook/TomcatShutDownHook.java

@@ -2,8 +2,9 @@ package com.secoo.mall.gracefulshutdown.component.hook;
 
 import com.secoo.mall.common.util.date.DateUtil;
 import com.secoo.mall.common.util.string.StringUtil;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetail;
+import com.secoo.mall.gracefulshutdown.component.bean.gracefulshowtdownBean.ExecutorDetail;
 import com.secoo.mall.gracefulshutdown.component.AbstractShutDown;
+import com.secoo.mall.gracefulshutdown.monitor.utils.Stack;
 import org.apache.catalina.connector.Connector;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,7 +28,7 @@ public class TomcatShutDownHook extends AbstractShutDown {
     public ExecutorDetail stop() {
         ExecutorDetail detail = new ExecutorDetail();
         detail.setBeginTime(DateUtil.getDateTime());
-        detail.setServiceName("ServletConnectShoutDownHock1");
+        detail.setServiceName("ServletConnectShoutDownHook1");
         List<String> str = new ArrayList<String>();
         detail.setDetail(str);
         detail.setCode(0);
@@ -55,7 +56,7 @@ public class TomcatShutDownHook extends AbstractShutDown {
                 } catch (InterruptedException ex) {
                     Thread.currentThread().interrupt();
                     detail.setCode(-1);
-                    str.add("error:" + ex.getMessage() + StringUtil.line());
+                    str.add("error:" + Stack.errInfo(ex) + StringUtil.line());
                 }
             }else{
                 str.add("ThreadPoolExecutor is null");

common-core/src/main/java/com/secoo/mall/common/core/service/StopService.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/service/StopService.java

-package com.secoo.mall.common.core.service;
+package com.secoo.mall.gracefulshutdown.component.service;
 
 public interface StopService <T>{
 

common-core/src/main/java/com/secoo/mall/common/core/service/UpDatas.java → matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/component/service/UpDatas.java

-package com.secoo.mall.common.core.service;
+package com.secoo.mall.gracefulshutdown.component.service;
 
 public interface UpDatas<T> {
     public boolean upData(T t) throws Exception;

matrix-gracefulshutdown/src/main/java/com/secoo/mall/gracefulshutdown/monitor/utils/CoderUtil.java

@@ -17,6 +17,7 @@
 
 package com.secoo.mall.gracefulshutdown.monitor.utils;
 
+import com.secoo.mall.common.util.log.LoggerUtil;
 import org.apache.dubbo.common.io.Bytes;
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
@@ -33,8 +34,8 @@ public class CoderUtil {
     static {
         try {
             md = MessageDigest.getInstance("MD5");
-        } catch (NoSuchAlgorithmException e) {
-            logger.error(e.getMessage(), e);
+        } catch (Exception e) {
+            LoggerUtil.info(Stack.errInfo(e));
         }
     }
 

matrix-job/matrix-job-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-job</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-job/matrix-job-xxl-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-job</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-job/matrix-job-xxl-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-job</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,12 +21,12 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo</groupId>

matrix-mq/matrix-mq-rocketmq-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mq/matrix-mq-rocketmq-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mq/matrix-mq-rocketmq-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mq/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.rocketmq</groupId>

matrix-mybatis/matrix-mybatis-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mybatis</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/matrix-mybatis-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mybatis</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,17 +25,17 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>

matrix-protocol/matrix-protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-dubbo-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-dubbo-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-web-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/matrix-protocol-web-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-protocol</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-protocol/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,27 +29,27 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
 
             <!-- Aapche Dubbo  -->

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-        <version>2.0.17.RELEASE</version>
+        <version>2.0.18-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -54,119 +54,119 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>logger-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-client</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <!--rocketmq-starter废弃，启用matrix-mq-rocketmq-starter-->
 
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-bigdata-hbase-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <!--redis-->
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datahelper-redis-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datahelper-redis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-client-openfeign-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
 
             <!-- bus -->
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-bus-canal-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18-SNAPSHOT</version>
             </dependency>
             <!--普通jar-->