From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java b/cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
index e3ac21c..d2327c7 100644
--- a/cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
+++ b/cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
@@ -24,7 +24,7 @@
@Bean
- public DataSource getDataSource(){
+ public DataSource getDataSource() {
DataSource dataSource = null;
try {
Properties properties = new Properties();
@@ -40,6 +40,7 @@
/**
* 配置多数据源
+ *
* @return
*/
private Map<String, DataSource> createDataSourceMap() {
@@ -61,6 +62,7 @@
/**
* 分片配置
+ *
* @return
*/
private Collection<RuleConfiguration> createShardingRuleConfiguration() {
@@ -86,6 +88,7 @@
/**
* 分片算法配置
+ *
* @return
*/
private ShardingTableRuleConfiguration getUserCompetitionTableRuleConfiguration() {
@@ -98,6 +101,7 @@
/**
* 分片算法配置
+ *
* @return
*/
private ShardingTableRuleConfiguration getPaymentCompetitionTableRuleConfiguration() {
--
Gitblit v1.7.1