diff --git a/pom.xml b/pom.xml index 2eeb571..78f96a7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,10 @@ 0.0.1 biz_service_ebtp_project + + 3.2.0 + + com.chinaunicom.mall.ebtp @@ -31,12 +35,12 @@ com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter - + mysql mysql-connector-java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java index 469627f..007a5e1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/BizServiceEbtpProjectApplication.java @@ -8,7 +8,6 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; -//@SpringBootApplication(exclude = { DruidDataSourceAutoConfigure.class, DataSourceAutoConfiguration.class }) @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @EnableFeignClients @EnableEurekaClient diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfig.java b/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfig.java deleted file mode 100644 index c77e1ec..0000000 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/config/DataSourceConfig.java +++ /dev/null @@ -1,44 +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 org.springframework.core.io.support.PathMatchingResourcePatternResolver; - -import com.alibaba.druid.pool.DruidDataSource; - -import io.seata.rm.datasource.DataSourceProxy; - -@Configuration -public class DataSourceConfig { - - @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.setMapperLocations(new PathMatchingResourcePatternResolver() - .getResources("classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml")); - sqlSessionFactoryBean.setTransactionFactory(new SpringManagedTransactionFactory()); - - return sqlSessionFactoryBean.getObject(); - } -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index bee6c3f..5fec330 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -24,12 +24,33 @@ spring: application: name: biz-service-ebtp-project - datasource: - type: com.alibaba.druid.pool.DruidDataSource - 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 - username: root - password: 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