manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
thinkgem
2024-04-30 18:00:08 +08:00
parent 97ef1fdec1
commit 2e8cc49dfa
5 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cms/src/main/java/com/jeesite/modules/cms/db/InitCmsData.java
View File

@@ -33,7 +33,6 @@ public class InitCmsData extends BaseInitDataTests {
if (GenUtils.isTableExists(Global.getTablePrefix() + "cms_article")) { if (GenUtils.isTableExists(Global.getTablePrefix() + "cms_article")) {
return true; // 如果表已存在，则无需初始化 return true; // 如果表已存在，则无需初始化
} }
this.runCreateScript("cms.sql"); this.runCreateScript("cms.sql");
this.initModuleInfo("cms"); this.initModuleInfo("cms");
this.initModuleMenu("/cms/index"); this.initModuleMenu("/cms/index");
@@ -42,7 +41,6 @@ public class InitCmsData extends BaseInitDataTests {
this.initCategory(); this.initCategory();
this.initArticle(); this.initArticle();
this.initArticleData(); this.initArticleData();
return true; return true;
} }

2
modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.java
View File

@@ -365,7 +365,7 @@ public class InitCoreData extends BaseInitDataTests {
@Override @Override
public int getPhase() { 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
} }
} }

13
web-api/src/main/java/com/jeesite/modules/test/db/InitTestData.java
View File

@@ -4,6 +4,7 @@
*/ */
package com.jeesite.modules.test.db; package com.jeesite.modules.test.db;
import com.jeesite.common.datasource.DataSourceHolder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests {
initGenDemoData(); initGenDemoData();
return true; return true;
} }
@Autowired @Autowired
private GenTableService genTableService; private GenTableService genTableService;
/** /**
@@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests {
GenTable genTable = new GenTable(); GenTable genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_data"); genTable.setTableName("test_data");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestData"); genTable.setClassName("TestData");
@@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES);
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
// 子表 // 子表
GenTable genTableChild = new GenTable(); GenTable genTableChild = new GenTable();
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setTableName("test_data_child"); genTableChild.setTableName("test_data_child");
genTableChild.setDataSourceName(dataSourceName);
genTableChild = genTableService.getFromDb(genTableChild); genTableChild = genTableService.getFromDb(genTableChild);
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setClassName("TestDataChild"); genTableChild.setClassName("TestDataChild");
@@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests {
genTableChild.setParentTableName("test_data"); genTableChild.setParentTableName("test_data");
genTableChild.setParentTableFkName("test_data_id"); genTableChild.setParentTableFkName("test_data_id");
initGenTableColumn(genTableChild); initGenTableColumn(genTableChild);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTableChild); 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 genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_tree"); genTable.setTableName("test_tree");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestTree"); genTable.setClassName("TestTree");
@@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewCode", "tree_code");
genTable.getOptionMap().put("treeViewName", "tree_name"); genTable.getOptionMap().put("treeViewName", "tree_name");
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
} }

13
web-fast/src/main/java/com/jeesite/modules/test/db/InitTestData.java
View File

@@ -4,6 +4,7 @@
*/ */
package com.jeesite.modules.test.db; package com.jeesite.modules.test.db;
import com.jeesite.common.datasource.DataSourceHolder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests {
initGenDemoData(); initGenDemoData();
return true; return true;
} }
@Autowired @Autowired
private GenTableService genTableService; private GenTableService genTableService;
/** /**
@@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests {
GenTable genTable = new GenTable(); GenTable genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_data"); genTable.setTableName("test_data");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestData"); genTable.setClassName("TestData");
@@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES);
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
// 子表 // 子表
GenTable genTableChild = new GenTable(); GenTable genTableChild = new GenTable();
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setTableName("test_data_child"); genTableChild.setTableName("test_data_child");
genTableChild.setDataSourceName(dataSourceName);
genTableChild = genTableService.getFromDb(genTableChild); genTableChild = genTableService.getFromDb(genTableChild);
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setClassName("TestDataChild"); genTableChild.setClassName("TestDataChild");
@@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests {
genTableChild.setParentTableName("test_data"); genTableChild.setParentTableName("test_data");
genTableChild.setParentTableFkName("test_data_id"); genTableChild.setParentTableFkName("test_data_id");
initGenTableColumn(genTableChild); initGenTableColumn(genTableChild);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTableChild); 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 genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_tree"); genTable.setTableName("test_tree");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestTree"); genTable.setClassName("TestTree");
@@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewCode", "tree_code");
genTable.getOptionMap().put("treeViewName", "tree_name"); genTable.getOptionMap().put("treeViewName", "tree_name");
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
} }

13
web/src/main/java/com/jeesite/modules/test/db/InitTestData.java
View File

@@ -4,6 +4,7 @@
*/ */
package com.jeesite.modules.test.db; package com.jeesite.modules.test.db;
import com.jeesite.common.datasource.DataSourceHolder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -34,7 +35,7 @@ public class InitTestData extends BaseInitDataTests {
initGenDemoData(); initGenDemoData();
return true; return true;
} }
@Autowired @Autowired
private GenTableService genTableService; private GenTableService genTableService;
/** /**
@@ -57,6 +58,7 @@ public class InitTestData extends BaseInitDataTests {
GenTable genTable = new GenTable(); GenTable genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_data"); genTable.setTableName("test_data");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestData"); genTable.setClassName("TestData");
@@ -72,11 +74,13 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("isFileUpload", Global.YES); genTable.getOptionMap().put("isFileUpload", Global.YES);
genTable.getOptionMap().put("isImageUpload", Global.YES); genTable.getOptionMap().put("isImageUpload", Global.YES);
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
// 子表 // 子表
GenTable genTableChild = new GenTable(); GenTable genTableChild = new GenTable();
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setTableName("test_data_child"); genTableChild.setTableName("test_data_child");
genTableChild.setDataSourceName(dataSourceName);
genTableChild = genTableService.getFromDb(genTableChild); genTableChild = genTableService.getFromDb(genTableChild);
genTableChild.setIsNewRecord(true); genTableChild.setIsNewRecord(true);
genTableChild.setClassName("TestDataChild"); genTableChild.setClassName("TestDataChild");
@@ -90,9 +94,10 @@ public class InitTestData extends BaseInitDataTests {
genTableChild.setParentTableName("test_data"); genTableChild.setParentTableName("test_data");
genTableChild.setParentTableFkName("test_data_id"); genTableChild.setParentTableFkName("test_data_id");
initGenTableColumn(genTableChild); initGenTableColumn(genTableChild);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTableChild); 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 genTable = new GenTable();
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setTableName("test_tree"); genTable.setTableName("test_tree");
genTable.setDataSourceName(dataSourceName);
genTable = genTableService.getFromDb(genTable); genTable = genTableService.getFromDb(genTable);
genTable.setIsNewRecord(true); genTable.setIsNewRecord(true);
genTable.setClassName("TestTree"); genTable.setClassName("TestTree");
@@ -176,6 +182,7 @@ public class InitTestData extends BaseInitDataTests {
genTable.getOptionMap().put("treeViewCode", "tree_code"); genTable.getOptionMap().put("treeViewCode", "tree_code");
genTable.getOptionMap().put("treeViewName", "tree_name"); genTable.getOptionMap().put("treeViewName", "tree_name");
initGenTableColumn(genTable); initGenTableColumn(genTable);
DataSourceHolder.setDataSourceName(dataSourceName);
genTableService.save(genTable); genTableService.save(genTable);
} }