From fbfe327bab15aa46ba5d5777eae82d0c2e1c4301 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Wed, 11 Apr 2018 22:39:33 +0800
Subject: [PATCH] init data sysout to logger

---
 .../jeesite/modules/sys/db/InitCoreData.java  | 401 ++++++++----------
 web/bin/init-data.bat                         |   2 +-
 web/bin/init-data.sh                          |   2 +-
 3 files changed, 175 insertions(+), 230 deletions(-)

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 f17a29c4..3db5dc48 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
@@ -76,25 +76,20 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 区域、行政区划表
 	 */
 	public void initArea() throws Exception{
-		try{
-			clearTable(Area.class);
-			initExcelData(Area.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Area entity = (Area)params[1];
-						entity.setIsNewRecord(true);
-						areaService.save(entity);
-						return null;
-					}
+		clearTable(Area.class);
+		initExcelData(Area.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Area entity = (Area)params[1];
+					entity.setIsNewRecord(true);
+					areaService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -103,26 +98,21 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 参数配置表
 	 */
 	public void initConfig() throws Exception{
-		try{
-			clearTable(Config.class);
-			initExcelData(Config.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Config entity = (Config)params[1];
-						entity.setId(IdGen.nextId());
-						entity.setIsNewRecord(true);
-						configService.save(entity);
-						return null;
-					}
+		clearTable(Config.class);
+		initExcelData(Config.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Config entity = (Config)params[1];
+					entity.setId(IdGen.nextId());
+					entity.setIsNewRecord(true);
+					configService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 
 	@Autowired
@@ -131,25 +121,20 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 系统模块表
 	 */
 	public void initModule() throws Exception{
-		try{
-			clearTable(Module.class);
-			initExcelData(Module.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Module entity = (Module)params[1];
-						entity.setIsNewRecord(true);
-						moduleService.save(entity);
-						return null;
-					}
+		clearTable(Module.class);
+		initExcelData(Module.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Module entity = (Module)params[1];
+					entity.setIsNewRecord(true);
+					moduleService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -160,41 +145,36 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 系统字典、用户字典表
 	 */
 	public void initDict() throws Exception{
-		try{
-			clearTable(DictType.class);
-			initExcelData(DictType.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						DictType entity = (DictType)params[1];
-						entity.setId(IdGen.nextId());
-						entity.setIsNewRecord(true);
-						dictTypeService.save(entity);
-						return null;
-					}
+		clearTable(DictType.class);
+		initExcelData(DictType.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					DictType entity = (DictType)params[1];
+					entity.setId(IdGen.nextId());
+					entity.setIsNewRecord(true);
+					dictTypeService.save(entity);
 					return null;
 				}
-			});
+				return null;
+			}
+		});
 
-			clearTable(DictData.class);
-			initExcelData(DictData.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						DictData entity = (DictData)params[1];
-						entity.setIsNewRecord(true);
-						dictDataService.save(entity);
-						return null;
-					}
+		clearTable(DictData.class);
+		initExcelData(DictData.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					DictData entity = (DictData)params[1];
+					entity.setIsNewRecord(true);
+					dictDataService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -203,27 +183,22 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 角色表
 	 */
 	public void initRole() throws Exception{
-		try{
-			clearTable(Role.class);
-			clearTable(RoleMenu.class);
-			clearTable(RoleDataScope.class);
-			initExcelData(Role.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Role entity = (Role)params[1];
-						entity.setIsNewRecord(true);
-						roleService.save(entity);
-						return null;
-					}
+		clearTable(Role.class);
+		clearTable(RoleMenu.class);
+		clearTable(RoleDataScope.class);
+		initExcelData(Role.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Role entity = (Role)params[1];
+					entity.setIsNewRecord(true);
+					roleService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 
 	@Autowired
@@ -234,30 +209,25 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 菜单表
 	 */
 	public void initMenu() throws Exception{
-		try{
-			clearTable(Menu.class);
-			clearTable(RoleMenu.class);
-			initExcelData(Menu.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Menu entity = (Menu)params[1];
-						entity.setIsNewRecord(true);
-						menuService.save(entity);
-						RoleMenu rm = new RoleMenu();
-						rm.setMenuCode(entity.getMenuCode());
-						rm.setRoleCode(Role.CORP_ADMIN_ROLE_CODE);
-						roleMenuDao.insert(rm);
-						return null;
-					}
+		clearTable(Menu.class);
+		clearTable(RoleMenu.class);
+		initExcelData(Menu.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Menu entity = (Menu)params[1];
+					entity.setIsNewRecord(true);
+					menuService.save(entity);
+					RoleMenu rm = new RoleMenu();
+					rm.setMenuCode(entity.getMenuCode());
+					rm.setRoleCode(Role.CORP_ADMIN_ROLE_CODE);
+					roleMenuDao.insert(rm);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -266,28 +236,23 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 用户表
 	 */
 	public void initUser() throws Exception{
-		try{
-			clearTable(User.class);
-			clearTable(UserRole.class);
-			clearTable(UserDataScope.class);
-			initExcelData(User.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						User entity = (User)params[1];
-						entity.setIsNewRecord(true);
-						entity.setPassword(UserService.encryptPassword(entity.getPassword()));
-						userService.save(entity);
-						return null;
-					}
+		clearTable(User.class);
+		clearTable(UserRole.class);
+		clearTable(UserDataScope.class);
+		initExcelData(User.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					User entity = (User)params[1];
+					entity.setIsNewRecord(true);
+					entity.setPassword(UserService.encryptPassword(entity.getPassword()));
+					userService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -296,25 +261,20 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 组织机构、部门表
 	 */
 	public void initOffice() throws Exception{
-		try{
-			clearTable(Office.class);
-			initExcelData(Office.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Office entity = (Office)params[1];
-						entity.setIsNewRecord(true);
-						officeService.save(entity);
-						return null;
-					}
+		clearTable(Office.class);
+		initExcelData(Office.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Office entity = (Office)params[1];
+					entity.setIsNewRecord(true);
+					officeService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 
 	@Autowired
@@ -323,26 +283,21 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 公司表
 	 */
 	public void initCompany() throws Exception{
-		try{
-			clearTable(Company.class);
-			clearTable(CompanyOffice.class);
-			initExcelData(Company.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Company entity = (Company)params[1];
-						entity.setIsNewRecord(true);
-						companyService.save(entity);
-						return null;
-					}
+		clearTable(Company.class);
+		clearTable(CompanyOffice.class);
+		initExcelData(Company.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Company entity = (Company)params[1];
+					entity.setIsNewRecord(true);
+					companyService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 
 	@Autowired
@@ -351,25 +306,20 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 岗位表
 	 */
 	public void initPost() throws Exception{
-		try{
-			clearTable(Post.class);
-			initExcelData(Post.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("save".equals(action)){
-						Post entity = (Post)params[1];
-						entity.setIsNewRecord(true);
-						postService.save(entity);
-						return null;
-					}
+		clearTable(Post.class);
+		initExcelData(Post.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("save".equals(action)){
+					Post entity = (Post)params[1];
+					entity.setIsNewRecord(true);
+					postService.save(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 	
 	@Autowired
@@ -378,41 +328,36 @@ public class InitCoreData extends BaseInitDataTests {
 	 * 员工、用户表
 	 */
 	public void initEmpUser() throws Exception{
-		try{
-			clearTable(Employee.class);
-			clearTable(EmployeePost.class);
-			initExcelData(EmpUser.class, new MethodCallback() {
-				@Override
-				public Object execute(Object... params) {
-					String action = (String)params[0];
-					if("set".equals(action)){
-						EmpUser entity = (EmpUser)params[1];
-						String header = (String)params[2];
-						String val = (String)params[3];
-						if ("userRoleString".equals(header)){
-							entity.setUserRoleString(val);
-							return true;
-						}else if ("employee.employeePosts".equals(header)){
-							entity.getEmployee().setEmployeePosts(new String[]{val});
-							return true;
-						}
-					}
-					else if("save".equals(action)){
-						EmpUser entity = (EmpUser)params[1];
-						entity.setIsNewRecord(true);
-						entity.setPassword(UserService.encryptPassword(entity.getPassword()));
-						empUserService.save(entity);
-						// 设置当前为管理员，否则无法保存用户角色关系
-						entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE));
-						userService.saveAuth(entity);
-						return null;
+		clearTable(Employee.class);
+		clearTable(EmployeePost.class);
+		initExcelData(EmpUser.class, new MethodCallback() {
+			@Override
+			public Object execute(Object... params) {
+				String action = (String)params[0];
+				if("set".equals(action)){
+					EmpUser entity = (EmpUser)params[1];
+					String header = (String)params[2];
+					String val = (String)params[3];
+					if ("userRoleString".equals(header)){
+						entity.setUserRoleString(val);
+						return true;
+					}else if ("employee.employeePosts".equals(header)){
+						entity.getEmployee().setEmployeePosts(new String[]{val});
+						return true;
 					}
+				}
+				else if("save".equals(action)){
+					EmpUser entity = (EmpUser)params[1];
+					entity.setIsNewRecord(true);
+					entity.setPassword(UserService.encryptPassword(entity.getPassword()));
+					empUserService.save(entity);
+					// 设置当前为管理员，否则无法保存用户角色关系
+					entity.setCurrentUser(new User(User.SUPER_ADMIN_CODE));
+					userService.saveAuth(entity);
 					return null;
 				}
-			});
-		}catch(Exception e){
-			e.printStackTrace();
-			throw new Exception(e);
-		}
+				return null;
+			}
+		});
 	}
 }
diff --git a/web/bin/init-data.bat b/web/bin/init-data.bat
index 6bff8183..532eb908 100644
--- a/web/bin/init-data.bat
+++ b/web/bin/init-data.bat
@@ -36,6 +36,6 @@ echo.
 cd %~dp0
 
 cd ../
-call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData
+call mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData -U
 
 pause
\ No newline at end of file
diff --git a/web/bin/init-data.sh b/web/bin/init-data.sh
index 4583cfb4..83523d3a 100644
--- a/web/bin/init-data.sh
+++ b/web/bin/init-data.sh
@@ -16,4 +16,4 @@ echo "\n[信息] 您真的确认继续吗？否则请关闭窗口。（1）\n"
 read -s -n1 -p "请按任意键继续 ... "
 
 cd ..
-mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData
+mvn test -Dtest=com.jeesite.test.InitCoreData,com.jeesite.test.InitGenData -U