优化数据库初始化脚本

web/src/test/java/com/jeesite/test/InitCoreData.java

@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- */
-package com.jeesite.test;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ActiveProfiles;
-
-import com.jeesite.modules.Application;
-
-/**
- * 初始化核心表数据
- * @author ThinkGem
- * @version 2017-10-22
- */
-@ActiveProfiles("test")
-@SpringBootTest(classes=Application.class)
-@Rollback(false)
-public class InitCoreData extends com.jeesite.modules.sys.db.InitCoreData {
-	
-	@Test
-	public void initCoreData() throws Exception{
-		createTable();
-		initLog();
-		initArea("3700","3701","3702");
-		initConfig();
-		initModule();
-		initDict();
-		initRole();
-		initMenu();
-		initUser();
-		initOffice();
-		initCompany();
-		initPost();
-		initEmpUser();
-		initMsgPushJob();
-		initGenTestData();
-		initGenTreeData();
-	}
-	
-}

web/src/test/java/com/jeesite/test/InitData.java

@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ */
+package com.jeesite.test;
+
+import org.junit.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import com.jeesite.common.tests.BaseInitDataTests;
+import com.jeesite.common.utils.SpringUtils;
+import com.jeesite.modules.Application;
+import com.jeesite.modules.filemanager.db.InitFilemanagerData;
+import com.jeesite.modules.sys.db.InitCoreData;
+
+/**
+ * 初始化数据表
+ * @author ThinkGem
+ * @version 2019-12-30
+ */
+@ActiveProfiles("test")
+@SpringBootTest(classes=Application.class)
+public class InitData extends BaseInitDataTests {
+
+	@Test
+	public void initStep01() throws Exception{
+		initCoreData();			// 核心模块
+	}
+	
+	@Test
+	public void initStep02() throws Exception{
+		initFilemanagerData();	// 文件管理模块
+	}
+	
+	/**
+	 * 初始化核心模块表及数据
+	 */
+	public void initCoreData() throws Exception{
+		InitCoreData data = SpringUtils.getBean(InitCoreData.class);
+		data.createTable();
+		data.initLog();
+		data.initArea("3700","3701","3702");
+		data.initConfig();
+		data.initModule();
+		data.initDict();
+		data.initRole();
+		data.initMenu();
+		data.initUser();
+		data.initOffice();
+		data.initCompany();
+		data.initPost();
+		data.initEmpUser();
+		data.initMsgPushJob();
+		data.initGenTestData();
+		data.initGenTreeData();
+	}
+	
+	/**
+	 * 初始化文件管理模块表及数据
+	 */
+	public void initFilemanagerData() throws Exception{
+		InitFilemanagerData data = SpringUtils.getBean(InitFilemanagerData.class);
+		data.createTable();
+		data.initFilemanagerFolder();
+	}
+
+}

web/src/test/java/com/jeesite/test/InitFilemanagerData.java

@@ -1,29 +0,0 @@
-/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
- */
-package com.jeesite.test;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ActiveProfiles;
-
-import com.jeesite.modules.Application;
-
-/**
- * 初始化文件管理表数据
- * @author ThinkGem
- * @version 2019-4-7
- */
-@ActiveProfiles("test")
-@SpringBootTest(classes=Application.class)
-@Rollback(false)
-public class InitFilemanagerData extends com.jeesite.modules.filemanager.db.InitFilemanagerData {
-	
-	@Test
-	public void initFilemanagerData() throws Exception{
-		createTable();
-		initFilemanagerFolder();
-	}
-	
-}