Skip to content

M
matrix
Commit 86493604 by 张成进
Options

Merge branch 'master' into feature_springbootUpgrade 

# Conflicts:
#	pom.xml
parents 5addfc6b e27aa3b6
Showing with 103 additions and 79 deletions
common-core/pom.xml
...@@ -5,10 +5,20 @@ ...@@ -5,10 +5,20 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<build> <build>
<plugins> <plugins>
......
common-core/src/main/java/com/secoo/mall/common/core/classloader/MatrixUrlClassLoader.java
package com.secoo.mall.common.core.classloader; package com.secoo.mall.common.core.classloader;
import com.secoo.mall.common.core.exception.SystemInternalException; import com.secoo.mall.common.core.exception.SystemInternalException;
import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
@Slf4j
public class MatrixUrlClassLoader extends URLClassLoader { public class MatrixUrlClassLoader extends URLClassLoader {
private volatile static MatrixUrlClassLoader instance; private volatile static MatrixUrlClassLoader instance;
private static ClassLoader classLoader = MatrixUrlClassLoader.class.getClassLoader(); private static ClassLoader classLoader = MatrixUrlClassLoader.class.getClassLoader();
...@@ -23,7 +25,7 @@ public class MatrixUrlClassLoader extends URLClassLoader { ...@@ -23,7 +25,7 @@ public class MatrixUrlClassLoader extends URLClassLoader {
ADD_URL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class); ADD_URL = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
ADD_URL.setAccessible(true); ADD_URL.setAccessible(true);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
e.printStackTrace(); log.error(e.getMessage(), e);
throw new SystemInternalException(); throw new SystemInternalException();
} }
...@@ -49,7 +51,7 @@ public class MatrixUrlClassLoader extends URLClassLoader { ...@@ -49,7 +51,7 @@ public class MatrixUrlClassLoader extends URLClassLoader {
URL url = new URL(urlStr); URL url = new URL(urlStr);
ADD_URL.invoke(classLoader, url); ADD_URL.invoke(classLoader, url);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage(), e);
throw new SystemInternalException(); throw new SystemInternalException();
} }
} }
...@@ -71,7 +73,7 @@ public class MatrixUrlClassLoader extends URLClassLoader { ...@@ -71,7 +73,7 @@ public class MatrixUrlClassLoader extends URLClassLoader {
return factClass.newInstance(); return factClass.newInstance();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage(), e);
throw new SystemInternalException(); throw new SystemInternalException();
} }
} }
......
common-util/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
config-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
logger-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/matrix-bigdata-hbase-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-bigdata</artifactId> <artifactId>matrix-bigdata</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/matrix-bigdata-spark-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-bigdata</artifactId> <artifactId>matrix-bigdata</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-bigdata/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-bus/matrix-bus-canal-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-bus</artifactId> <artifactId>matrix-bus</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-bus/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-client/matrix-client-openfeign-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-client</artifactId> <artifactId>matrix-client</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-client/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/matrix-datahelper-redis-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-datahelper</artifactId> <artifactId>matrix-datahelper</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/matrix-datahelper-redis-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-datahelper</artifactId> <artifactId>matrix-datahelper</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-datahelper/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-core</artifactId> <artifactId>matrix-datahelper-redis-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
matrix-datasource/matrix-datasource-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-datasource</artifactId> <artifactId>matrix-datasource</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/provider/ApolloDataSourceProvider.java
...@@ -78,7 +78,7 @@ public class ApolloDataSourceProvider<T extends MatrixDataSourceConfig> extends ...@@ -78,7 +78,7 @@ public class ApolloDataSourceProvider<T extends MatrixDataSourceConfig> extends
MethodUtils.invokeExactMethod(matrixDataSourceProperties, "set" + StringUtil.capitalize(beanFieldName), value); MethodUtils.invokeExactMethod(matrixDataSourceProperties, "set" + StringUtil.capitalize(beanFieldName), value);
} }
log.info("init datasource name:{}", dsName); log.info("init datasource name:{}, url:{}", dsName, matrixDataSourceProperties.getUrl());
list.add(matrixDataSourceProperties); list.add(matrixDataSourceProperties);
} }
} catch (Exception e) { } catch (Exception e) {
......
matrix-datasource/matrix-datasource-druid/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-datasource</artifactId> <artifactId>matrix-datasource</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-datasource/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId> <artifactId>matrix-datasource-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>app-security-api</artifactId> <artifactId>app-security-api</artifactId>
<version>1.0.6.RELEASE</version> <version>1.0.8.RELEASE</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
......
matrix-gracefulshutdown/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-job/matrix-job-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-job</artifactId> <artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-job/matrix-job-xxl-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-job</artifactId> <artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-job/matrix-job-xxl-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-job</artifactId> <artifactId>matrix-job</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-job/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-core</artifactId> <artifactId>matrix-job-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId> <artifactId>matrix-job-xxl-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo</groupId> <groupId>com.secoo</groupId>
......
matrix-mq/matrix-mq-rocketmq-client/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-mq</artifactId> <artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-mq/matrix-mq-rocketmq-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-mq</artifactId> <artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-mq/matrix-mq-rocketmq-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-mq</artifactId> <artifactId>matrix-mq</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-mq/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-core</artifactId> <artifactId>matrix-mq-rocketmq-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
......
matrix-mybatis/matrix-mybatis-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-mybatis</artifactId> <artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-mybatis/matrix-mybatis-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-mybatis</artifactId> <artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-mybatis/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -25,17 +25,17 @@ ...@@ -25,17 +25,17 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-core</artifactId> <artifactId>matrix-mybatis-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-druid</artifactId> <artifactId>matrix-datasource-druid</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId> <artifactId>matrix-mybatis-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
......
matrix-protocol/matrix-protocol-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-protocol</artifactId> <artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-dubbo-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-protocol</artifactId> <artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-dubbo-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-protocol</artifactId> <artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-web-core/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-protocol</artifactId> <artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-protocol/matrix-protocol-web-starter/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix-protocol</artifactId> <artifactId>matrix-protocol</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
......
matrix-protocol/pom.xml
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
...@@ -29,27 +29,27 @@ ...@@ -29,27 +29,27 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-core</artifactId> <artifactId>matrix-protocol-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-core</artifactId> <artifactId>matrix-protocol-web-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-core</artifactId> <artifactId>matrix-protocol-dubbo-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-starter</artifactId> <artifactId>matrix-protocol-web-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-starter</artifactId> <artifactId>matrix-protocol-dubbo-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<!-- Aapche Dubbo --> <!-- Aapche Dubbo -->
......
pom.xml
...@@ -3,11 +3,13 @@ ...@@ -3,11 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix</artifactId> <artifactId>matrix</artifactId>
<version>2.0.20.RELEASE</version> <version>2.0.24.RELEASE</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>common-core</module> <module>common-core</module>
<module>common-util</module> <module>common-util</module>
...@@ -25,11 +27,13 @@ ...@@ -25,11 +27,13 @@
<module>matrix-gracefulshutdown</module> <module>matrix-gracefulshutdown</module>
</modules> </modules>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring.boot.version>2.7.18</spring.boot.version> <spring.boot.version>2.4.1</spring.boot.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<!--在spring boot相关包前置,规定引入顺序 --> <!--在spring boot相关包前置,规定引入顺序 -->
<dependencies> <dependencies>
...@@ -50,119 +54,119 @@ ...@@ -50,119 +54,119 @@
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>logger-starter</artifactId> <artifactId>logger-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>common-core</artifactId> <artifactId>common-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>config-starter</artifactId> <artifactId>config-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>common-util</artifactId> <artifactId>common-util</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-druid</artifactId> <artifactId>matrix-datasource-druid</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-core</artifactId> <artifactId>matrix-mybatis-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId> <artifactId>matrix-mybatis-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-core</artifactId> <artifactId>matrix-mq-rocketmq-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-client</artifactId> <artifactId>matrix-mq-rocketmq-client</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<!--rocketmq-starter废弃，启用matrix-mq-rocketmq-starter--> <!--rocketmq-starter废弃，启用matrix-mq-rocketmq-starter-->
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-mq-rocketmq-starter</artifactId> <artifactId>matrix-mq-rocketmq-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-core</artifactId> <artifactId>matrix-protocol-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-core</artifactId> <artifactId>matrix-protocol-dubbo-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-dubbo-starter</artifactId> <artifactId>matrix-protocol-dubbo-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-core</artifactId> <artifactId>matrix-protocol-web-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-protocol-web-starter</artifactId> <artifactId>matrix-protocol-web-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-core</artifactId> <artifactId>matrix-job-xxl-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-job-xxl-starter</artifactId> <artifactId>matrix-job-xxl-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-bigdata-hbase-starter</artifactId> <artifactId>matrix-bigdata-hbase-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<!--redis--> <!--redis-->
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-core</artifactId> <artifactId>matrix-datahelper-redis-core</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-datahelper-redis-starter</artifactId> <artifactId>matrix-datahelper-redis-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-client-openfeign-starter</artifactId> <artifactId>matrix-client-openfeign-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<!-- bus --> <!-- bus -->
<dependency> <dependency>
<groupId>com.secoo.mall</groupId> <groupId>com.secoo.mall</groupId>
<artifactId>matrix-bus-canal-starter</artifactId> <artifactId>matrix-bus-canal-starter</artifactId>
<version>2.0.18.RELEASE</version> <version>2.0.24.RELEASE</version>
</dependency> </dependency>
<!--普通jar--> <!--普通jar-->
...@@ -248,7 +252,10 @@ ...@@ -248,7 +252,10 @@
<artifactId>httpasyncclient</artifactId> <artifactId>httpasyncclient</artifactId>
<version>4.1.2</version> <version>4.1.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<build> <build>
...@@ -301,6 +308,7 @@ ...@@ -301,6 +308,7 @@
</pluginManagement> </pluginManagement>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>dev</id> <id>dev</id>
...@@ -345,4 +353,9 @@ ...@@ -345,4 +353,9 @@
</distributionManagement> </distributionManagement>
</profile> </profile>
</profiles> </profiles>
</project>
\ No newline at end of file
</project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment