From f95325fd2635a9af08c0acac70e70379978d128a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 七月 2023 19:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java b/cloud-server-activity/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
index 2c53536..bb66dd0 100644
--- a/cloud-server-activity/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
+++ b/cloud-server-activity/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
@@ -73,15 +73,16 @@
         props1.setProperty("algorithm-expression", "t_user_coupon$->{userId % 5 + 1}");
         result1.getShardingAlgorithms().put("t_user_coupon-inline", new AlgorithmConfiguration("INLINE", props1));
         result1.getKeyGenerators().put("t_user_coupon-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+        linkedList.add(result1);
 
         //分片规则配置
-        result1.getTables().add(getUserPointsMerchandiseTableRuleConfiguration());
+        ShardingRuleConfiguration result2 = new ShardingRuleConfiguration();
+        result2.getTables().add(getUserPointsMerchandiseTableRuleConfiguration());
         Properties props2 = new Properties();
         props2.setProperty("algorithm-expression", "t_user_points_merchandise$->{userId % 5 + 1}");
-        result1.getShardingAlgorithms().put("t_user_points_merchandise-inline", new AlgorithmConfiguration("INLINE", props2));
-        result1.getKeyGenerators().put("t_user_points_merchandise-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
-
-        linkedList.add(result1);
+        result2.getShardingAlgorithms().put("t_user_points_merchandise-inline", new AlgorithmConfiguration("INLINE", props2));
+        result2.getKeyGenerators().put("t_user_points_merchandise-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+        linkedList.add(result2);
 
         return linkedList;
     }

--
Gitblit v1.7.1