Skip to content

M
matrix
Commit 0f1a81d8 by qiuweili123
Options

1.调整组件结构 

2.增加默认的数据源为druid
3.删除数据源无关jar
parent 37bd44fa
Showing with 160 additions and 177 deletions
common-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -28,15 +28,6 @@
<groupId>com.secoo.mall</groupId>
<artifactId>app-security-algo</artifactId>
</dependency>
<!--所依赖的数据源-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
......@@ -57,11 +48,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/bean/MatrixDataSource.java
package com.secoo.mall.datasource.bean;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.constant.DataSourceTypeEnum;
import com.secoo.mall.datasource.factory.DataSourceFactory;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.reflect.MethodUtils;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.io.Closeable;
import java.io.IOException;
......@@ -23,8 +25,8 @@ public class MatrixDataSource implements DataSource, Closeable {
}
public MatrixDataSource(DataSourceTypeEnum dataSourceTypeEnum, MatrixDataSourceConfig config) {
dataSource = dataSourceTypeEnum.getDataSourceFactory().createDataSouce(config);
public MatrixDataSource(DataSourceFactory dataSourceFactory,MatrixDataSourceConfig config) {
dataSource = dataSourceFactory.createDataSouce(config);
}
......
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/config/MatrixDataSourceConfig.java
package com.secoo.mall.datasource.config;
import com.secoo.mall.datasource.factory.DataSourceFactory;
import lombok.Data;
@Data
......
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/constant/DataSourceTypeEnum.java deleted 100644 → 0
package com.secoo.mall.datasource.constant;
import com.secoo.mall.datasource.factory.DataSourceFactory;
import com.secoo.mall.datasource.factory.DruidDataSourceFactory;
import com.secoo.mall.datasource.factory.HikariDataSourceFactory;
public enum DataSourceTypeEnum {
DRUID("druid", new DruidDataSourceFactory()), HIKARI("hikari", new HikariDataSourceFactory());
private String name;
private DataSourceFactory dataSourceFactory;
DataSourceTypeEnum(String name, DataSourceFactory dataSourceFactory) {
this.name = name;
this.dataSourceFactory = dataSourceFactory;
}
public String getName() {
return name;
}
public DataSourceFactory getDataSourceFactory() {
return dataSourceFactory;
}
public static DataSourceTypeEnum getByName(String name) {
for (DataSourceTypeEnum typeEnum : DataSourceTypeEnum.values()) {
if (typeEnum.getName().equals(name)) {
return typeEnum;
}
}
return null;
}
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/errorcode/DataSourceError.java
......@@ -4,7 +4,8 @@ import com.secoo.mall.common.core.errorcode.ErrorCode;
public interface DataSourceError {
ErrorCode APOLLO_CONFIG_NOT_EXIST = new ErrorCode(1, "appollo config not exits");
ErrorCode PRIVATE_KEY_NOT_EXIST = new ErrorCode(2, "http get privatekey fail");
ErrorCode SOUCE_FACTORY_NOT_EXIST = new ErrorCode(2, "data source factory bean not config");
ErrorCode APP_ID_NOT_EXIST = new ErrorCode(3, "please config -Dappp.id");
ErrorCode DATA_SOURCE_NOT_EXIST = new ErrorCode(4, "could not find a datasource named %s");
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/AbsDataSourceFactory.java
......@@ -4,16 +4,15 @@ import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import javax.sql.DataSource;
public abstract class AbsDataSourceFactory<T> implements DataSourceFactory<T> {
public abstract class AbsDataSourceFactory<T extends DataSource, CONFIG extends MatrixDataSourceConfig> implements DataSourceFactory<T, CONFIG> {
@Override
public <T extends DataSource> T createDataSouce(MatrixDataSourceConfig config) {
public T createDataSouce(CONFIG config) {
return convertAndCreate(config);
}
protected abstract <T extends DataSource> T convertAndCreate(MatrixDataSourceConfig config);
protected abstract <T extends DataSource> T convertAndCreate(CONFIG config);
}
......
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/DataSourceFactory.java
......@@ -4,8 +4,8 @@ import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import javax.sql.DataSource;
public interface DataSourceFactory<T> {
public interface DataSourceFactory<T extends DataSource,CONFIG extends MatrixDataSourceConfig> {
<T extends DataSource> T createDataSouce(MatrixDataSourceConfig config);
T createDataSouce( CONFIG config);
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/HikariDataSourceFactory.java deleted 100644 → 0
package com.secoo.mall.datasource.factory;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
public class HikariDataSourceFactory extends AbsDataSourceFactory<HikariDataSource> {
@Override
protected HikariDataSource convertAndCreate(MatrixDataSourceConfig config) {
//基础配置
HikariConfig hikariConfig = new HikariConfig();
hikariConfig.setJdbcUrl(config.getUrl());
hikariConfig.setPoolName(config.getName());
hikariConfig.setUsername(config.getUsername());
hikariConfig.setPassword(config.getPassword());
//连接相关配置
hikariConfig.setMinimumIdle(config.getMinimumIdle());
hikariConfig.setMinimumIdle(config.getMinimumIdle());
hikariConfig.setMaximumPoolSize(config.getMaximumPoolSize());
hikariConfig.setIdleTimeout(config.getIdleTimeout());
hikariConfig.setMaxLifetime(config.getMaxLifetime());
hikariConfig.setConnectionTimeout(config.getConnectionTimeout());
return new HikariDataSource(hikariConfig);
}
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/properties/MatrixDataSourceProperties.java
package com.secoo.mall.datasource.properties;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.constant.DataSourceTypeEnum;
import lombok.Data;
@Data
public class MatrixDataSourceProperties extends MatrixDataSourceConfig {
public static final String PREFIX = "spring.datasource.matrix";
public static final DataSourceTypeEnum DEFAULT_DATASOURCE_TYPE = DataSourceTypeEnum.HIKARI;
public MatrixDataSourceProperties() {
}
/**
* SourceType DRUID or HIKARI.
* Default value HIKARI.
*/
private DataSourceTypeEnum type = DEFAULT_DATASOURCE_TYPE;
public void setType(String type) {
this.type = DataSourceTypeEnum.getByName(type);
}
}
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/provider/AbsDataSourceProvider.java
......@@ -2,26 +2,37 @@ package com.secoo.mall.datasource.provider;
import com.google.common.collect.Maps;
import com.secoo.mall.app.security.encryptor.Encryptor;
import com.secoo.mall.datasource.bean.MatrixDataSource;
import com.secoo.mall.datasource.config.DataSourceConfig;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.constant.DataSourceConstant;
import com.secoo.mall.datasource.factory.DataSourceFactory;
import com.secoo.mall.datasource.factory.EncryptorFactory;
import com.secoo.mall.datasource.properties.MatrixDataSourceProperties;
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.lang.reflect.ParameterizedType;
import java.util.List;
import java.util.Map;
public abstract class AbsDataSourceProvider<T extends MatrixDataSourceProperties> implements DataSourceProvider {
public abstract class AbsDataSourceProvider<T extends MatrixDataSourceConfig> implements DataSourceProvider {
private Encryptor<String> encryptor = EncryptorFactory.getInstance().getEncryptor();
@Resource
private DataSourceFactory dataSourceFactory;
private Class<T> entryClass;
public AbsDataSourceProvider() {
entryClass = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
}
@Override
public Map<String, DataSource> loadDataSources() {
List<T> list = getDataSourceProperties();
Map<String, DataSource> dataSourceMap = Maps.newHashMapWithExpectedSize(list.size());
for (T properties : list) {
DataSource dataSource = new MatrixDataSource(properties.getType(), properties);
DataSource dataSource = dataSourceFactory.createDataSouce(properties);
//取得原数据源名称
String dsName = properties.getName().replace(DataSourceConfig.POOL_NAME_PRIFIX, "");
dataSourceMap.put(dsName, dataSource);
......@@ -40,6 +51,10 @@ public abstract class AbsDataSourceProvider<T extends MatrixDataSourceProperties
}
public Class<T> getEntryClass() {
return entryClass;
}
protected abstract List<T> getDataSourceProperties();
......
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/provider/ApolloDataSourceProvider.java
......@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
import com.secoo.mall.common.core.exception.BusinessException;
import com.secoo.mall.common.util.colletion.CollectionUtil;
import com.secoo.mall.common.util.string.StringUtil;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.constant.DataSourceConstant;
import com.secoo.mall.datasource.errorcode.DataSourceError;
import com.secoo.mall.datasource.properties.MatrixDataSourceProperties;
......@@ -13,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.reflect.MethodUtils;
import javax.sql.DataSource;
import java.lang.reflect.ParameterizedType;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -23,8 +25,10 @@ import java.util.stream.Collectors;
* 从Apollo配置中心进行加载
*/
@Slf4j
public class ApolloDataSourceProvider extends AbsDataSourceProvider<MatrixDataSourceProperties> {
public class ApolloDataSourceProvider<T extends MatrixDataSourceConfig> extends AbsDataSourceProvider<T> {
/*
*/
/**
* 从appollo加载配置信息
......@@ -32,10 +36,12 @@ public class ApolloDataSourceProvider extends AbsDataSourceProvider<MatrixDataSo
* @return
*/
@Override
protected List<MatrixDataSourceProperties> getDataSourceProperties() {
protected List<T> getDataSourceProperties() {
Config appConfig = ConfigService.getConfig(DataSourceConstant.DB_NAMESPACE);
Set<String> propertyNames = appConfig.getPropertyNames();
List<MatrixDataSourceProperties> list = Lists.newArrayList();
List<T> list = Lists.newArrayList();
Map<String, DataSource> dataSourceMap = new HashMap<>();
if (CollectionUtil.isEmpty(propertyNames)) {
throw new BusinessException(DataSourceError.APOLLO_CONFIG_NOT_EXIST);
......@@ -47,8 +53,7 @@ public class ApolloDataSourceProvider extends AbsDataSourceProvider<MatrixDataSo
try {
for (Map.Entry<String, List<String>> entry : propertyMap.entrySet()) {
String dsName = entry.getKey();
MatrixDataSourceProperties matrixDataSourceProperties = new MatrixDataSourceProperties();
T matrixDataSourceProperties = getEntryClass().newInstance();
matrixDataSourceProperties.setName(dsName);
for (String property : entry.getValue()) {
String propertyFullPath = MatrixDataSourceProperties.PREFIX + property;
......
matrix-datasource/matrix-datasource-core/src/test/java/com/secoo/mall/mybatis/datasouce/DataSourceTest.java deleted 100644 → 0
package com.secoo.mall.mybatis.datasouce;
import com.secoo.mall.datasource.bean.MatrixDataSource;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.constant.DataSourceTypeEnum;
import org.junit.Test;
public class DataSourceTest {
@Test
public void testCreateDataSource() {
MatrixDataSourceConfig config = new MatrixDataSourceConfig();
config.setName("01");
// config.setType(DataSourceType.HIKARI);
config.setUrl("jdbc:mysql://127.0.0.1:3306/appmsdb?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false");
config.setPassword("mysql");
config.setUsername("root");
MatrixDataSource dataSource = new MatrixDataSource(DataSourceTypeEnum.HIKARI, config);
System.out.println(dataSource);
}
}
matrix-datasource/matrix-datasource-druid/pom.xml 0 → 100644
<?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-datasource</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>matrix-datasource-druid</artifactId>
<dependencies>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
matrix-datasource/matrix-datasource-core/src/main/java/com/secoo/mall/datasource/factory/DruidDataSourceFactory.java → matrix-datasource/matrix-datasource-druid/src/main/java/com/secoo/mall/datasource/factory/DruidDataSourceFactory.java
......@@ -2,14 +2,19 @@ package com.secoo.mall.datasource.factory;
import com.alibaba.druid.pool.DruidDataSource;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import com.secoo.mall.datasource.properties.MatrixDruidDataSourceProperties;
import lombok.extern.slf4j.Slf4j;
import javax.sql.DataSource;
import java.sql.SQLException;
import java.util.Properties;
public class DruidDataSourceFactory extends AbsDataSourceFactory<DruidDataSource> {
@Slf4j
public class DruidDataSourceFactory extends AbsDataSourceFactory<DruidDataSource, MatrixDruidDataSourceProperties> {
private final String duridPreFix = "druid.";
@Override
protected DruidDataSource convertAndCreate(MatrixDataSourceConfig config) {
protected DruidDataSource convertAndCreate(MatrixDruidDataSourceProperties config) {
Properties properties = new Properties();
properties.setProperty(duridPreFix + "name", config.getName());
......@@ -25,7 +30,14 @@ public class DruidDataSourceFactory extends AbsDataSourceFactory<DruidDataSource
DruidDataSource dataSource = new DruidDataSource();
dataSource.configFromPropety(properties);
try {
dataSource.init();
} catch (SQLException e) {
log.error("sql error:", e);
}
return dataSource;
}
}
matrix-datasource/matrix-datasource-druid/src/main/java/com/secoo/mall/datasource/properties/MatrixDruidDataSourceProperties.java 0 → 100644
package com.secoo.mall.datasource.properties;
import com.secoo.mall.datasource.config.MatrixDataSourceConfig;
import lombok.Data;
@Data
public class MatrixDruidDataSourceProperties extends MatrixDataSourceProperties {
public static final String PREFIX = MatrixDataSourceProperties.PREFIX+".druid";
}
matrix-datasource/matrix-datasource-druid/src/main/java/com/secoo/mall/datasource/provider/ApolloDruidDataSourceProvider.java 0 → 100644
package com.secoo.mall.datasource.provider;
import com.secoo.mall.datasource.properties.MatrixDruidDataSourceProperties;
public class ApolloDruidDataSourceProvider extends ApolloDataSourceProvider<MatrixDruidDataSourceProperties> {
}
matrix-datasource/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -13,23 +13,20 @@
<packaging>pom</packaging>
<modules>
<module>matrix-datasource-core</module>
<module>matrix-datasource-druid</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>3.2.0</version>
<scope>provided</scope>
<optional>true</optional>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.20</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
......
matrix-mybatis/matrix-mybatis-core/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId>
<artifactId>matrix-datasource-druid</artifactId>
</dependency>
</dependencies>
......
matrix-mybatis/matrix-mybatis-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix-mybatis</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
matrix-mybatis/matrix-mybatis-starter/src/main/java/com/secoo/mall/mybatis/spring/boot/autoconfigure/MatrixMybatisAutoConfiguration.java
package com.secoo.mall.mybatis.spring.boot.autoconfigure;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
import com.ctrip.framework.apollo.spring.boot.ApolloAutoConfiguration;
import com.secoo.mall.datasource.bean.MatrixDataSource;
import com.secoo.mall.datasource.bean.MatrixDynamicDataSource;
import com.secoo.mall.datasource.provider.ApolloDataSourceProvider;
import com.secoo.mall.datasource.factory.DataSourceFactory;
import com.secoo.mall.datasource.factory.DruidDataSourceFactory;
import com.secoo.mall.datasource.provider.ApolloDruidDataSourceProvider;
import com.secoo.mall.datasource.provider.DataSourceProvider;
import com.secoo.mall.datasource.util.SysUtil;
import com.secoo.mall.mybatis.bean.MatrixMybatisSqlSessionFactoryBean;
......@@ -19,9 +22,11 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import javax.sql.DataSource;
......@@ -42,11 +47,12 @@ public class MatrixMybatisAutoConfiguration {
@Value("${config.app.security.accessToken}")
private String acccessToken;
@Bean
@ConditionalOnMissingBean(DataSourceProvider.class)
public DataSourceProvider dataSourceProvider() {
SysUtil.setProperty("accessToken", acccessToken);
return new ApolloDataSourceProvider();
return new ApolloDruidDataSourceProvider();
}
/**
......@@ -61,6 +67,13 @@ public class MatrixMybatisAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean(DataSourceFactory.class)
public DataSourceFactory dataSourceFactory() {
return new DruidDataSourceFactory();
}
@Bean
@ConditionalOnMissingBean(SqlSessionFactory.class)
public SqlSessionFactory sqlSessionFactory(DataSource dataSource, MatrixMybatisConfig matrixMybatisConfig, MatrixMybatisGlobalConfig matrixMybatisGlobalConfig) throws Exception {
MatrixMybatisSqlSessionFactoryBean sqlSessionFactory = new MatrixMybatisSqlSessionFactoryBean(matrixMybatisConfig, matrixMybatisGlobalConfig);
......
matrix-mybatis/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -25,22 +25,28 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-core</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
<exclusions>
<exclusion>
<artifactId>HikariCP</artifactId>
<groupId>com.zaxxer</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-datasource-core</artifactId>
<version>1.1.9.RELEASE</version>
<artifactId>matrix-datasource-druid</artifactId>
<version>1.1.10.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>
......
mongodb-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
pom.xml
......@@ -6,13 +6,14 @@
<groupId>com.secoo.mall</groupId>
<artifactId>matrix</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
<packaging>pom</packaging>
<modules>
<module>common-core</module>
<module>common-util</module>
<module>logger-starter</module>
<module>redis-starter</module>
<module>matrix-mybatis</module>
<module>mongodb-starter</module>
......@@ -22,7 +23,6 @@
<module>monitor-starter</module>
<module>config-starter</module>
<module>protocol-starter</module>
<module>logger-starter</module>
<module>matrix-datasource</module>
</modules>
......@@ -48,62 +48,62 @@
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>logger-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>monitor-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-core</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>config-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>common-util</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>redis-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>matrix-mybatis-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>mongodb-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>elasticsearch-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>protocol-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>rocketmq-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
<groupId>com.secoo.mall</groupId>
<artifactId>openfeign-starter</artifactId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</dependency>
<dependency>
......
protocol-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
redis-starter/pom.xml
......@@ -5,7 +5,7 @@
<parent>
<artifactId>matrix</artifactId>
<groupId>com.secoo.mall</groupId>
<version>1.1.9.RELEASE</version>
<version>1.1.10.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.1.9.RELEASE</version>
<version>1.1.10.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
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