Merge branch 'master' into tech_datasource-security

# Conflicts:
#	common-core/src/main/java/com/secoo/mall/common/core/bean/BizResponse.java

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.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-core/src/main/java/com/secoo/mall/common/core/bean/BizResponse.java

@@ -44,4 +44,4 @@ public class BizResponse<T> extends Response<T> {
     public static <T> BizResponse<T> fail(Integer code, String msg, T data) {
         return new BizResponse<>(code, msg, data);
     }
-}
\ No newline at end of file
+}

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.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common-util/src/main/java/com/secoo/mall/common/util/string/StringUtil.java

@@ -78,7 +78,7 @@ public class StringUtil extends StringUtils {
     }
 
     public static String line(){
-        String lineSeparator = System.getProperty("line.separator", "\n");
+        String lineSeparator = System.getProperty("line.separator", String.valueOf(CharConstant.LF));
         return  lineSeparator;
     }
 
@@ -95,5 +95,9 @@ public class StringUtil extends StringUtils {
         System.out.println("toHyphen=="+toHyphen(str3,'-'));
 
         System.out.println(toSnakeCase("test-jdate", '-'));
+
+        System.out.println(line());
+
+        System.out.println("========");
     }
 }

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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/EncryptorFactory.java

@@ -13,6 +13,7 @@ import com.secoo.mall.datasource.constant.DataSourceConstant;
 import com.secoo.mall.datasource.errorcode.DataSourceError;
 import com.secoo.mall.datasource.util.SysUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
 
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -60,6 +61,9 @@ public class EncryptorFactory<T> {
      * @return
      */
     private String initPrivateKey() {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         String appId = configUtil.getAppId();
         if (StringUtil.isEmpty(appId)) {
             throw new BusinessException(DataSourceError.APP_ID_NOT_EXIST);
@@ -84,11 +88,14 @@ public class EncryptorFactory<T> {
                 return String.join("", strings);
             }
         } catch (Exception e) {
-            log.error("connetion server error", e);
+            log.error("", e);
         } finally {
             if (connection != null) {
                 connection.disconnect();
             }
+
+            stopWatch.stop();
+            log.info("init PrivateKey elapsed {}ms",stopWatch.getTime());
         }
 
         return null;
@@ -96,15 +103,21 @@ public class EncryptorFactory<T> {
 
     private void createEncryptor() {
         if (StringUtil.isNotEmpty(this.privateKey)) {
+            StopWatch stopWatch = new StopWatch();
+            stopWatch.start();
+
             MatrixUrlClassLoader.getInstance().loadByUrl(DataSourceConstant.SECURITY_FILE_JAR_PATH);
             String[] args = this.privateKey.split(DataSourceConstant.ENCRY_FLAG);
             encryptor = MatrixUrlClassLoader.getInstance().loadClassByFullName("com.secoo.mall.app.security.encryptor.StringEncryptor", Encryptor.class, new Class[]{String.class, String.class}, args);
+
+            stopWatch.stop();
+            log.info("create Encryptor elapsed {}ms",stopWatch.getTime());
         }
         /**
          * 如果无法从远程创建解密对象，则进行降级处理
          */
         if (Objects.isNull(encryptor)) {
-            log.warn("load remote encryptor fail.use default encryptor");
+            log.warn("load remote encryptor fail, use default encryptor");
             encryptor = new Encryptor<T>() {
                 @Override
                 public T encrypt(T value) {

matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/provider/ApolloDataSourceProvider.java

@@ -14,6 +14,7 @@ import com.secoo.mall.datasource.properties.MatrixDataSourceProperties;
 import com.secoo.mall.datasource.util.SysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.reflect.MethodUtils;
+import org.apache.commons.lang3.time.StopWatch;
 
 import javax.sql.DataSource;
 import java.lang.reflect.Field;
@@ -34,9 +35,14 @@ public class ApolloDataSourceProvider<T extends MatrixDataSourceConfig> extends
     @Override
     protected List<T> getDataSourceProperties() {
         log.info("load config from apollo...");
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+
         Config appConfig = ConfigService.getConfig(DataSourceConstant.DB_NAMESPACE);
         Set<String> propertyNames = appConfig.getPropertyNames();
-        List<T> list = Lists.newArrayList();
+
+        stopWatch.stop();
+        log.info("load config from apollo elapsed {}ms",stopWatch.getTime());
 
 
         Map<String, DataSource> dataSourceMap = new HashMap<>();
@@ -50,6 +56,7 @@ public class ApolloDataSourceProvider<T extends MatrixDataSourceConfig> extends
         Map<String, Class> fieldMap = FieldUtil.getAllFieldsList(getEntryClass()).stream().collect(Collectors.toMap(Field::getName, Field::getType, (key1, key2) -> key1));
         Set<String> notSupportPropertySet = new HashSet<>();
 
+        List<T> list = Lists.newArrayList();
         try {
             for (Map.Entry<String, List<String>> entry : dsPpropertyMap.entrySet()) {
                 String dsName = entry.getKey();

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.RELEASE</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.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</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.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;

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.model.ExecutorDetail;
 
 public abstract  class AbstractShutDown implements StopService<ExecutorDetail>,Comparable  {
     //定义执行顺序

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

@@ -2,9 +2,7 @@ package com.secoo.mall.gracefulshutdown.component;
 
 public class ConfigConstant {
 
-   // public static String EXWARN="http://172.17.76.196:6080/gracefulshutdown/gracefulSave";
-  // public static String EXWARN="http://test-exwarn.secoo.com/gracefulshutdown/gracefulSave";
-   public static String EXWARN="http://exwarn.secoo.com/gracefulshutdown/gracefulSave";
+    public static String EXWARN_URL ="http://exwarn.secoo.com/gracefulshutdown/gracefulSave";
 
     public static final int CONNECT_TIMEOUT = 1000;//连接超时时间
     public static final int SOCKET_TIMEOUT = 5000;//等待数据超时时间

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.gracefulshutdown.component.model.ExecutorDetail;
+import com.secoo.mall.gracefulshutdown.component.model.ExecutorDetails;
 import com.secoo.mall.common.util.date.DateUtil;
 import com.secoo.mall.common.util.log.LoggerUtil;
 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;

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.common.util.log.LoggerUtil;
-import com.secoo.mall.common.core.bean.gracefulshowtdownBean.ExecutorDetails;
+import com.secoo.mall.gracefulshutdown.component.model.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.model.ExecutorDetails;
 import com.secoo.mall.common.util.http.HttpClientUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -22,7 +21,7 @@ public class ShutDownDataReportAsyncHttp implements UpDatas<ExecutorDetails> {
 
         try {
             String result=JSON.toJSONString(obj);
-            HttpPost httpPost = new HttpPost(ConfigConstant.EXWARN);
+            HttpPost httpPost = new HttpPost(ConfigConstant.EXWARN_URL);
             List<NameValuePair> nvps = new ArrayList<NameValuePair>();
             nvps.add(new BasicNameValuePair("gracefulresult", result));
             HttpClientUtils.setHttpParam(ConfigConstant.CONNECT_TIMEOUT,ConfigConstant.SOCKET_TIMEOUT,ConfigConstant.REQUEST_TIMEOUT);

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

-package com.secoo.mall.common.core.service;
+package com.secoo.mall.gracefulshutdown.component;
 
 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/UpDatas.java

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

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.gracefulshutdown.component.model.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.monitor.dubbo.service.ProviderService;
 import com.secoo.mall.gracefulshutdown.monitor.dubbo.service.RegistryServerSync;
 import com.secoo.mall.gracefulshutdown.monitor.utils.Stack;

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

@@ -2,7 +2,7 @@ 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.model.ExecutorDetail;
 import com.secoo.mall.gracefulshutdown.component.AbstractShutDown;
 import org.apache.catalina.connector.Connector;
 import java.util.ArrayList;

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

-package com.secoo.mall.common.core.bean.gracefulshowtdownBean;
+package com.secoo.mall.gracefulshutdown.component.model;
 
 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/model/ExecutorDetail.java

-package com.secoo.mall.common.core.bean.gracefulshowtdownBean;
+package com.secoo.mall.gracefulshutdown.component.model;
 
 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/model/ExecutorDetails.java

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

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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</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.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</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.RELEASE</version>
             </dependency>
 
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mq-rocketmq-client</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
 
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-core</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-job-xxl-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-bigdata-hbase-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datahelper-redis-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-client-openfeign-starter</artifactId>
-                <version>2.0.17.RELEASE</version>
+                <version>2.0.18.RELEASE</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.RELEASE</version>
             </dependency>
             <!--普通jar-->
 
@@ -201,11 +201,6 @@
                 <version>1.2.58</version>
             </dependency>
             <dependency>
-                <groupId>com.esotericsoftware</groupId>
-                <artifactId>kryo</artifactId>
-                <version>4.0.2</version>
-            </dependency>
-            <dependency>
                 <groupId>com.lmax</groupId>
                 <artifactId>disruptor</artifactId>
                 <version>3.4.2</version>