优化数据库初始化脚本

common/bin/deploy.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

common/bin/javadoc.bat

@@ -14,4 +14,5 @@ cd %~dp0
 cd ..
 call mvn clean package -Pjavadoc
 
+cd bin
 pause

common/bin/package.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

modules/core/bin/deploy.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

modules/core/bin/javadoc.bat

@@ -14,4 +14,5 @@ cd %~dp0
 cd ..
 call mvn clean package -Pjavadoc
 
+cd bin
 pause

modules/core/bin/package.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

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

@@ -3,8 +3,12 @@
  */
 package com.jeesite.modules.sys.db;
 
+import javax.annotation.PostConstruct;
+
 import org.quartz.CronTrigger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
 
 import com.jeesite.common.callback.MethodCallback;
 import com.jeesite.common.config.Global;
@@ -55,21 +59,15 @@ import com.jeesite.modules.sys.service.UserService;
 /**
  * 初始化核心表数据
  * @author ThinkGem
- * @version 2017-10-22
+ * @version 2019-12-30
  */
+@Component
+@ConditionalOnProperty(name="jeesite.initdata", havingValue="true", matchIfMissing=false)
 public class InitCoreData extends BaseInitDataTests {
 
-	@Override
+	@PostConstruct
-	public void begin() {
+	public void initialize() {
-		StringBuilder info = new StringBuilder("\r\n");
+		super.initialize(InitCoreData.class);
-		info.append("\r\n================ 数据库连接信息 ================\r\n\r\n");
-		info.append("类型: " + Global.getProperty("jdbc.type")+"\r\n");
-		info.append("驱动: " + Global.getProperty("jdbc.driver")+"\r\n");
-		info.append("地址: " + Global.getProperty("jdbc.url")+"\r\n");
-		info.append("用户: " + Global.getProperty("jdbc.username")+"\r\n");
-		info.append("\r\n================================================\r\n");
-		logger.info(info);
-		super.begin(InitCoreData.class);
 	}
 	
 	/**

modules/template/bin/deploy.bat

@@ -0,0 +1,19 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD>𹤳̰汾<CCB0><E6B1BE>Nexus<75><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
+
+cd bin
+cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+pause

modules/template/bin/javadoc.bat

@@ -14,4 +14,5 @@ cd %~dp0
 cd ..
 call mvn clean package -Pjavadoc
 
+cd bin
 pause

modules/template/bin/package.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

parent/bin/deploy.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

parent/bin/package.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

root/bin/clean.bat

@@ -16,4 +16,5 @@ cd %~dp0
 cd ..
 call mvn clean
 
+cd bin
 pause

root/bin/deploy.bat

@@ -0,0 +1,19 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  */
+echo.
+echo [<5B><>Ϣ] <20><><EFBFBD>𹤳̰汾<CCB0><E6B1BE>Nexus<75><73><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+echo.
+
+%~d0
+cd %~dp0
+
+cd ..
+call mvn clean deploy -Dmaven.test.skip=true -Pdeploy
+
+cd bin
+cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+pause

root/bin/javadoc.bat

@@ -14,4 +14,5 @@ cd %~dp0
 cd ..
 call mvn clean package -Pjavadoc
 
+cd bin
 pause

root/bin/package.bat

@@ -5,7 +5,7 @@ rem  *
 rem  * Author: ThinkGem@163.com
 rem  */
 echo.
-echo [<5B><>Ϣ] <20><>װ<EFBFBD><D7B0><EFBFBD><EFBFBD><EFBFBD>زֿ⡣
+echo [<5B><>Ϣ] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><EFBFBD><EFBFBD>̣<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jar<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>
 echo.
 
 %~d0
@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean install -Dmaven.test.skip=true -Ppackage
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

web/bin/clean.bat

@@ -14,4 +14,5 @@ cd %~dp0
 cd ..
 call mvn clean
 
+cd bin
 pause

web/bin/cleanide.bat

@@ -17,4 +17,5 @@ call mvn -Declipse.workspace=%cd% eclipse:clean eclipse:eclipse
 del .classpath
 del .project
 
+cd bin
 pause

web/bin/docker-bulid.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean package docker:build -Dmaven.test.skip=true -U -Pdocker
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

web/bin/docker-bulid.sh

@@ -11,3 +11,5 @@ echo ""
 
 cd ..
 mvn clean package docker:build -Dmaven.test.skip=true -U -Pdocker
+
+cd bin

web/bin/init-data.bat

@@ -37,7 +37,8 @@ cd %~dp0
 
 cd ..
 set "MAVEN_OPTS=%MAVEN_OPTS% -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
-call mvn clean test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitFilemanagerData,com.jeesite.test.InitCoreData -Djeesite.initdata=true -Djdbc.jta.enabled=false -U
+call mvn clean test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData -Djeesite.initdata=true -U
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD>ʼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

web/bin/init-data.sh

@@ -30,4 +30,6 @@ echo ""
 
 cd ..
 MAVEN_OPTS="$MAVEN_OPTS -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
-mvn clean test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitFilemanagerData,com.jeesite.test.InitCoreData -Djeesite.initdata=true -Djdbc.jta.enabled=false -U
+mvn clean test -Dmaven.test.skip=false -Dtest=com.jeesite.test.InitData -Djeesite.initdata=true -Djdbc.jta.enabled=false -U
+
+cd bin

web/bin/package.bat

@@ -14,5 +14,6 @@ cd %~dp0
 cd ..
 call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
 
+cd bin
 cmd /c msg %username% /time:0 /w "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 pause

web/bin/package.sh

@@ -11,3 +11,5 @@ echo ""
 
 cd ..
 mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
+
+cd bin

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();
-	}
-	
-}