From 4dad3d9a5bfc1b08c5338640e1f1d18c2b86ef45 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 26 七月 2023 18:05:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 b53d988..e3ac21c 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
@@ -73,17 +73,14 @@
props1.setProperty("algorithm-expression", "t_user_competition$->{appUserId % 5 + 1}");
result1.getShardingAlgorithms().put("t_user_competition-inline", new AlgorithmConfiguration("INLINE", props1));
result1.getKeyGenerators().put("t_user_competition-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
- linkedList.add(result1);
//分片规则配置
- ShardingRuleConfiguration result2 = new ShardingRuleConfiguration();
- result2.getTables().add(getPaymentCompetitionTableRuleConfiguration());
+ result1.getTables().add(getPaymentCompetitionTableRuleConfiguration());
Properties props2 = new Properties();
props2.setProperty("algorithm-expression", "t_payment_competition$->{appUserId % 5 + 1}");
- result2.getShardingAlgorithms().put("t_payment_competition-inline", new AlgorithmConfiguration("INLINE", props2));
- result2.getKeyGenerators().put("t_payment_competition-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
- linkedList.add(result2);
-
+ result1.getShardingAlgorithms().put("t_payment_competition-inline", new AlgorithmConfiguration("INLINE", props2));
+ result1.getKeyGenerators().put("t_payment_competition-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+ linkedList.add(result1);
return linkedList;
}
--
Gitblit v1.7.1