From 4153d83ed2211f5773b63045e61f02124f32f490 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 18:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java b/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
index e0ef0b4..66183bb 100644
--- a/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
+++ b/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
@@ -73,34 +73,28 @@
         props1.setProperty("algorithm-expression", "t_course_package_payment$->{appUserId % 5 + 1}");
         result1.getShardingAlgorithms().put("t_course_package_payment-inline", new AlgorithmConfiguration("INLINE", props1));
         result1.getKeyGenerators().put("t_course_package_payment-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
-        linkedList.add(result1);
 
         //分片规则配置
-        ShardingRuleConfiguration result2 = new ShardingRuleConfiguration();
-        result2.getTables().add(getCoursePackageStudentTableRuleConfiguration());
+        result1.getTables().add(getCoursePackageStudentTableRuleConfiguration());
         Properties props2 = new Properties();
         props2.setProperty("algorithm-expression", "t_course_package_student$->{appUserId % 5 + 1}");
-        result2.getShardingAlgorithms().put("t_course_package_student-inline", new AlgorithmConfiguration("INLINE", props2));
-        result2.getKeyGenerators().put("t_course_package_student-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
-        linkedList.add(result2);
+        result1.getShardingAlgorithms().put("t_course_package_student-inline", new AlgorithmConfiguration("INLINE", props2));
+        result1.getKeyGenerators().put("t_course_package_student-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
 
         //分片规则配置
-        ShardingRuleConfiguration result3 = new ShardingRuleConfiguration();
-        result3.getTables().add(getPostCourseVideoTableRuleConfiguration());
+        result1.getTables().add(getPostCourseVideoTableRuleConfiguration());
         Properties props3 = new Properties();
         props3.setProperty("algorithm-expression", "t_post_course_video$->{coursePackageId % 5 + 1}");
-        result3.getShardingAlgorithms().put("t_post_course_video-inline", new AlgorithmConfiguration("INLINE", props3));
-        result3.getKeyGenerators().put("t_post_course_video-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
-        linkedList.add(result3);
+        result1.getShardingAlgorithms().put("t_post_course_video-inline", new AlgorithmConfiguration("INLINE", props3));
+        result1.getKeyGenerators().put("t_post_course_video-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
 
         //分片规则配置
-        ShardingRuleConfiguration result4 = new ShardingRuleConfiguration();
-        result4.getTables().add(getUserVideoDetailsTableRuleConfiguration());
+        result1.getTables().add(getUserVideoDetailsTableRuleConfiguration());
         Properties props4 = new Properties();
         props4.setProperty("algorithm-expression", "t_user_video_details$->{appUserId % 5 + 1}");
-        result4.getShardingAlgorithms().put("t_user_video_details-inline", new AlgorithmConfiguration("INLINE", props4));
-        result4.getKeyGenerators().put("t_user_video_details-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
-        linkedList.add(result4);
+        result1.getShardingAlgorithms().put("t_user_video_details-inline", new AlgorithmConfiguration("INLINE", props4));
+        result1.getKeyGenerators().put("t_user_video_details-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+        linkedList.add(result1);
 
         return linkedList;
     }

--
Gitblit v1.7.1