diff --git a/pom.xml b/pom.xml index 765863e..b341df3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,52 +1,70 @@ - - 4.0.0 - - + + 4.0.0 + + com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1-SNAPSHOT - com.chinaunicom.mall.ebtp - biz_service_ebtp_project - 0.0.1 - biz_service_ebtp_project + com.chinaunicom.mall.ebtp + biz_service_ebtp_project + 0.0.1 + biz_service_ebtp_project - + com.chinaunicom.mall.ebtp uboot-core 0.0.1-SNAPSHOT + + + com.baomidou + mybatis-plus-generator + + com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter - - - mysql - mysql-connector-java - + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + - - com.chinaunicom.ebtp - mall-ebtp-cloud-attachment-sdk - + + org.apache.shardingsphere + sharding-transaction-base-seata-at + 4.0.0-RC2 + - - - com.github.xiaoymin - knife4j-spring-boot-starter - 2.0.0 - - + + mysql + mysql-connector-java + + + + com.chinaunicom.ebtp + mall-ebtp-cloud-attachment-sdk + + + + com.baomidou + mybatis-plus-boot-starter + + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.0 + + @@ -63,25 +81,25 @@ - - - - src/main/resources - true - - - src/main/java - - **/mapper/*Mapper.xml - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + src/main/resources + true + + + src/main/java + + **/mapper/*Mapper.xml + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfiguration.java b/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfiguration.java deleted file mode 100644 index 907388e..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfiguration.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.chinaunicom.mall.ebtp.project.config; - -import javax.sql.DataSource; - -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; -import org.mybatis.spring.transaction.SpringManagedTransactionFactory; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; - -import com.alibaba.druid.pool.DruidDataSource; - -import io.seata.rm.datasource.DataSourceProxy; - -/** - * 数据源代理 - * - * @author wangzhongxiang - */ -@Configuration -public class DataSourceConfiguration { - - @Bean - @ConfigurationProperties(prefix = "spring.datasource") - public DataSource druidDataSource() { - DruidDataSource druidDataSource = new DruidDataSource(); - return druidDataSource; - } - - @Primary - @Bean("dataSource") - public DataSourceProxy dataSource(DataSource druidDataSource) { - return new DataSourceProxy(druidDataSource); - } - - @Bean - public SqlSessionFactory sqlSessionFactory(DataSourceProxy dataSourceProxy) throws Exception { - SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); - sqlSessionFactoryBean.setDataSource(dataSourceProxy); - sqlSessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory()); - - return sqlSessionFactoryBean.getObject(); - } - -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index e2ac44b..5fec330 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -24,12 +24,34 @@ spring: application: name: biz-service-ebtp-project - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - password: root - username: root - + shardingsphere: + datasource: + names: ds0 + ds0: + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: root + password: root + jdbc-url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + filters: stat,wall,log4j + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000 + props: + sql: + show: true + jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8