Merge branch 'feature_protocol' into 'master'

Feature protocol

See merge request mall/arch/matrix!58

common-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

elasticsearch-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-datasource</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-datasource/matrix-datasource-druid/src/main/java/com/secoo/mall/datasource/properties/MatrixDruidDataSourceProperties.java

@@ -10,11 +10,11 @@ import java.util.concurrent.TimeUnit;
 public class MatrixDruidDataSourceProperties extends MatrixDataSourceProperties {
 
     public static final String PREFIX = MatrixDataSourceProperties.PREFIX + ".druid";
-    private Integer initialSize;
+    private Integer initialSize=20;
     private Long timeBetweenEvictionRunsMillis = DruidAbstractDataSource.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
     private Long timeBetweenLogStatsMillis;
-    private Integer minIdle;
-    private Integer maxIdle;
+    private Integer minIdle=5;
+    private Integer maxIdle=20;
     private Long maxWait = TimeUnit.SECONDS.toMillis(3L);
     private Integer statSqlMaxSize;
     private Long minEvictableIdleTimeMillis;
@@ -33,7 +33,7 @@ public class MatrixDruidDataSourceProperties extends MatrixDataSourceProperties
     private Integer maxWaitThreadCount;
     private Boolean failFast;
     private Long phyTimeoutMillis;
-    private Boolean keepAlive;
+    private Boolean keepAlive=true;
     private Boolean poolPreparedStatements;
     private Boolean initVariants;
     private Boolean initGlobalVariants;
@@ -43,8 +43,9 @@ public class MatrixDruidDataSourceProperties extends MatrixDataSourceProperties
     private Integer maxPoolPreparedStatementPerConnectionSize;
     private String initConnectionSqls;
     private Boolean sharePreparedStatements = false;
-    private Integer connectionErrorRetryAttempts = 1;
+    private Integer connectionErrorRetryAttempts = 3;
     private Boolean breakAfterAcquireFailure;
+    private Long timeBetweenConnectErrorMillis = 30000L;
     private Boolean removeAbandoned;
     private Integer removeAbandonedTimeoutMillis;
     private Boolean logAbandoned;

matrix-datasource/pom.xml

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

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

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>matrix-job</artifactId>
+        <groupId>com.secoo.mall</groupId>
+        <version>1.3.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>matrix-job-core</artifactId>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

matrix-job/matrix-job-core/src/main/java/com/secoo/mall/job/bean/JobInfo.java

+package com.secoo.mall.job.bean;
+
+public interface JobInfo {
+}

matrix-job/matrix-job-core/src/main/java/com/secoo/mall/job/client/JobClient.java

+package com.secoo.mall.job.client;
+
+import com.secoo.mall.job.bean.JobInfo;
+
+public interface JobClient<T,E extends JobInfo> {
+
+    /**
+     * 添加一个任务
+     *
+     * @param jobInfo {@link JobInfo}
+     * @return 任务ID
+     */
+    T add( E jobInfo);
+
+    /**
+     * 修改任务
+     *
+     * @param id      任务ID
+     * @param jobInfo {@link JobInfo}
+     * @return if update success
+     */
+    T update(int id, E jobInfo);
+
+    /**
+     * 删除任务
+     *
+     * @param id 任务ID
+     * @return if remove success
+     */
+    T remove(int id);
+
+    /**
+     * 暂停任务
+     *
+     * @param id 任务ID
+     * @return if pause success
+     */
+    T stop(int id);
+
+    /**
+     * 启动任务
+     *
+     * @param id 任务ID
+     * @return if start success
+     */
+    T start(int id);
+
+}
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>matrix-job</artifactId>
+        <groupId>com.secoo.mall</groupId>
+        <version>1.3.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>matrix-job-xxl-core</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.secoo.mall</groupId>
+            <artifactId>matrix-job-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.secoo</groupId>
+            <artifactId>xxl-job-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/bean/MatrixXxlJobInfo.java

+package com.secoo.mall.xxl.bean;
+
+import com.secoo.mall.job.bean.JobInfo;
+import lombok.Data;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.lang.reflect.Field;
+import java.util.Date;
+
+/**
+ * TODO
+ *
+ * @author gaochen
+ * Created on 2019/7/18.
+ */
+@Data
+public class MatrixXxlJobInfo implements JobInfo {
+
+    /**
+     * 执行器主键ID
+     */
+    private int jobGroup;
+
+    /**
+     * 任务执行CRON表达式
+     */
+    private String jobCron;
+
+    private String jobDesc;
+
+    private Date addTime;
+    private Date updateTime;
+
+    /**
+     * 负责人
+     */
+    private String author;
+
+    /**
+     * 报警邮件
+     */
+    private String alarmEmail;
+
+    /**
+     * 执行器路由策略
+     */
+    private String executorRouteStrategy;
+
+    /**
+     * 执行器，任务Handler名称
+     */
+    private String executorHandler;
+
+    /**
+     * 执行器，任务参数
+     */
+    private String executorParam;
+
+    /**
+     * 阻塞处理策略
+     */
+    private String executorBlockStrategy;
+
+    /**
+     * 任务执行超时时间，单位秒
+     */
+    private int executorTimeout;
+
+    /**
+     * 失败重试次数
+     */
+    private int executorFailRetryCount;
+
+    /**
+     * GLUE类型	#com.xxl.job.core.glue.GlueTypeEnum
+     */
+    private String glueType;
+
+    public MultiValueMap<String, Object> toMultiValueMap() {
+        MultiValueMap<String, Object> map = new LinkedMultiValueMap<>(20);
+        Field[] fields = MatrixXxlJobInfo.class.getDeclaredFields();
+        try {
+            for (Field field : fields) {
+                String fieldName = field.getName();
+                Object value = field.get(this);
+                if (value != null) {
+                    map.set(fieldName, value);
+                }
+            }
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        return map;
+    }
+
+}
\ No newline at end of file

matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/client/MatrixXxlJobClient.java

+package com.secoo.mall.xxl.client;
+
+import com.secoo.mall.job.client.JobClient;
+import com.secoo.mall.xxl.bean.MatrixXxlJobInfo;
+import com.secoo.mall.xxl.properties.MatrixXxlJobProperties;
+import com.xxl.job.core.biz.model.ReturnT;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+public class MatrixXxlJobClient implements JobClient<ReturnT, MatrixXxlJobInfo> {
+
+    private final RestTemplate restTemplate;
+
+    private final String baseUrl;
+
+    private static final String XXL_JOB_URL_PREFIX = "/jobinfo";
+    private static final String ADD_URL = "/add";
+    private static final String UPDATE_URL = "/update";
+    private static final String REMOVE_URL = "/remove";
+    private static final String STOP_URL = "/stop";
+    private static final String START_URL = "/start";
+
+    public MatrixXxlJobClient(RestTemplate restTemplate, MatrixXxlJobProperties xxlJobProperties) {
+        this.restTemplate = restTemplate;
+        this.baseUrl = xxlJobProperties.getAdminAddresses();
+    }
+
+    @Override
+    public ReturnT add(MatrixXxlJobInfo jobInfo) {
+        String url = baseUrl + XXL_JOB_URL_PREFIX + ADD_URL;
+
+        MultiValueMap<String, Object> valueMap = jobInfo.toMultiValueMap();
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
+
+        return restTemplate.postForObject(url, requestEntity, ReturnT.class);
+    }
+
+    @Override
+    public ReturnT update(int id, MatrixXxlJobInfo jobInfo) {
+        String url = baseUrl + XXL_JOB_URL_PREFIX + UPDATE_URL;
+
+        MultiValueMap<String, Object> valueMap = jobInfo.toMultiValueMap();
+        valueMap.set("id", id);
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
+
+        return restTemplate.postForObject(url, requestEntity, ReturnT.class);
+    }
+
+    @Override
+    public ReturnT<String> remove(int id) {
+        String url = baseUrl + XXL_JOB_URL_PREFIX + REMOVE_URL;
+        MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
+        valueMap.set("id", id);
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
+
+        return restTemplate.postForObject(url, requestEntity, ReturnT.class);
+    }
+
+    @Override
+    public ReturnT<String> stop(int id) {
+        String url = baseUrl + XXL_JOB_URL_PREFIX + STOP_URL;
+        MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
+        valueMap.set("id", id);
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
+
+        return restTemplate.postForObject(url, requestEntity, ReturnT.class);
+    }
+
+    @Override
+    public ReturnT<String> start(int id) {
+        String url = baseUrl + XXL_JOB_URL_PREFIX + START_URL;
+        MultiValueMap<String, Object> valueMap = new LinkedMultiValueMap<>(3);
+        valueMap.set("id", id);
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(valueMap, new HttpHeaders());
+
+        return restTemplate.postForObject(url, requestEntity, ReturnT.class);
+    }
+}
\ No newline at end of file

matrix-job/matrix-job-xxl-core/src/main/java/com/secoo/mall/xxl/properties/MatrixXxlJobProperties.java

+package com.secoo.mall.xxl.properties;
+
+import com.secoo.mall.common.util.sys.SystemUtil;
+import lombok.Data;
+import org.apache.commons.lang3.SystemUtils;
+import org.springframework.beans.factory.annotation.Value;
+
+@Data
+public class MatrixXxlJobProperties {
+
+    private static final int DEFAULT_EXECUTOR_PORT = 9999;
+
+    private String adminAddresses;
+
+    private String accessToken;
+
+    private String appName=SystemUtil.APP_ID;
+
+    private String logPath = (SystemUtil.IS_OS_WINDOWS?"c:/opt/":"/data/logs/")+this.appName;
+
+    @Value("${log.max_history:7}")
+    private int logRetentionDays;
+
+    private Executor executor = new Executor();
+
+    @Data
+    public static class Executor {
+        private String ip;
+        private int port = DEFAULT_EXECUTOR_PORT;
+    }
+
+}
+

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

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>matrix-job</artifactId>
+        <groupId>com.secoo.mall</groupId>
+        <version>1.3.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>matrix-job-xxl-starter</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.secoo.mall</groupId>
+            <artifactId>matrix-job-xxl-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file

matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobAutoConfiguration.java

+package com.secoo.mall.xxl.spring.boot.autoconfigure;
+
+import com.secoo.mall.job.client.JobClient;
+import com.secoo.mall.xxl.client.MatrixXxlJobClient;
+import com.xxl.job.core.executor.XxlJobExecutor;
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
+
+@Slf4j
+@ConditionalOnClass(XxlJobExecutor.class)
+@EnableConfigurationProperties(MatrixXxlJobBootProperties.class)
+@ConditionalOnProperty(name = "xxl.job.enabled", havingValue = "true", matchIfMissing = true)
+public class MatrixXxlJobAutoConfiguration {
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    @ConditionalOnMissingBean
+    public XxlJobSpringExecutor xxlJobExecutor(MatrixXxlJobBootProperties xxlJobProperties) {
+        log.info("xxl-job config {} init.", xxlJobProperties);
+
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+
+        xxlJobSpringExecutor.setAdminAddresses(xxlJobProperties.getAdminAddresses());
+        xxlJobSpringExecutor.setAccessToken(xxlJobProperties.getAccessToken());
+
+        xxlJobSpringExecutor.setAppName(xxlJobProperties.getAppName());
+        xxlJobSpringExecutor.setIp(xxlJobProperties.getExecutor().getIp());
+        xxlJobSpringExecutor.setPort(xxlJobProperties.getExecutor().getPort());
+        xxlJobSpringExecutor.setLogPath(xxlJobProperties.getLogPath());
+        xxlJobSpringExecutor.setLogRetentionDays(xxlJobProperties.getLogRetentionDays());
+
+
+        return xxlJobSpringExecutor;
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public JobClient jobClient(RestTemplate restTemplate, MatrixXxlJobBootProperties xxlJobProperties) {
+        return new MatrixXxlJobClient(restTemplate, xxlJobProperties);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}
\ No newline at end of file

matrix-job/matrix-job-xxl-starter/src/main/java/com/secoo/mall/xxl/spring/boot/autoconfigure/MatrixXxlJobBootProperties.java

+package com.secoo.mall.xxl.spring.boot.autoconfigure;
+
+import com.secoo.mall.xxl.properties.MatrixXxlJobProperties;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+
+@ConfigurationProperties(prefix =MatrixXxlJobBootProperties.PREFIX)
+public class MatrixXxlJobBootProperties extends MatrixXxlJobProperties {
+    public static final String PREFIX = "xxl.job";
+
+    @NestedConfigurationProperty
+   private MatrixXxlJobProperties.Executor executor;
+
+    @Override
+    @Value("${spring.application.name}")
+    public void setAppName(String appName) {
+        super.setAppName(appName);
+    }
+}
+

matrix-job/matrix-job-xxl-starter/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.secoo.mall.xxl.spring.boot.autoconfigure.MatrixXxlJobAutoConfiguration
\ No newline at end of file

matrix-job/matrix-job-xxl-starter/src/test/resources/application.yml

+xxl:
+  job:
+    executor:
+      ip: 190.189.90.1
\ No newline at end of file

matrix-job/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>matrix</artifactId>
+        <groupId>com.secoo.mall</groupId>
+        <version>1.3.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>matrix-job</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>matrix-job-core</module>
+        <module>matrix-job-xxl-core</module>
+        <module>matrix-job-xxl-starter</module>
+    </modules>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.secoo.mall</groupId>
+                <artifactId>matrix-job-core</artifactId>
+                <version>1.3.1.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>com.secoo.mall</groupId>
+                <artifactId>matrix-job-xxl-core</artifactId>
+                <version>1.3.1.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>com.secoo</groupId>
+                <artifactId>xxl-job-core</artifactId>
+                <version>2.1.0-secoo1.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>com.secoo.mall</groupId>
+            <artifactId>common-util</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

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

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

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mq</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix-mybatis</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

matrix-mybatis/matrix-mybatis-starter/src/test/resources/application.yml

@@ -2,3 +2,4 @@ spring:
   datasource:
     matrix:
       type: druid
+matir
\ No newline at end of file

matrix-mybatis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>matrix</artifactId>
         <groupId>com.secoo.mall</groupId>
-        <version>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,17 +25,17 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.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>1.2.12.RELEASE</version>
+        <version>1.3.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,27 +29,27 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
 
             <!-- Aapche Dubbo  -->

mongodb-starter/pom.xml

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

monitor-starter/pom.xml

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

openfeign-starter/pom.xml

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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.secoo.mall</groupId>
     <artifactId>matrix</artifactId>
-    <version>1.2.12.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
     <packaging>pom</packaging>
 
 
@@ -25,6 +25,7 @@
         <module>matrix-protocol</module>
         <module>matrix-datasource</module>
         <module>rocketmq-starter</module>
+        <module>matrix-job</module>
     </modules>
 
 
@@ -53,97 +54,108 @@
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>logger-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>monitor-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>config-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>common-util</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>redis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-datasource-druid</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-mybatis-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>mongodb-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>elasticsearch-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-rocketmq-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>rocketmq-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-rocketmq-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>openfeign-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-dubbo-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-core</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>com.secoo.mall</groupId>
                 <artifactId>matrix-protocol-web-starter</artifactId>
-                <version>1.2.12.RELEASE</version>
+                <version>1.3.1.RELEASE</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.secoo.mall</groupId>
+                <artifactId>matrix-job-xxl-core</artifactId>
+                <version>1.3.1.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>com.secoo.mall</groupId>
+                <artifactId>matrix-job-xxl-starter</artifactId>
+                <version>1.3.1.RELEASE</version>
             </dependency>
 
             <dependency>

redis-starter/pom.xml

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

rocketmq-starter/pom.xml

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