diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index cbfbca2..155a733 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 50107af..b25c5d2 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties index 73f944e..214ecea 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -13,11 +13,6 @@ impp.cluster.regist.center=http://reg.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ -################ 功能配置2 ################ -#是否允许前端跨域提交impp.web.cross.hosts -impp.web.cross = true - -################ 授权过滤配置 ################ #用户登陆路径 filter.shiro.user.loginuri = /login #系统管理员登陆路径 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 58de670..2fdf9a3 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=dev +spring.profiles.active=test ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java index dd6f15e..55718e7 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java @@ -141,6 +141,7 @@ public class TestExcelPermission extends TestBase { obj.setUserInfoId(Long.parseLong(row.getCell(5).getStringCellValue())); obj.setUserName(row.getCell(6).getStringCellValue()); obj.setIsValid(1); + obj.setUserStatus(1); obj.setUserType(1); obj.setUserLoginNum(0); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java index 69ad6a8..43ec295 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java @@ -1,207 +1,207 @@ -//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -// -//import cn.estsh.i3plus.pojo.platform.bean.*; -//import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; -//import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; -//import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; -//import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; -//import org.apache.poi.ss.usermodel.Row; -//import org.apache.poi.xssf.usermodel.XSSFSheet; -//import org.apache.poi.xssf.usermodel.XSSFWorkbook; -//import org.junit.Test; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -// -//import java.io.InputStream; -//import java.util.ArrayList; -//import java.util.List; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2018-11-22 11:01 -// * @Modify: -// **/ -//public class TestExcelSysConfig extends TestBase { -// -// public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class); -// -// // 文件路径 -// public static final String PATH_NAME = "init/sys-config.xlsx"; -// // 权限Sheet 名称 -// public static final String SHEET_SYS_CONFIG = "sys-config"; -// public static final String SHEET_DICTIONARY = "dictionary"; -// public static final String SHEET_LANGUAGE = "language"; -// public static final String SHEET_RESOURCE = "resource"; -// -// @Autowired -// private SysConfigRepository sysConfigRDao; -// @Autowired -// private SysDictionaryRepository sysDictionaryRDao; -// @Autowired -// private SysLocaleLanguageRepository sysLocaleLanguageRDao; -// @Autowired -// private SysLocaleResourceRepository sysLocaleResourceRDao; -// -// @Test -// public void testInit() throws Exception { -// XSSFWorkbook workbook = getWorkbook(PATH_NAME); -// if(workbook != null){ -// XSSFSheet sheetSysConfig = workbook.getSheet(SHEET_SYS_CONFIG); -// XSSFSheet sheetDictionary = workbook.getSheet(SHEET_DICTIONARY); -// XSSFSheet sheetLanguage = workbook.getSheet(SHEET_LANGUAGE); -// XSSFSheet sheetResource = workbook.getSheet(SHEET_RESOURCE); -// -// List sysConfigList = getSysConfig(sheetSysConfig); -// List sysDictionaryList = getSysDictionary(sheetDictionary); -// List sysLocaleLanguageList = getSysLocaleLanguage(sheetLanguage); -// List sysLocaleResourceList= getSysLocaleResource(sheetResource); -// -// LOGGER.info("System Init SysConfig Size:{}",sysConfigList.size()); -// LOGGER.info("System Init SysDictionary Size:{}",sysDictionaryList.size()); -// LOGGER.info("System Init SysLocaleLanguage Size:{}",sysLocaleLanguageList.size()); -// LOGGER.info("System Init SysLocaleResource Size:{}",sysLocaleResourceList.size()); -// -// sysConfigRDao.saveAll(sysConfigList); -// sysDictionaryRDao.saveAll(sysDictionaryList); -// sysLocaleLanguageRDao.saveAll(sysLocaleLanguageList); -// sysLocaleResourceRDao.saveAll(sysLocaleResourceList); -// } -// } -// -// public List getSysConfig(XSSFSheet sheet){ -// List result = new ArrayList<>(); -// if(sheet != null){ -// if(sheet.getLastRowNum() >= 1){ -// SysConfig obj = null; -// for (int i = 1; i <= sheet.getLastRowNum(); i++) { -// try { -// Row row = sheet.getRow(i);//获取索引为i的行，以0开始 -// if(row.getCell(0).toString().trim().length() > 0){ -// obj = new SysConfig(); -// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); -// obj.setName(row.getCell(1).getStringCellValue()); -// obj.setConfigType(Integer.valueOf(row.getCell(2).getStringCellValue())); -// obj.setConfigCode(row.getCell(3).getStringCellValue()); -// obj.setConfigValue(row.getCell(4).getStringCellValue()); -// obj.setConfigDescription(row.getCell(5).getStringCellValue()); -// obj.setIsValid(1); -// -// result.add(obj); -// } -// }catch (Exception e){ -// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); -// } -// } -// } -// } -// return result; -// } -// -// public List getSysDictionary(XSSFSheet sheet){ -// List result = new ArrayList<>(); -// if(sheet != null){ -// if(sheet.getLastRowNum() >= 1){ -// SysDictionary obj = null; -// for (int i = 1; i <= sheet.getLastRowNum(); i++) { -// try { -// Row row = sheet.getRow(i);//获取索引为i的行，以0开始 -// if(row.getCell(0).toString().trim().length() > 0){ -// obj = new SysDictionary(); -// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); -// obj.setName(row.getCell(1).getStringCellValue()); -// obj.setDictionaryCode(row.getCell(2).getStringCellValue()); -// obj.setParentId(Long.valueOf(row.getCell(3).getStringCellValue())); -// obj.setParentNameRdd(row.getCell(4).getStringCellValue()); -// obj.setParentCodeRdd(row.getCell(5).getStringCellValue()); -// obj.setDictionaryValue(row.getCell(6).getStringCellValue()); -// obj.setDictionarySort(Integer.valueOf(row.getCell(7).getStringCellValue())); -// obj.setDictionaryDescription(row.getCell(8).getStringCellValue()); -// obj.setIsValid(1); -// -// result.add(obj); -// } -// }catch (Exception e){ -// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); -// } -// } -// } -// } -// return result; -// } -// -// public List getSysLocaleLanguage(XSSFSheet sheet){ -// List result = new ArrayList<>(); -// if(sheet != null){ -// if(sheet.getLastRowNum() >= 1){ -// SysLocaleLanguage obj = null; -// for (int i = 1; i <= sheet.getLastRowNum(); i++) { -// try { -// Row row = sheet.getRow(i);//获取索引为i的行，以0开始 -// if(row.getCell(0).toString().trim().length() > 0){ -// obj = new SysLocaleLanguage(); -// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); -// obj.setLanguageName(row.getCell(1).getStringCellValue()); -// obj.setLanguageCode(row.getCell(2).getStringCellValue()); -// obj.setLanguageSort(Integer.valueOf(row.getCell(3).getStringCellValue())); -// obj.setIsDefault(Integer.valueOf(row.getCell(4).getStringCellValue())); -// obj.setLanguageStatus(Integer.valueOf(row.getCell(5).getStringCellValue())); -// obj.setIsValid(1); -// -// result.add(obj); -// } -// }catch (Exception e){ -// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); -// } -// } -// } -// } -// return result; -// } -// -// public List getSysLocaleResource(XSSFSheet sheet){ -// List result = new ArrayList<>(); -// if(sheet != null){ -// if(sheet.getLastRowNum() >= 1){ -// SysLocaleResource obj = null; -// for (int i = 1; i <= sheet.getLastRowNum(); i++) { -// try { -// Row row = sheet.getRow(i);//获取索引为i的行，以0开始 -// if(row.getCell(0).toString().trim().length() > 0){ -// obj = new SysLocaleResource(); -// obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); -// obj.setResourceType(Integer.valueOf(row.getCell(1).getStringCellValue())); -// obj.setLanguageCode(row.getCell(2).getStringCellValue()); -// obj.setLanguageNameRdd(row.getCell(3).getStringCellValue()); -// obj.setResourceKey(row.getCell(4).getStringCellValue()); -// obj.setResourceValue(row.getCell(5).getStringCellValue()); -// obj.setIsSystem(Integer.valueOf(row.getCell(6).getStringCellValue())); -// obj.setIsValid(1); -// -// result.add(obj); -// } -// }catch (Exception e){ -// LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); -// } -// } -// } -// } -// return result; -// } -// -// -// public XSSFWorkbook getWorkbook(String pathName){ -// try { -// InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); -// XSSFWorkbook workbook = new XSSFWorkbook(in); -// return workbook; -// }catch (Exception e){ -// LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); -// e.getMessage(); -// return null; -// } -// } -// -//} +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.pojo.platform.bean.*; +import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; +import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-22 11:01 + * @Modify: + **/ +public class TestExcelSysConfig extends TestBase { + + public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class); + + // 文件路径 + public static final String PATH_NAME = "init/sys-config.xlsx"; + // 权限Sheet 名称 + public static final String SHEET_SYS_CONFIG = "sys-config"; + public static final String SHEET_DICTIONARY = "dictionary"; + public static final String SHEET_LANGUAGE = "language"; + public static final String SHEET_RESOURCE = "resource"; + + @Autowired + private SysConfigRepository sysConfigRDao; + @Autowired + private SysDictionaryRepository sysDictionaryRDao; + @Autowired + private SysLocaleLanguageRepository sysLocaleLanguageRDao; + @Autowired + private SysLocaleResourceRepository sysLocaleResourceRDao; + + @Test + public void testInit() throws Exception { + XSSFWorkbook workbook = getWorkbook(PATH_NAME); + if(workbook != null){ + XSSFSheet sheetSysConfig = workbook.getSheet(SHEET_SYS_CONFIG); + XSSFSheet sheetDictionary = workbook.getSheet(SHEET_DICTIONARY); + XSSFSheet sheetLanguage = workbook.getSheet(SHEET_LANGUAGE); + XSSFSheet sheetResource = workbook.getSheet(SHEET_RESOURCE); + + List sysConfigList = getSysConfig(sheetSysConfig); + List sysDictionaryList = getSysDictionary(sheetDictionary); + List sysLocaleLanguageList = getSysLocaleLanguage(sheetLanguage); + List sysLocaleResourceList= getSysLocaleResource(sheetResource); + + LOGGER.info("System Init SysConfig Size:{}",sysConfigList.size()); + LOGGER.info("System Init SysDictionary Size:{}",sysDictionaryList.size()); + LOGGER.info("System Init SysLocaleLanguage Size:{}",sysLocaleLanguageList.size()); + LOGGER.info("System Init SysLocaleResource Size:{}",sysLocaleResourceList.size()); + + sysConfigRDao.saveAll(sysConfigList); + sysDictionaryRDao.saveAll(sysDictionaryList); + sysLocaleLanguageRDao.saveAll(sysLocaleLanguageList); + sysLocaleResourceRDao.saveAll(sysLocaleResourceList); + } + } + + public List getSysConfig(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysConfig obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysConfig(); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setName(row.getCell(1).getStringCellValue()); + obj.setConfigType(Integer.valueOf(row.getCell(2).getStringCellValue())); + obj.setConfigCode(row.getCell(3).getStringCellValue()); + obj.setConfigValue(row.getCell(4).getStringCellValue()); + obj.setConfigDescription(row.getCell(5).getStringCellValue()); + obj.setIsValid(1); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysDictionary(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysDictionary obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysDictionary(); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setName(row.getCell(1).getStringCellValue()); + obj.setDictionaryCode(row.getCell(2).getStringCellValue()); + obj.setParentId(Long.valueOf(row.getCell(3).getStringCellValue())); + obj.setParentNameRdd(row.getCell(4).getStringCellValue()); + obj.setParentCodeRdd(row.getCell(5).getStringCellValue()); + obj.setDictionaryValue(row.getCell(6).getStringCellValue()); + obj.setDictionarySort(Integer.valueOf(row.getCell(7).getStringCellValue())); + obj.setDictionaryDescription(row.getCell(8).getStringCellValue()); + obj.setIsValid(1); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysLocaleLanguage(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysLocaleLanguage obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysLocaleLanguage(); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setLanguageName(row.getCell(1).getStringCellValue()); + obj.setLanguageCode(row.getCell(2).getStringCellValue()); + obj.setLanguageSort(Integer.valueOf(row.getCell(3).getStringCellValue())); + obj.setIsDefault(Integer.valueOf(row.getCell(4).getStringCellValue())); + obj.setLanguageStatus(Integer.valueOf(row.getCell(5).getStringCellValue())); + obj.setIsValid(1); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysLocaleResource(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysLocaleResource obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysLocaleResource(); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setResourceType(Integer.valueOf(row.getCell(1).getStringCellValue())); + obj.setLanguageCode(row.getCell(2).getStringCellValue()); + obj.setLanguageNameRdd(row.getCell(3).getStringCellValue()); + obj.setResourceKey(row.getCell(4).getStringCellValue()); + obj.setResourceValue(row.getCell(5).getStringCellValue()); + obj.setIsSystem(Integer.valueOf(row.getCell(6).getStringCellValue())); + obj.setIsValid(1); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + + public XSSFWorkbook getWorkbook(String pathName){ + try { + InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); + XSSFWorkbook workbook = new XSSFWorkbook(in); + return workbook; + }catch (Exception e){ + LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); + e.getMessage(); + return null; + } + } + +} diff --git a/pom.xml b/pom.xml index 0a79893..b2b1556 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice