From 2e8cc49dfa540ca2f88e6a5ff4434da3a7875566 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 30 Apr 2024 18:00:08 +0800 Subject: [PATCH] update --- .../com/jeesite/modules/cms/db/InitCmsData.java | 2 -- .../com/jeesite/modules/sys/db/InitCoreData.java | 2 +- .../com/jeesite/modules/test/db/InitTestData.java | 13 ++++++++++--- .../com/jeesite/modules/test/db/InitTestData.java | 13 ++++++++++--- .../com/jeesite/modules/test/db/InitTestData.java | 13 ++++++++++--- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java b/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java index 66085b6f..af73d1e9 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java @@ -33,7 +33,6 @@ public class InitCmsData extends BaseInitDataTests { if (GenUtils.isTableExists(Global.getTablePrefix() + "cms_article")) { return true; // 如果表已存在，则无需初始化 } - this.runCreateScript("cms.sql"); this.initModuleInfo("cms"); this.initModuleMenu("/cms/index"); @@ -42,7 +41,6 @@ public class InitCmsData extends BaseInitDataTests { this.initCategory(); this.initArticle(); this.initArticleData(); - return true; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java index dc7d4c31..b4c2d4ed 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java @@ -365,7 +365,7 @@ public class InitCoreData extends BaseInitDataTests { @Override public int getPhase() { - return Integer.MIN_VALUE + 1000; // core 1000, other 2000, upgrade 10000 + return Integer.MIN_VALUE + 1000; // core 1000, other 5000, upgrade 10000 } } diff --git a/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java index 376844b7..7377c7df 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java +++ b/web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java @@ -4,6 +4,7 @@ */ package com.jeesite.modules.test.db; +import com.jeesite.common.datasource.DataSourceHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests { initGenDemoData(); return true; } - + @Autowired private GenTableService genTableService; /** @@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_data"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestData"); @@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); // 子表 GenTable genTableChild = new GenTable(); genTableChild.setIsNewRecord(true); genTableChild.setTableName("test_data_child"); + genTableChild.setDataSourceName(dataSourceName); genTableChild = genTableService.getFromDb(genTableChild); genTableChild.setIsNewRecord(true); genTableChild.setClassName("TestDataChild"); @@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests { genTableChild.setParentTableName("test_data"); genTableChild.setParentTableFkName("test_data_id"); initGenTableColumn(genTableChild); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTableChild); } - + /** * 代码生成测试数据（列初始化） */ @@ -151,7 +156,7 @@ public class InitTestData extends BaseInitDataTests { } } } - + /** * 代码生成树表测试数据 */ @@ -159,6 +164,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_tree"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestTree"); @@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewName", "tree_name"); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); } diff --git a/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java index 376844b7..7377c7df 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java @@ -4,6 +4,7 @@ */ package com.jeesite.modules.test.db; +import com.jeesite.common.datasource.DataSourceHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests { initGenDemoData(); return true; } - + @Autowired private GenTableService genTableService; /** @@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_data"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestData"); @@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); // 子表 GenTable genTableChild = new GenTable(); genTableChild.setIsNewRecord(true); genTableChild.setTableName("test_data_child"); + genTableChild.setDataSourceName(dataSourceName); genTableChild = genTableService.getFromDb(genTableChild); genTableChild.setIsNewRecord(true); genTableChild.setClassName("TestDataChild"); @@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests { genTableChild.setParentTableName("test_data"); genTableChild.setParentTableFkName("test_data_id"); initGenTableColumn(genTableChild); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTableChild); } - + /** * 代码生成测试数据（列初始化） */ @@ -151,7 +156,7 @@ public class InitTestData extends BaseInitDataTests { } } } - + /** * 代码生成树表测试数据 */ @@ -159,6 +164,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_tree"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestTree"); @@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewName", "tree_name"); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); } diff --git a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java b/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java index 376844b7..7377c7df 100644 --- a/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java +++ b/web/src/main/java/com/jeesite/modules/test/db/InitTestData.java @@ -4,6 +4,7 @@ */ package com.jeesite.modules.test.db; +import com.jeesite.common.datasource.DataSourceHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; @@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests { initGenDemoData(); return true; } - + @Autowired private GenTableService genTableService; /** @@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_data"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestData"); @@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); // 子表 GenTable genTableChild = new GenTable(); genTableChild.setIsNewRecord(true); genTableChild.setTableName("test_data_child"); + genTableChild.setDataSourceName(dataSourceName); genTableChild = genTableService.getFromDb(genTableChild); genTableChild.setIsNewRecord(true); genTableChild.setClassName("TestDataChild"); @@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests { genTableChild.setParentTableName("test_data"); genTableChild.setParentTableFkName("test_data_id"); initGenTableColumn(genTableChild); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTableChild); } - + /** * 代码生成测试数据（列初始化） */ @@ -151,7 +156,7 @@ public class InitTestData extends BaseInitDataTests { } } } - + /** * 代码生成树表测试数据 */ @@ -159,6 +164,7 @@ public class InitTestData extends BaseInitDataTests { GenTable genTable = new GenTable(); genTable.setIsNewRecord(true); genTable.setTableName("test_tree"); + genTable.setDataSourceName(dataSourceName); genTable = genTableService.getFromDb(genTable); genTable.setIsNewRecord(true); genTable.setClassName("TestTree"); @@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests { genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewName", "tree_name"); initGenTableColumn(genTable); + DataSourceHolder.setDataSourceName(dataSourceName); genTableService.save(genTable); }