去掉分表逻辑
This commit is contained in:
1 parent
2d0a09c734
commit
8d3cb18a46
4 files changed
+4
-139
No files matched your search
@@ -117,17 +117,6 @@
|
|||||||
<artifactId>mybatis-plus-generator</artifactId>
|
<artifactId>mybatis-plus-generator</artifactId>
|
||||||
<version>3.4.0</version>
|
<version>3.4.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- sharding-jdbc -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.shardingsphere</groupId>
|
|
||||||
<artifactId>sharding-jdbc-spring-boot-starter</artifactId>
|
|
||||||
<version>4.1.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.shardingsphere</groupId>
|
|
||||||
<artifactId>sharding-jdbc-spring-namespace</artifactId>
|
|
||||||
<version>4.1.1</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
<artifactId>spring-boot-starter-test</artifactId>
|
||||||
|
|||||||
@@ -2,66 +2,8 @@
|
|||||||
spring:
|
spring:
|
||||||
main:
|
main:
|
||||||
allow-bean-definition-overriding: true
|
allow-bean-definition-overriding: true
|
||||||
shardingsphere:
|
|
||||||
datasource:
|
|
||||||
names: ds0,ds1
|
|
||||||
ds0:
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://192.168.3.243:3306/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: Lqj7667213.520
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
filters: stat
|
|
||||||
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
|
|
||||||
ds1:
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://192.168.3.243:3306/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: Lqj7667213.520
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
filters: stat
|
|
||||||
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
|
|
||||||
props:
|
props:
|
||||||
sql.show: true
|
sql.show: true
|
||||||
sharding:
|
|
||||||
# 默认数据源
|
|
||||||
default-data-source-name: ds0
|
|
||||||
default-key-generator:
|
|
||||||
type: SNOWFLAKE
|
|
||||||
column: id
|
|
||||||
default-database-strategy:
|
|
||||||
inline:
|
|
||||||
sharding-column: id
|
|
||||||
algorithm-expression: ds$->{id % 2}
|
|
||||||
tables:
|
|
||||||
exam_student_paper_answer:
|
|
||||||
actual-data-nodes: ds$->{0..1}.exam_student_paper_answer_$->{0..1}
|
|
||||||
table-strategy:
|
|
||||||
inline:
|
|
||||||
sharding-column: id
|
|
||||||
algorithm-expression: exam_student_paper_answer_$->{id % 2}
|
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: com.mysql.cj.jdbc.Driver
|
driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
@@ -2,66 +2,8 @@
|
|||||||
spring:
|
spring:
|
||||||
main:
|
main:
|
||||||
allow-bean-definition-overriding: true
|
allow-bean-definition-overriding: true
|
||||||
shardingsphere:
|
|
||||||
datasource:
|
|
||||||
names: ds0,ds1
|
|
||||||
ds0:
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://172.16.0.4:3308/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: Lgkj@123
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
filters: stat
|
|
||||||
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
|
|
||||||
ds1:
|
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
|
||||||
url: jdbc:mysql://172.16.0.4:3308/epusdt?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
|
||||||
username: root
|
|
||||||
password: Lgkj@123
|
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
|
||||||
filters: stat
|
|
||||||
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
|
|
||||||
props:
|
props:
|
||||||
sql.show: true
|
sql.show: true
|
||||||
sharding:
|
|
||||||
# 默认数据源
|
|
||||||
default-data-source-name: ds0
|
|
||||||
default-key-generator:
|
|
||||||
type: SNOWFLAKE
|
|
||||||
column: id
|
|
||||||
default-database-strategy:
|
|
||||||
inline:
|
|
||||||
sharding-column: id
|
|
||||||
algorithm-expression: ds$->{id % 2}
|
|
||||||
tables:
|
|
||||||
exam_student_paper_answer:
|
|
||||||
actual-data-nodes: ds$->{0..1}.exam_student_paper_answer_$->{0..1}
|
|
||||||
table-strategy:
|
|
||||||
inline:
|
|
||||||
sharding-column: id
|
|
||||||
algorithm-expression: exam_student_paper_answer_$->{id % 2}
|
|
||||||
datasource:
|
datasource:
|
||||||
type: com.alibaba.druid.pool.DruidDataSource
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: com.mysql.cj.jdbc.Driver
|
driverClassName: com.mysql.cj.jdbc.Driver
|
||||||
|
|||||||
@@ -9,15 +9,11 @@ import javax.servlet.ServletException;
|
|||||||
import javax.servlet.ServletRequest;
|
import javax.servlet.ServletRequest;
|
||||||
import javax.servlet.ServletResponse;
|
import javax.servlet.ServletResponse;
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
|
|
||||||
import org.apache.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
import org.springframework.boot.web.servlet.FilterRegistrationBean;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.DependsOn;
|
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
import com.alibaba.druid.pool.DruidDataSource;
|
import com.alibaba.druid.pool.DruidDataSource;
|
||||||
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
|
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
|
||||||
@@ -30,15 +26,12 @@ import com.ruoyi.framework.datasource.DynamicDataSource;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* druid 配置多数据源
|
* druid 配置多数据源
|
||||||
*
|
*
|
||||||
* @author ruoyi
|
* @author ruoyi
|
||||||
*/
|
*/
|
||||||
@DependsOn("shardingDataSource")
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class DruidConfig
|
public class DruidConfig
|
||||||
{
|
{
|
||||||
@Autowired
|
|
||||||
private ShardingDataSource shardingDataSource;
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConfigurationProperties("spring.datasource.druid.master")
|
@ConfigurationProperties("spring.datasource.druid.master")
|
||||||
public DataSource masterDataSource(DruidProperties druidProperties)
|
public DataSource masterDataSource(DruidProperties druidProperties)
|
||||||
@@ -63,13 +56,12 @@ public class DruidConfig
|
|||||||
Map<Object, Object> targetDataSources = new HashMap<>();
|
Map<Object, Object> targetDataSources = new HashMap<>();
|
||||||
targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
|
targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
|
||||||
setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
|
setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
|
||||||
setDataSource(targetDataSources, DataSourceType.SHARDING.name(), "shardingDataSource");
|
|
||||||
return new DynamicDataSource(masterDataSource, targetDataSources);
|
return new DynamicDataSource(masterDataSource, targetDataSources);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置数据源
|
* 设置数据源
|
||||||
*
|
*
|
||||||
* @param targetDataSources 备选数据源集合
|
* @param targetDataSources 备选数据源集合
|
||||||
* @param sourceName 数据源名称
|
* @param sourceName 数据源名称
|
||||||
* @param beanName bean名称
|
* @param beanName bean名称
|
||||||
@@ -131,4 +123,4 @@ public class DruidConfig
|
|||||||
registrationBean.addUrlPatterns(commonJsPattern);
|
registrationBean.addUrlPatterns(commonJsPattern);
|
||||||
return registrationBean;
|
return registrationBean;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user