From af5a805d0a7244f61f56db76dedde85049f3af84 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 23 Oct 2023 13:40:28 +0800
Subject: [PATCH] =?UTF-8?q?shardingsphere=E5=A2=9E=E5=8A=A0=E5=88=B02030?=
 =?UTF-8?q?=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/spring.factories               | 1 +
 ...pringframework.boot.autoconfigure.AutoConfiguration.imports | 3 ++-
 win-server/src/main/resources/application-dev.yaml             | 3 +--
 win-server/src/main/resources/application-prod.yaml            | 3 +--
 win-server/src/main/resources/application-test.yaml            | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
index 4c2b1ed2..8e472fcd 100644
--- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
+++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,3 @@
 org.springframework.boot.env.EnvironmentPostProcessor=\
   com.win.framework.mybatis.config.IdTypeEnvironmentPostProcessor
+
diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 68f8a104..9c8f0dd1 100644
--- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
 com.win.framework.datasource.config.WinDataSourceAutoConfiguration
-com.win.framework.mybatis.config.WinMybatisAutoConfiguration
\ No newline at end of file
+com.win.framework.mybatis.config.WinMybatisAutoConfiguration
+com.win.framework.datasource.utils.ShardingTablesLoadRunner
\ No newline at end of file
diff --git a/win-server/src/main/resources/application-dev.yaml b/win-server/src/main/resources/application-dev.yaml
index 84ebc1c3..d94294c3 100644
--- a/win-server/src/main/resources/application-dev.yaml
+++ b/win-server/src/main/resources/application-dev.yaml
@@ -58,8 +58,7 @@ spring:
           # t_user 是逻辑表
           infra_trends:
             # 配置数据节点，这里是按月分表
-            #actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
-            actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}}
+            actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
             tableStrategy:
               # 使用标准分片策略
               standard:
diff --git a/win-server/src/main/resources/application-prod.yaml b/win-server/src/main/resources/application-prod.yaml
index 1ba72377..1eac7ae9 100644
--- a/win-server/src/main/resources/application-prod.yaml
+++ b/win-server/src/main/resources/application-prod.yaml
@@ -58,8 +58,7 @@ spring:
           # t_user 是逻辑表
           infra_trends:
             # 配置数据节点，这里是按月分表
-            #actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
-            actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}}
+            actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
             tableStrategy:
               # 使用标准分片策略
               standard:
diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml
index fbb776af..485af7d2 100644
--- a/win-server/src/main/resources/application-test.yaml
+++ b/win-server/src/main/resources/application-test.yaml
@@ -58,8 +58,7 @@ spring:
           # t_user 是逻辑表
           infra_trends:
             # 配置数据节点，这里是按月分表
-            #actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
-            actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}}
+            actualDataNodes:  master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}}
             tableStrategy:
               # 使用标准分片策略
               standard: