From 126e23e3cd9cb11c1b67bbe7343e98d46f00e99e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 7 Dec 2018 19:00:02 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AEpom=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BAtest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 6e2cbcd..7484e99 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-SNAPSHOT + 1.0-SNAPSHOT-TEST ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index b2956cc..276d7e4 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-SNAPSHOT + 1.0-SNAPSHOT-TEST ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 4f991fd..621ffd8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-SNAPSHOT + 1.0-SNAPSHOT-TEST modules/i3plus-core-api modules/i3plus-core-apiservice From b84402a40a0ae7e02fdd491d77c06f5021d686e3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 7 Dec 2018 21:23:49 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 18 +- .../src/main/resources/application-prod.properties | 22 +- .../src/main/resources/application-test.properties | 22 +- .../serviceimpl/busi/TestExcelPermission.java | 1 + .../serviceimpl/busi/TestExcelSysConfig.java | 414 ++++++++++----------- 5 files changed, 239 insertions(+), 238 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 2238e12..f79b292 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -106,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 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 3fa9e90..73f944e 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8100 +server.port=1100 #本机ip impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） @@ -84,7 +84,7 @@ spring.zipkin.base-url=${impp.console.ip} spring.sleuth.sampler.probability=1.0 ################ 日志据源 ################ -spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.database=prodMongoDBSource spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.username=sa spring.data.mongodb.password=i3plus @@ -106,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index 9c7ae55..3dbaed7 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8100 +server.port=58100 #本机ip impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） @@ -84,7 +84,7 @@ spring.zipkin.base-url=${impp.console.ip} spring.sleuth.sampler.probability=1.0 ################ 日志据源 ################ -spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.database=testMongoDBSource spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.username=sa spring.data.mongodb.password=i3plus @@ -106,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 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; + } + } + +} From b6caf12c92a28ad4fa723d2f7dbf2189d88a334b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 7 Dec 2018 21:47:12 +0800 Subject: [PATCH 03/16] =?UTF-8?q?test=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 26 +- .../src/main/resources/application-prod.properties | 99 ++++- .../src/main/resources/application-test.properties | 73 ++-- .../src/main/resources/application.properties | 2 +- .../serviceimpl/busi/TestExcelPermission.java | 1 + .../serviceimpl/busi/TestExcelSysConfig.java | 414 ++++++++++----------- 6 files changed, 348 insertions(+), 267 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 200f57a..f79b292 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,15 +1,15 @@ #项目端口 server.port=8100 #本机ip -impp.server.ip=192.168.1.20 +impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://192.168.1.20:8010 +impp.console.ip=http://csd.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 -impp.cluster.fetch=false +impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://192.168.1.20:8000/eureka/ +impp.cluster.regist.center=http://regd.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ @@ -106,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 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 b488919..73f944e 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -1,6 +1,23 @@ #项目端口 -server.port=8100 +server.port=1100 +#本机ip +impp.server.ip=192.168.1.56 +#console控制台服务（zipkin追踪全路径） +impp.console.ip=http://cs.estsh.com +################ 功能配置1 ################ +#若无法连接注册中心，是否需要一直检测加入 +impp.cluster.fetch=true +#服务注册中心 +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 #系统管理员登陆路径 @@ -15,13 +32,63 @@ filter.shiro.admin.filteruri = /adoperate/* #用户授权过滤路径 filter.shiro.saadmin.filteruri = /saoperate/* -#是否允许前端跨域提交impp.web.cross.hosts -impp.web.cross = false -#允许前端跨域提交ip地址，多个以逗号分隔 -impp.web.cross.hosts = http://localhost +################ 云配置 （以projectName作为应用名） ################ +#是否开启微服 +eureka.client.enabled=true +#（参数配置）注册中心地址 -》 i3plus-ics，多个用逗号分隔 +eureka.client.service-url.defaultZone=${impp.cluster.regist.center} +#区域（源码中包含defaultZone，所以默认使用defaultZone） +#eureka.client.region=estsh +#eureka.client.service-url.estsh:http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ + +################ 本机微服配置 ################ +#本服务主机ip（若多个网卡，则需要设置本服务ip） +eureka.instance.ip-address=${impp.server.ip} +#本服务实例ID +eureka.instance.instance-id=${impp.server.ip}:${server.port} +#本服务主机名 +eureka.instance.hostname=${impp.server.ip} +#本服务状态页面 +eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html +#将自己的IP注册到Eureka Server。若不配置或设置为false，表示注册微服务所在操作系统的hostname到Eureka Server +eureka.instance.prefer-ip-address=true +#是否进行健康检查 +eureka.client.healthcheck.enabled=true + +################ 检测机制 ################ +#心跳间隔周期，宕机限制（秒），30秒没反应视为宕机 +eureka.instance.lease-expiration-duration-in-seconds=30 +#心跳周期 +eureka.instance.lease-renewal-interval-in-seconds=20 + +#打开feign的熔断 +feign.hystrix.enabled=true +#读取数据时长 +ribbon.ReadTimeout=3000 +#连接时长 +ribbon.ConnectTimeout=3000 +#重试 +ribbon.maxAutoRetries=2 +#响应超过时长，进行熔断（熔断超时需要大于读取时长及连接时长） +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000 + +#集群名 +eureka.instance.metadata-map.cluster=impp_cluster + +################ 链路追踪 ################ +#使用web方式传输信息 +spring.zipkin.sender.type=web +#链路追踪服务的地址 +spring.zipkin.base-url=${impp.console.ip} +#追踪深度，百分比，1是全部 +spring.sleuth.sampler.probability=1.0 -################ log-db据源 ################ -spring.data.mongodb.uri=mongodb://sa:i3plus@192.168.1.55:27017/i3plus +################ 日志据源 ################ +spring.data.mongodb.database=prodMongoDBSource +spring.data.mongodb.uri=192.168.1.55:27017 +spring.data.mongodb.username=sa +spring.data.mongodb.password=i3plus +spring.data.mongodb.port=27017 ################ 主数据源 ################ # mysql @@ -39,22 +106,22 @@ spring.data.mongodb.uri=mongodb://sa:i3plus@192.168.1.55:27017/i3plus ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3309/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index 7a27313..3dbaed7 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -1,5 +1,22 @@ #项目端口 -server.port=51010 +server.port=58100 +#本机ip +impp.server.ip=192.168.1.56 +#console控制台服务（zipkin追踪全路径） +impp.console.ip=http://cst.estsh.com + +################ 功能配置1 ################ +#若无法连接注册中心，是否需要一直检测加入 +impp.cluster.fetch=true +#服务注册中心 +impp.cluster.regist.center=http://regt.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 @@ -15,43 +32,37 @@ filter.shiro.admin.filteruri = /adoperate/* #用户授权过滤路径 filter.shiro.saadmin.filteruri = /saoperate/* -################ 跨域提交 ################ -#是否允许前端跨域提交impp.web.cross.hosts -impp.web.cross = true - ################ 云配置 （以projectName作为应用名） ################ -#若无法连接注册中心，是否需要一直检测加入 -impp.cluster.fetch=false #是否开启微服 -eureka.client.enabled=false +eureka.client.enabled=true #（参数配置）注册中心地址 -》 i3plus-ics，多个用逗号分隔 -eureka.client.service-url.defaultZone=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ +eureka.client.service-url.defaultZone=${impp.cluster.regist.center} #区域（源码中包含defaultZone，所以默认使用defaultZone） #eureka.client.region=estsh #eureka.client.service-url.estsh:http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ -#### 本机微服配置 #### +################ 本机微服配置 ################ #本服务主机ip（若多个网卡，则需要设置本服务ip） -eureka.instance.ip-address=192.168.1.20 +eureka.instance.ip-address=${impp.server.ip} #本服务实例ID -#eureka.instance.instance-id=${eureka.instance.ip-address}:${server.port} +eureka.instance.instance-id=${impp.server.ip}:${server.port} #本服务主机名 -#eureka.instance.hostname=${eureka.instance.ip-address} +eureka.instance.hostname=${impp.server.ip} #本服务状态页面 -eureka.instance.status-page-url=http://${eureka.instance.ip-address}:${server.port}/swagger-ui.html +eureka.instance.status-page-url=http://${impp.server.ip}:${server.port}/swagger-ui.html #将自己的IP注册到Eureka Server。若不配置或设置为false，表示注册微服务所在操作系统的hostname到Eureka Server eureka.instance.prefer-ip-address=true #是否进行健康检查 eureka.client.healthcheck.enabled=true -#### 检测机制 #### -#心跳间隔周期，宕机限制（秒），90秒没反应视为宕机 +################ 检测机制 ################ +#心跳间隔周期，宕机限制（秒），30秒没反应视为宕机 eureka.instance.lease-expiration-duration-in-seconds=30 #心跳周期 eureka.instance.lease-renewal-interval-in-seconds=20 #打开feign的熔断 -feign.hystrix.enabled=false +feign.hystrix.enabled=true #读取数据时长 ribbon.ReadTimeout=3000 #连接时长 @@ -64,14 +75,16 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000 #集群名 eureka.instance.metadata-map.cluster=impp_cluster -#### 链路追踪 #### +################ 链路追踪 ################ +#使用web方式传输信息 +spring.zipkin.sender.type=web #链路追踪服务的地址 -spring.zipkin.base-url=http://192.168.1.20:8010 +spring.zipkin.base-url=${impp.console.ip} #追踪深度，百分比，1是全部 spring.sleuth.sampler.probability=1.0 ################ 日志据源 ################ -spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.database=testMongoDBSource spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.username=sa spring.data.mongodb.password=i3plus @@ -93,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=impp_test_zzm -impp.write.datasource.password=123456 +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=impp_test_zzm -impp.read.datasource.password=123456 +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/test_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=impp_test_zzm -impp.schedule.datasource.password=123456 +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 @@ -157,4 +170,4 @@ spring.datasource.validationQuery=SELECT 1 #表关系create,create-drop,update,validate spring.jpa.properties.hibernate.hbm2ddl.auto=update #是否显示sql -spring.jpa.show-sql=true +spring.jpa.show-sql=true \ No newline at end of file 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; + } + } + +} From 42a9154afe713a2488f1ddd9064300dc0f4a4006 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 7 Dec 2018 22:34:32 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index cd0b29c..6e2cbcd 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-SNAPSHOT-DEV + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index b030067..b2956cc 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-SNAPSHOT-DEV + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index e6c618a..4f991fd 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-SNAPSHOT-DEV + 1.0-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice From c98297b3da3e772b28fbf13d41a0677353b6db16 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 7 Dec 2018 23:18:57 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=8F=91=E5=B8=83=20=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=89=88=E6=9C=AC=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4f991fd..676ec71 100644 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,9 @@ 1.8 Finchley.RELEASE INFO - E:/i3plus-platform-logs/${project.name} - E:/i3plus-platform-logs/${project.name}-error - E:/i3plus-platform-logs/${project.name}-controller + ../logs/${project.name} + ../logs/${project.name}-error + ../logs/${project.name}-controller 2.9.1 2.6 2.1 From b382c5ae0096b46b5cdbc486274655318f087bf4 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 8 Dec 2018 01:12:47 +0800 Subject: [PATCH 06/16] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test # Conflicts: # modules/i3plus-core-api/pom.xml # modules/i3plus-core-apiservice/pom.xml # modules/i3plus-core-apiservice/src/main/resources/application-prod.properties # modules/i3plus-core-apiservice/src/main/resources/application-test.properties # pom.xml --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- .../src/main/resources/application-prod.properties | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) 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 586923c..5e6ea83 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -3,13 +3,13 @@ server.port=8100 #本机ip impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://cs.estsh.com +impp.console.ip=http://cst.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://reg.estsh.com/eureka/ +impp.cluster.regist.center=http://regt.estsh.com/eureka/ #多注册中心 #impp.cluster.regist.center=http://192.168.1.20:8000/eureka/,http://192.168.1.20:8001/eureka/ 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 From dfbc0b5eeb365fcef94527a34df864dba01b8587 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 8 Dec 2018 01:13:59 +0800 Subject: [PATCH 07/16] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test # Conflicts: # modules/i3plus-core-api/pom.xml # modules/i3plus-core-apiservice/pom.xml # modules/i3plus-core-apiservice/src/main/resources/application-prod.properties # modules/i3plus-core-apiservice/src/main/resources/application-test.properties # pom.xml --- .../src/main/resources/application-test.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index d7dc9a4..daeee39 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=51010 +server.port=58100 ################ 授权过滤配置 ################ #用户登陆路径 filter.shiro.user.loginuri = /login From 879683a64622ce8d02ec742cabd48520e884d000 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Sat, 8 Dec 2018 01:15:34 +0800 Subject: [PATCH 08/16] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test # Conflicts: # modules/i3plus-core-api/pom.xml # modules/i3plus-core-apiservice/pom.xml # modules/i3plus-core-apiservice/src/main/resources/application-test.properties # pom.xml --- .../src/main/resources/application-prod.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a455346..214ecea 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -3,13 +3,13 @@ server.port=1100 #本机ip impp.server.ip=192.168.1.56 #console控制台服务（zipkin追踪全路径） -impp.console.ip=http://cst.estsh.com +impp.console.ip=http://cs.estsh.com ################ 功能配置1 ################ #若无法连接注册中心，是否需要一直检测加入 impp.cluster.fetch=true #服务注册中心 -impp.cluster.regist.center=http://regt.estsh.com/eureka/ +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/ From 12f1dfb02191f66c6e50133e1a93b09137206449 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 15:06:01 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index 517743c..3e86b51 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -106,22 +106,22 @@ spring.data.mongodb.port=27017 ##主数据源，读写 #impp.write.datasource.type=com.zaxxer.hikari.HikariDataSource impp.write.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.write.datasource.username=i3_dev_core -impp.write.datasource.password=i3_core_pass +impp.write.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.write.datasource.username=impp_i3_core_user +impp.write.datasource.password=impp_i3_core_pwd ##辅数据源，只读 #impp.read.datasource.type=com.zaxxer.hikari.HikariDataSource impp.read.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.read.datasource.username=i3_dev_core -impp.read.datasource.password=i3_core_pass +impp.read.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_core?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.read.datasource.username=impp_i3_core_user +impp.read.datasource.password=impp_i3_core_pwd ##############定时任务持久化############## impp.schedule.datasource.driver-class-name=com.mysql.jdbc.Driver -impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3306/dev_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 -impp.schedule.datasource.username=i3_dev_schedule -impp.schedule.datasource.password=i3_schedule_pass +impp.schedule.datasource.jdbc-url=jdbc:mysql://192.168.1.55:3308/impp_i3_schedule?autoReconnect=true&useSSL=false&characterEncoding=utf-8 +impp.schedule.datasource.username=impp_i3_schedule_user +impp.schedule.datasource.password=impp_i3_schedule_pwd impp.schedule.datasource.max-connections=20 #定时任务在服务启动后多少秒执行 impp.schedule.start.after-second=20 From bfd3809daf134a2c84324b698c2c756dc0404544 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 20:50:14 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/busi/ISysUserInfoService.java | 36 +++++- .../controller/busi/SysUserInfoController.java | 139 ++++++++++++++++----- .../serviceimpl/busi/SysUserInfoService.java | 48 ++++++- .../serviceimpl/busi/SysUserService.java | 11 +- 4 files changed, 190 insertions(+), 44 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 00bb5a7..83f4827 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -2,9 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -97,4 +95,36 @@ public interface ISysUserInfoService { @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager); + /** + * 用户唯一校验 + * @param userInfo + */ + @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") + void checkSysUserInfoOnly(SysUserInfo userInfo); + + /** + * 查询用户部门关系 + * @param userId + * @return + */ + @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") + List findRefUserDepartmentByUserId(Long userId); + + /** + * 查询用户岗位关系 + * @param userId + * @return + */ + @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + List findSysRefUserPositionByUserId(Long userId); + + /** + * 用户唯一校验 用户工号 + * @param no + * @param id + * @return + */ + @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") + boolean checkUserInfoByUserEmpNo(String no,long id); + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 23895c4..6bc8bd7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -10,9 +11,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -56,6 +55,9 @@ public class SysUserInfoController extends CoreBaseController{ @Autowired private ISysFileService sysFileService; + @Autowired + private ISysPositionService sysPositionService; + @PostMapping(value="/insert") @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息") public ResultBean insertSysUserInfo(SysUserInfo userInfo){ @@ -63,33 +65,24 @@ public class SysUserInfoController extends CoreBaseController{ //登陆用户 SessionUser user = AuthUtil.getSessionUser(); - //条件验证 - ValidatorBean.beginValid(userInfo) - .notNull("name",userInfo.getName()) - .notNull("userEmpNo",userInfo.getUserEmpNo()) - .checkNotZero("departmentId",userInfo.getDepartmentId()) - .checkNotZero("departmentIdList",userInfo.getDepartmentIdList()) - .checkNotZero("positionId",userInfo.getPositionId()); + checkSysUserInfo(userInfo,false); ConvertBean.modelInitialize(userInfo,user); userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); - SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo); - sysUserInfoService.refreshRefUserDepartment(pos.getId(), + SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo); + + sysUserInfoService.refreshRefUserDepartment(info.getId(), StringTool.getArrayLong(userInfo.getDepartmentIdList()), user.getUserName()); - sysUserInfoService.refreshRefUserPosition(pos.getId(), - new Long[]{userInfo.getPositionId()}, + sysUserInfoService.refreshRefUserPosition(info.getId(), + StringTool.getArrayLong(userInfo.getPositionIdList()), user.getUserName()); - SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); - if(department != null){ - sysUserInfoService.refreshRefUserOrganize(pos.getId(), - department.getOrganizeId(),user.getUserName()); - } + sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(pos); + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep); @@ -106,13 +99,7 @@ public class SysUserInfoController extends CoreBaseController{ //登陆用户 SessionUser user = AuthUtil.getSessionUser(); - //条件验证 - ValidatorBean.beginValid(userInfo) - .notNull("id",userInfo.getId()) - .notNull("name",userInfo.getName()) - .notNull("userEmpNo",userInfo.getUserEmpNo()) - .checkNotZero("departmentId",userInfo.getDepartmentId()) - .checkNotZero("positionId",userInfo.getPositionId()); + checkSysUserInfo(userInfo,true); //修改初始化 ConvertBean.modelUpdate(userInfo,user); @@ -120,16 +107,14 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.updateSysUserInfo(userInfo); sysUserInfoService.refreshRefUserDepartment(userInfo.getId(), - StringTool.getArrayLong(userInfo.getDepartmentIdList()), user.getUserName()); + StringTool.getArrayLong(userInfo.getDepartmentIdList()), + user.getUserName()); sysUserInfoService.refreshRefUserPosition(userInfo.getId(), - new Long[]{userInfo.getPositionId()}, user.getUserName()); + StringTool.getArrayLong(userInfo.getPositionIdList()), + user.getUserName()); - SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); - if(department != null){ - sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), - department.getOrganizeId(),user.getUserName()); - } + sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -237,4 +222,90 @@ public class SysUserInfoController extends CoreBaseController{ } } + @GetMapping(value = "/find-ref-department/{userId}") + @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系") + public ResultBean findRefDepartment(@PathVariable("userId") String userId) { + try { + ValidatorBean.checkNotNull(userId, "用户 id 不能为空"); + List list = sysUserInfoService.findRefUserDepartmentByUserId(Long.parseLong(userId)); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value = "/find-ref-position/{userId}") + @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系") + public ResultBean findRefPosition(@PathVariable("userId") String userId) { + try { + ValidatorBean.checkNotNull(userId, "用户 id 不能为空"); + List list = sysUserInfoService.findSysRefUserPositionByUserId(Long.parseLong(userId)); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + /** + * 用户唯一信息校验 + * @param userInfo + * @param isId 是否检查ID 存在 + */ + private void checkSysUserInfo(SysUserInfo userInfo,boolean isId){ + + try{ + //条件验证 + ValidatorBean.beginValid(userInfo) + .notNull("name",userInfo.getName()) + .notNull("userEmpNo",userInfo.getUserEmpNo()) + .checkNotZero("departmentId",userInfo.getDepartmentId()) + .checkNotZero("departmentIdList",userInfo.getDepartmentIdList()) + .checkNotZero("positionId",userInfo.getPositionId()); + if(isId){ + ValidatorBean.beginValid(userInfo) + .notNull("id",userInfo.getId()); + } + + SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); + if(department == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("主部门信息不存在。") + .build(); + } + + SysPosition position = sysPositionService.getSysPositionById(userInfo.getPositionId()); + if(position == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("主岗位信息不存在。") + .build(); + } + + sysUserInfoService.checkSysUserInfoOnly(userInfo); + + userInfo.setDepartmentNameRdd(department.getName()); + userInfo.setPositionNameRdd(position.getName()); + userInfo.setDepartment(department); + userInfo.setPosition(position); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 256cb42..f39319d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +104,7 @@ public class SysUserInfoService implements ISysUserInfoService { nameList.add(department.getName()); } - userInfo.setDepartmentNameRdd(String.join(",",nameList)); + userInfo.setDepartmentNamesRdd(String.join(",",nameList)); refUserDepartmentRDao.saveAll(list); sysUserInfoRDao.save(userInfo); @@ -151,7 +152,7 @@ public class SysUserInfoService implements ISysUserInfoService { nameList.add(position.getName()); } - userInfo.setPositionNameRdd(String.join(",",nameList)); + userInfo.setPositionNamesRdd(String.join(",",nameList)); refUserPositionRDao.saveAll(list); sysUserInfoRDao.save(userInfo); @@ -227,4 +228,47 @@ public class SysUserInfoService implements ISysUserInfoService { return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager); } } + + @Override + @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") + public List findRefUserDepartmentByUserId(Long userId) { + return refUserDepartmentRDao.findByProperty("userId",userId); + } + + @Override + @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + public List findSysRefUserPositionByUserId(Long userId) { + return refUserPositionRDao.findByProperty("userId",userId); + } + + @Override + @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") + public void checkSysUserInfoOnly(SysUserInfo userInfo) { + if(userInfo != null){ + // 登录名唯一教研 + if(!checkUserInfoByUserEmpNo(userInfo.getUserEmpNo(), userInfo.getId() == null ? 0 : userInfo.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("工号已存在") + .setErrorSolution("请重新输入工号") + .build(); + } + } + } + + @Override + @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") + public boolean checkUserInfoByUserEmpNo(String no, long id) { + int count; + if(id > 0){ + StringBuffer sw = new StringBuffer(); + HqlPack.getStringEqualPack(no,"userEmpNo",sw); + HqlPack.getNumNOEqualPack(id,"id",sw); + count = sysUserInfoRDao.findByHqlWhereCount(sw.toString()); + }else{ + count = sysUserInfoRDao.findByPropertyCount("userEmpNo",no); + } + return count <= 0 ; + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 7bb481e..9b3a663 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -18,6 +19,7 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.CredentialsException; import org.apache.shiro.authc.UnknownAccountException; @@ -430,7 +432,7 @@ public class SysUserService implements ISysUserService { packSysUserDepartment(sessionUser,userInfo); //封装用户部门信息 packSysUserPosition(sessionUser,userInfo); //封装用户岗位信息 - packSysUserOrganize(sessionUser,userInfo); //封装用户组织信息 + packSysUserOrganize(userInfo); //封装用户组织信息 userInfo.setUser(user); sessionUser.setUserName(userInfo.getName()); @@ -522,11 +524,10 @@ public class SysUserService implements ISysUserService { /** * 封装用户 组织信息封装 - * @param sessionUser * @param userInfo * @return */ - public void packSysUserOrganize(SessionUser sessionUser, SysUserInfo userInfo){ + public void packSysUserOrganize(SysUserInfo userInfo){ try { LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId()); userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId())); @@ -538,8 +539,8 @@ public class SysUserService implements ISysUserService { ids[i] = departmentList.get(i).getOrganizeId(); } - String hqlWhere = CoreHqlPack.packHqlIds("id", ids); - List organizeList = organizeRDao.findByHqlWhere(hqlWhere); + String strWhere = CoreHqlPack.packHqlSysOrganize(ids, ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue()); + List organizeList = organizeRDao.findByHqlWhere(strWhere); userInfo.setOrganizeList(organizeList); } From 0a9b7176ec1a2d62d5153fd7f4d1f40a3424d45a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 20:54:25 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 838e520..f56704b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # IntelliJ project files .gitignore .idea +idea/*.xml *.iml out gen From 4999e2dfa0a7b77ed8b05804eb37ebbc4a6aa175 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 10 Dec 2018 21:05:52 +0800 Subject: [PATCH 12/16] remove .idea --- .idea/compiler.xml | 21 - .idea/encodings.xml | 9 - .idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 - .../Maven__com_alibaba_fastjson_1_2_8.xml | 13 - .../Maven__com_fasterxml_classmate_1_3_4.xml | 13 - ...rxml_jackson_core_jackson_annotations_2_9_0.xml | 13 - ...m_fasterxml_jackson_core_jackson_core_2_9_6.xml | 13 - ...sterxml_jackson_core_jackson_databind_2_9_6.xml | 13 - ...ackson_datatype_jackson_datatype_jdk8_2_9_6.xml | 13 - ...kson_datatype_jackson_datatype_jsr310_2_9_6.xml | 13 - ...module_jackson_module_parameter_names_2_9_6.xml | 13 - .../Maven__com_google_guava_guava_20_0.xml | 13 - .../Maven__com_jayway_jsonpath_json_path_2_4_0.xml | 13 - ...en__com_mchange_mchange_commons_java_0_2_11.xml | 13 - .../Maven__com_rabbitmq_amqp_client_5_1_2.xml | 13 - ...al_google_android_json_0_0_20131108_vaadin1.xml | 13 - .../libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml | 13 - ...__commons_beanutils_commons_beanutils_1_9_3.xml | 13 - .../Maven__commons_codec_commons_codec_1_11.xml | 13 - ...mmons_collections_commons_collections_3_2_2.xml | 13 - .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml | 13 - ...latform_i3plus_platform_common_1_0_SNAPSHOT.xml | 13 - ...__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml | 13 - ...n__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml | 13 - ..._i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml | 13 - ...plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml | 13 - ...n__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml | 13 - ..._framework_impp_framework_boot_1_0_SNAPSHOT.xml | 13 - ...aven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml | 13 - .../Maven__io_netty_netty_buffer_4_1_25_Final.xml | 13 - .../Maven__io_netty_netty_codec_4_1_25_Final.xml | 13 - .../Maven__io_netty_netty_common_4_1_25_Final.xml | 13 - .../Maven__io_netty_netty_handler_4_1_25_Final.xml | 13 - ...Maven__io_netty_netty_resolver_4_1_25_Final.xml | 13 - ...aven__io_netty_netty_transport_4_1_25_Final.xml | 13 - ...o_projectreactor_reactor_core_3_1_8_RELEASE.xml | 13 - .../Maven__io_springfox_springfox_core_2_9_2.xml | 13 - .../Maven__io_springfox_springfox_schema_2_9_2.xml | 13 - .../Maven__io_springfox_springfox_spi_2_9_2.xml | 13 - ...en__io_springfox_springfox_spring_web_2_9_2.xml | 13 - ...aven__io_springfox_springfox_swagger2_2_9_2.xml | 13 - ...io_springfox_springfox_swagger_common_2_9_2.xml | 13 - ...en__io_springfox_springfox_swagger_ui_2_9_2.xml | 13 - ...aven__io_swagger_swagger_annotations_1_5_20.xml | 13 - .../Maven__io_swagger_swagger_models_1_5_20.xml | 13 - ...javax_annotation_javax_annotation_api_1_3_2.xml | 13 - ...javax_transaction_javax_transaction_api_1_2.xml | 13 - ...javax_validation_validation_api_2_0_1_Final.xml | 13 - .idea/libraries/Maven__junit_junit_4_12.xml | 13 - .../Maven__mysql_mysql_connector_java_5_1_39.xml | 13 - .../Maven__net_bytebuddy_byte_buddy_1_7_11.xml | 13 - ...aven__net_bytebuddy_byte_buddy_agent_1_7_11.xml | 13 - .../Maven__net_minidev_accessors_smart_1_2.xml | 13 - .../Maven__net_minidev_json_smart_2_3.xml | 13 - .../Maven__net_sf_ehcache_ehcache_core_2_6_11.xml | 13 - ...ven__org_apache_commons_commons_lang3_3_8_1.xml | 13 - ...ven__org_apache_commons_commons_pool2_2_5_0.xml | 13 - ..._org_apache_httpcomponents_httpclient_4_5_5.xml | 13 - ...n__org_apache_httpcomponents_httpcore_4_4_9.xml | 13 - ...__org_apache_logging_log4j_log4j_api_2_10_0.xml | 13 - ..._org_apache_logging_log4j_log4j_core_2_10_0.xml | 13 - ...__org_apache_logging_log4j_log4j_jul_2_10_0.xml | 13 - ...pache_logging_log4j_log4j_slf4j_impl_2_10_0.xml | 13 - .../Maven__org_apache_shiro_shiro_cache_1_4_0.xml | 13 - ...n__org_apache_shiro_shiro_config_core_1_4_0.xml | 13 - ...n__org_apache_shiro_shiro_config_ogdl_1_4_0.xml | 13 - .../Maven__org_apache_shiro_shiro_core_1_4_0.xml | 13 - ..._org_apache_shiro_shiro_crypto_cipher_1_4_0.xml | 13 - ...n__org_apache_shiro_shiro_crypto_core_1_4_0.xml | 13 - ...n__org_apache_shiro_shiro_crypto_hash_1_4_0.xml | 13 - ...Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml | 13 - .../Maven__org_apache_shiro_shiro_event_1_4_0.xml | 13 - .../Maven__org_apache_shiro_shiro_lang_1_4_0.xml | 13 - .../Maven__org_apache_shiro_shiro_spring_1_4_0.xml | 13 - .../Maven__org_apache_shiro_shiro_web_1_4_0.xml | 13 - ...pache_tomcat_embed_tomcat_embed_core_8_5_31.xml | 13 - ..._apache_tomcat_embed_tomcat_embed_el_8_5_31.xml | 13 - ...che_tomcat_embed_tomcat_embed_jasper_8_5_31.xml | 13 - ..._tomcat_embed_tomcat_embed_websocket_8_5_31.xml | 13 - ...apache_tomcat_tomcat_annotations_api_8_5_31.xml | 13 - .../Maven__org_aspectj_aspectjweaver_1_8_13.xml | 13 - .../Maven__org_assertj_assertj_core_3_9_1.xml | 13 - ...Maven__org_csource_fastdfs_client_java_1_27.xml | 13 - .../Maven__org_eclipse_jdt_ecj_3_12_3.xml | 13 - .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 - .../Maven__org_hamcrest_hamcrest_library_1_3.xml | 13 - ...n_hibernate_commons_annotations_5_0_1_Final.xml | 13 - ...__org_hibernate_hibernate_core_5_2_17_Final.xml | 13 - ...rsistence_hibernate_jpa_2_1_api_1_0_2_Final.xml | 13 - ..._validator_hibernate_validator_6_0_10_Final.xml | 13 - .../Maven__org_javassist_javassist_3_22_0_GA.xml | 13 - .../Maven__org_jboss_jandex_2_0_3_Final.xml | 13 - ...org_jboss_logging_jboss_logging_3_3_2_Final.xml | 13 - .../Maven__org_mapstruct_mapstruct_1_2_0_Final.xml | 13 - .../Maven__org_mockito_mockito_core_2_15_0.xml | 13 - .idea/libraries/Maven__org_mongodb_bson_3_6_4.xml | 13 - .../Maven__org_mongodb_mongodb_driver_3_6_4.xml | 13 - ...aven__org_mongodb_mongodb_driver_core_3_6_4.xml | 13 - .../Maven__org_objenesis_objenesis_2_6.xml | 13 - .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml | 13 - .../Maven__org_projectlombok_lombok_1_16_22.xml | 13 - .../Maven__org_quartz_scheduler_quartz_2_3_0.xml | 13 - ...ven__org_quartz_scheduler_quartz_jobs_2_3_0.xml | 13 - ..._org_reactivestreams_reactive_streams_1_0_2.xml | 13 - .../Maven__org_skyscreamer_jsonassert_1_5_0.xml | 13 - .../Maven__org_slf4j_jul_to_slf4j_1_7_25.xml | 13 - .../Maven__org_slf4j_slf4j_api_1_7_25.xml | 13 - ...ingframework_amqp_spring_amqp_2_0_4_RELEASE.xml | 13 - ...gframework_amqp_spring_rabbit_2_0_4_RELEASE.xml | 13 - ...ingframework_boot_spring_boot_2_0_3_RELEASE.xml | 13 - ...oot_spring_boot_autoconfigure_2_0_3_RELEASE.xml | 13 - ...work_boot_spring_boot_starter_2_0_3_RELEASE.xml | 13 - ...boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml | 13 - ..._boot_spring_boot_starter_aop_2_0_3_RELEASE.xml | 13 - ..._spring_boot_starter_data_jpa_2_0_3_RELEASE.xml | 13 - ...ing_boot_starter_data_mongodb_2_0_3_RELEASE.xml | 13 - ...pring_boot_starter_data_redis_2_0_3_RELEASE.xml | 13 - ...boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml | 13 - ...boot_spring_boot_starter_json_2_0_3_RELEASE.xml | 13 - ...ot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml | 13 - ...boot_spring_boot_starter_test_2_0_3_RELEASE.xml | 13 - ...ot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml | 13 - ..._boot_spring_boot_starter_web_2_0_3_RELEASE.xml | 13 - ...amework_boot_spring_boot_test_2_0_3_RELEASE.xml | 13 - ...pring_boot_test_autoconfigure_2_0_3_RELEASE.xml | 13 - ...work_data_spring_data_commons_2_0_8_RELEASE.xml | 13 - ...ramework_data_spring_data_jpa_2_0_8_RELEASE.xml | 13 - ...ork_data_spring_data_keyvalue_2_0_8_RELEASE.xml | 13 - ...work_data_spring_data_mongodb_2_0_8_RELEASE.xml | 13 - ...mework_data_spring_data_redis_2_0_8_RELEASE.xml | 13 - ...ork_plugin_spring_plugin_core_1_2_0_RELEASE.xml | 13 - ...plugin_spring_plugin_metadata_1_2_0_RELEASE.xml | 13 - ...gframework_retry_spring_retry_1_2_2_RELEASE.xml | 13 - ...rg_springframework_spring_aop_5_0_7_RELEASE.xml | 13 - ...pringframework_spring_aspects_5_0_7_RELEASE.xml | 13 - ..._springframework_spring_beans_5_0_7_RELEASE.xml | 13 - ...pringframework_spring_context_5_0_7_RELEASE.xml | 13 - ...mework_spring_context_support_5_0_7_RELEASE.xml | 13 - ...g_springframework_spring_core_5_0_7_RELEASE.xml | 13 - ...ngframework_spring_expression_5_0_7_RELEASE.xml | 13 - ...rg_springframework_spring_jcl_5_0_7_RELEASE.xml | 13 - ...g_springframework_spring_jdbc_5_0_7_RELEASE.xml | 13 - ...ingframework_spring_messaging_5_0_7_RELEASE.xml | 13 - ...rg_springframework_spring_orm_5_0_7_RELEASE.xml | 13 - ...rg_springframework_spring_oxm_5_0_7_RELEASE.xml | 13 - ...g_springframework_spring_test_5_0_7_RELEASE.xml | 13 - ...org_springframework_spring_tx_5_0_7_RELEASE.xml | 13 - ...rg_springframework_spring_web_5_0_7_RELEASE.xml | 13 - ...springframework_spring_webmvc_5_0_7_RELEASE.xml | 13 - ...ingframework_spring_websocket_5_0_7_RELEASE.xml | 13 - .../Maven__org_xmlunit_xmlunit_core_2_5_1.xml | 13 - .idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml | 13 - .../libraries/Maven__redis_clients_jedis_2_9_0.xml | 13 - .idea/misc.xml | 13 - .idea/modules.xml | 11 - .idea/vcs.xml | 6 - .idea/workspace.xml | 2677 -------------------- 157 files changed, 4700 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml delete mode 100644 .idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_20_0.xml delete mode 100644 .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml delete mode 100644 .idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml delete mode 100644 .idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml delete mode 100644 .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml delete mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml delete mode 100644 .idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml delete mode 100644 .idea/libraries/Maven__commons_codec_commons_codec_1_11.xml delete mode 100644 .idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml delete mode 100644 .idea/libraries/Maven__dom4j_dom4j_1_6_1.xml delete mode 100644 .idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml delete mode 100644 .idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml delete mode 100644 .idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml delete mode 100644 .idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml delete mode 100644 .idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml delete mode 100644 .idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml delete mode 100644 .idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml delete mode 100644 .idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml delete mode 100644 .idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml delete mode 100644 .idea/libraries/Maven__net_minidev_json_smart_2_3.xml delete mode 100644 .idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml delete mode 100644 .idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml delete mode 100644 .idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml delete mode 100644 .idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml delete mode 100644 .idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml delete mode 100644 .idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml delete mode 100644 .idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml delete mode 100644 .idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml delete mode 100644 .idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml delete mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml delete mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml delete mode 100644 .idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml delete mode 100644 .idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml delete mode 100644 .idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml delete mode 100644 .idea/libraries/Maven__org_mongodb_bson_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml delete mode 100644 .idea/libraries/Maven__org_objenesis_objenesis_2_6.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml delete mode 100644 .idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml delete mode 100644 .idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml delete mode 100644 .idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml delete mode 100644 .idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml delete mode 100644 .idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml delete mode 100644 .idea/libraries/Maven__redis_clients_jedis_2_9_0.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 8c9324c..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 0f9ce45..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml deleted file mode 100644 index b8d93d8..0000000 --- a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml deleted file mode 100644 index 9b223e0..0000000 --- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml deleted file mode 100644 index 33c30b4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml deleted file mode 100644 index 06441f4..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml deleted file mode 100644 index eebe10d..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml deleted file mode 100644 index 51087da..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml deleted file mode 100644 index fa50d95..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml deleted file mode 100644 index 7e20e35..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml deleted file mode 100644 index 345adf8..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml b/.idea/libraries/Maven__com_google_guava_guava_20_0.xml deleted file mode 100644 index c5bd322..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_20_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml deleted file mode 100644 index f19f6eb..0000000 --- a/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml b/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml deleted file mode 100644 index dbd8483..0000000 --- a/.idea/libraries/Maven__com_mchange_mchange_commons_java_0_2_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml b/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml deleted file mode 100644 index ea07fce..0000000 --- a/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml deleted file mode 100644 index b8581a6..0000000 --- a/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml b/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml deleted file mode 100644 index 6d6865c..0000000 --- a/.idea/libraries/Maven__com_zaxxer_HikariCP_2_7_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml deleted file mode 100644 index 687a60e..0000000 --- a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml deleted file mode 100644 index 4c8ff54..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml deleted file mode 100644 index 13afda2..0000000 --- a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml deleted file mode 100644 index 14681ee..0000000 --- a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml deleted file mode 100644 index 7b3d4d2..0000000 --- a/.idea/libraries/Maven__i3plus_platform_i3plus_platform_common_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml deleted file mode 100644 index 1807124..0000000 --- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_base_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml deleted file mode 100644 index 66115c3..0000000 --- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_mes_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml deleted file mode 100644 index 875e7c3..0000000 --- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_model_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml deleted file mode 100644 index 262a850..0000000 --- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_platform_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml deleted file mode 100644 index c6cd544..0000000 --- a/.idea/libraries/Maven__i3plus_pojo_i3plus_pojo_wms_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml b/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml deleted file mode 100644 index c5ed4d7..0000000 --- a/.idea/libraries/Maven__impp_framework_impp_framework_boot_1_0_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml b/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml deleted file mode 100644 index 4b5e592..0000000 --- a/.idea/libraries/Maven__io_lettuce_lettuce_core_5_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml deleted file mode 100644 index 8174ce4..0000000 --- a/.idea/libraries/Maven__io_netty_netty_buffer_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml deleted file mode 100644 index 72440e7..0000000 --- a/.idea/libraries/Maven__io_netty_netty_codec_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml deleted file mode 100644 index 9bf4c51..0000000 --- a/.idea/libraries/Maven__io_netty_netty_common_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml deleted file mode 100644 index 747450b..0000000 --- a/.idea/libraries/Maven__io_netty_netty_handler_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml deleted file mode 100644 index 34d4fb3..0000000 --- a/.idea/libraries/Maven__io_netty_netty_resolver_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml b/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml deleted file mode 100644 index 2a0e6a1..0000000 --- a/.idea/libraries/Maven__io_netty_netty_transport_4_1_25_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml b/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml deleted file mode 100644 index 683cbec..0000000 --- a/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml deleted file mode 100644 index 03588dc..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_core_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml deleted file mode 100644 index 4a47148..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_schema_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml deleted file mode 100644 index f934649..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spi_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml deleted file mode 100644 index 7898a19..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_spring_web_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml deleted file mode 100644 index 4ed7d0d..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger2_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml deleted file mode 100644 index c40ef9f..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_common_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml b/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml deleted file mode 100644 index 0700f01..0000000 --- a/.idea/libraries/Maven__io_springfox_springfox_swagger_ui_2_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml deleted file mode 100644 index 1c4a621..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml b/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml deleted file mode 100644 index 395508f..0000000 --- a/.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml deleted file mode 100644 index e74f3ab..0000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml b/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml deleted file mode 100644 index 5f032d2..0000000 --- a/.idea/libraries/Maven__javax_transaction_javax_transaction_api_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml deleted file mode 100644 index 6978c0b..0000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml deleted file mode 100644 index d411041..0000000 --- a/.idea/libraries/Maven__junit_junit_4_12.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml deleted file mode 100644 index 18e6ec9..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml deleted file mode 100644 index ee623f1..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml b/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml deleted file mode 100644 index a72c9a3..0000000 --- a/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml deleted file mode 100644 index b3d3858..0000000 --- a/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml deleted file mode 100644 index 1083023..0000000 --- a/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml deleted file mode 100644 index 1c71163..0000000 --- a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml deleted file mode 100644 index 33b78e9..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml deleted file mode 100644 index 440e770..0000000 --- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml deleted file mode 100644 index e4eb38b..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml deleted file mode 100644 index 7f14d45..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml deleted file mode 100644 index cbe5ca7..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml deleted file mode 100644 index f061a60..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_core_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml deleted file mode 100644 index b6e0a9e..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_jul_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml deleted file mode 100644 index 9a53275..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_slf4j_impl_2_10_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml deleted file mode 100644 index ec3b15e..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_cache_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml deleted file mode 100644 index c460aba..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_core_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml deleted file mode 100644 index 1e28543..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_config_ogdl_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml deleted file mode 100644 index 19c39a1..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_core_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml deleted file mode 100644 index c0b1b53..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_cipher_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml deleted file mode 100644 index d7da59e..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_core_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml deleted file mode 100644 index 3e3feaf..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_crypto_hash_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml deleted file mode 100644 index 5137263..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_ehcache_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml deleted file mode 100644 index 0c26d31..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_event_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml deleted file mode 100644 index d50067f..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_lang_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml deleted file mode 100644 index e6235dc..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_spring_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml b/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml deleted file mode 100644 index 9f0fcf1..0000000 --- a/.idea/libraries/Maven__org_apache_shiro_shiro_web_1_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml deleted file mode 100644 index a6693a2..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml deleted file mode 100644 index bc00163..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml deleted file mode 100644 index 02ac6c9..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_jasper_8_5_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml deleted file mode 100644 index a47a3be..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml b/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml deleted file mode 100644 index 3a59079..0000000 --- a/.idea/libraries/Maven__org_apache_tomcat_tomcat_annotations_api_8_5_31.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml deleted file mode 100644 index d46e30a..0000000 --- a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_13.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml b/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml deleted file mode 100644 index 40adaaa..0000000 --- a/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml b/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml deleted file mode 100644 index 976841b..0000000 --- a/.idea/libraries/Maven__org_csource_fastdfs_client_java_1_27.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml b/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml deleted file mode 100644 index 96c4694..0000000 --- a/.idea/libraries/Maven__org_eclipse_jdt_ecj_3_12_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml deleted file mode 100644 index 78dbe45..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml deleted file mode 100644 index ce34f42..0000000 --- a/.idea/libraries/Maven__org_hibernate_common_hibernate_commons_annotations_5_0_1_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml deleted file mode 100644 index 4f3cc1a..0000000 --- a/.idea/libraries/Maven__org_hibernate_hibernate_core_5_2_17_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml deleted file mode 100644 index 1d8ce40..0000000 --- a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_1_api_1_0_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml b/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml deleted file mode 100644 index 1e98da0..0000000 --- a/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_10_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml deleted file mode 100644 index ad65915..0000000 --- a/.idea/libraries/Maven__org_javassist_javassist_3_22_0_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml b/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml deleted file mode 100644 index b841e21..0000000 --- a/.idea/libraries/Maven__org_jboss_jandex_2_0_3_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml deleted file mode 100644 index 5f7dd01..0000000 --- a/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml b/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml deleted file mode 100644 index 87cb599..0000000 --- a/.idea/libraries/Maven__org_mapstruct_mapstruct_1_2_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml b/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml deleted file mode 100644 index a742a6d..0000000 --- a/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml deleted file mode 100644 index 50bf633..0000000 --- a/.idea/libraries/Maven__org_mongodb_bson_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml deleted file mode 100644 index 95a778a..0000000 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml b/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml deleted file mode 100644 index 4eab0d2..0000000 --- a/.idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_6_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml deleted file mode 100644 index af41e3b..0000000 --- a/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml deleted file mode 100644 index 0bf8cf2..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml deleted file mode 100644 index 763e50d..0000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_16_22.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml deleted file mode 100644 index 678f5ce..0000000 --- a/.idea/libraries/Maven__org_quartz_scheduler_quartz_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml b/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml deleted file mode 100644 index 79cda67..0000000 --- a/.idea/libraries/Maven__org_quartz_scheduler_quartz_jobs_2_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml deleted file mode 100644 index 457c7b7..0000000 --- a/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml deleted file mode 100644 index c4c54d6..0000000 --- a/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml deleted file mode 100644 index 6073e53..0000000 --- a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml deleted file mode 100644 index 20e8163..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml deleted file mode 100644 index 1b88378..0000000 --- a/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml b/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml deleted file mode 100644 index 85633b0..0000000 --- a/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_4_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml deleted file mode 100644 index c1bd1b7..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml deleted file mode 100644 index aef774c..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml deleted file mode 100644 index f4db168..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml deleted file mode 100644 index a1f8d87..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml deleted file mode 100644 index c155662..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml deleted file mode 100644 index aef3a3b..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml deleted file mode 100644 index 2345242..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml deleted file mode 100644 index de4a803..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_redis_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml deleted file mode 100644 index 52f6b1b..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml deleted file mode 100644 index 42841e5..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml deleted file mode 100644 index 7258373..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_log4j2_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml deleted file mode 100644 index 2817f37..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml deleted file mode 100644 index f6daaf6..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml deleted file mode 100644 index 614aadf..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml deleted file mode 100644 index b631dbd..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml deleted file mode 100644 index 53d3728..0000000 --- a/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml deleted file mode 100644 index b56afb7..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_commons_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml deleted file mode 100644 index fb677d1..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_jpa_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml deleted file mode 100644 index c2324f8..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_keyvalue_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml deleted file mode 100644 index f4fc5bc..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_mongodb_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml b/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml deleted file mode 100644 index dae62ec..0000000 --- a/.idea/libraries/Maven__org_springframework_data_spring_data_redis_2_0_8_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml deleted file mode 100644 index fbc0452..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml b/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml deleted file mode 100644 index 7e6f096..0000000 --- a/.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_1_2_0_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml deleted file mode 100644 index 1b2836b..0000000 --- a/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml deleted file mode 100644 index 290a80e..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml deleted file mode 100644 index 001bcb6..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aspects_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml deleted file mode 100644 index 6a2d57b..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml deleted file mode 100644 index 56b0f1f..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml deleted file mode 100644 index 62ed4fa..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_support_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml deleted file mode 100644 index 3b157db..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml deleted file mode 100644 index aaef8a8..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml deleted file mode 100644 index b5651f7..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml deleted file mode 100644 index 2b485a8..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_jdbc_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml deleted file mode 100644 index 4348e5e..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml deleted file mode 100644 index 879f168..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_orm_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml deleted file mode 100644 index 233390a..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_oxm_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml deleted file mode 100644 index bc90aff..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_test_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml deleted file mode 100644 index 1f348ed..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_tx_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml deleted file mode 100644 index 816c219..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_web_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml deleted file mode 100644 index d4df107..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml deleted file mode 100644 index e6b5115..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_websocket_5_0_7_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml b/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml deleted file mode 100644 index 474c910..0000000 --- a/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml deleted file mode 100644 index 33ccf19..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml b/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml deleted file mode 100644 index 77144ff..0000000 --- a/.idea/libraries/Maven__redis_clients_jedis_2_9_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index d077d81..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 2041e86..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 49655e2..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,2677 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - logging - spring-boot-starter-logging - exclu - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1538274878308 - - - 1540305641918 - - - 1540305744442 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MAVEN - i3plus.core:i3plus-core-apiservice:1.0-SNAPSHOT - - i3plus.core:i3plus-core-apiservice:1.0-SNAPSHOT - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6/com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/com.fasterxml.jackson.core:jackson-databind:jar:2.9.6/com.fasterxml.jackson.core:jackson-core:jar:2.9.6 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/i3plus.pojo:i3plus-pojo-platform:jar:1.0-SNAPSHOT - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE/javax.annotation:javax.annotation-api:jar:1.3.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter:jar:2.0.3.RELEASE/org.yaml:snakeyaml:jar:1.19 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE/org.springframework:spring-aop:jar:5.0.7.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-aop:jar:2.0.3.RELEASE/org.aspectj:aspectjweaver:jar:1.8.13 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE/com.zaxxer:HikariCP:jar:2.7.9 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.3.RELEASE/org.springframework:spring-jdbc:jar:5.0.7.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.jboss.logging:jboss-logging:jar:3.3.2.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.hibernate.javax.persistence:hibernate-jpa-2.1-api:jar:1.0.2.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.javassist:javassist:jar:3.22.0-GA - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/antlr:antlr:jar:2.7.7 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.jboss:jandex:jar:2.0.3.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/dom4j:dom4j:jar:1.6.1 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.hibernate:hibernate-core:jar:5.2.17.Final/org.hibernate.common:hibernate-commons-annotations:jar:5.0.1.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/javax.transaction:javax.transaction-api:jar:1.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE/org.springframework:spring-orm:jar:5.0.7.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework.data:spring-data-jpa:jar:2.0.8.RELEASE/org.springframework:spring-tx:jar:5.0.7.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.3.RELEASE/org.springframework:spring-aspects:jar:5.0.7.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.swagger:swagger-annotations:jar:1.5.20 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.swagger:swagger-models:jar:1.5.20 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2/io.springfox:springfox-core:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spi:jar:2.9.2/io.springfox:springfox-core:jar:2.9.2/net.bytebuddy:byte-buddy:jar:1.7.11 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-schema:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-swagger-common:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/io.springfox:springfox-spring-web:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/com.google.guava:guava:jar:20.0 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/com.fasterxml:classmate:jar:1.3.4 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.slf4j:slf4j-api:jar:1.7.25 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.springframework.plugin:spring-plugin-core:jar:1.2.0.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.springframework.plugin:spring-plugin-metadata:jar:1.2.0.RELEASE - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger2:jar:2.9.2/org.mapstruct:mapstruct:jar:1.2.0.Final - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/io.springfox:springfox-swagger-ui:jar:2.9.2 - i3plus.pojo:i3plus-pojo-model:jar:1.0-SNAPSHOT/org.projectlombok:lombok:jar:1.16.22 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-lang:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-cache:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-hash:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-hash:jar:1.4.0/org.apache.shiro:shiro-crypto-core:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-crypto-cipher:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-core:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0/commons-beanutils:commons-beanutils:jar:1.9.3 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-config-ogdl:jar:1.4.0/commons-beanutils:commons-beanutils:jar:1.9.3/commons-collections:commons-collections:jar:3.2.2 - i3plus.pojo:i3plus-pojo-base:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-core:jar:1.4.0/org.apache.shiro:shiro-event:jar:1.4.0 - i3plus.pojo:i3plus-pojo-wms:jar:1.0-SNAPSHOT - i3plus.core:i3plus-core-api:jar:1.0-SNAPSHOT - i3plus.core:i3plus-core-api:jar:1.0-SNAPSHOT/i3plus.pojo:i3plus-pojo-mes:jar:1.0-SNAPSHOT - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.9.6 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.9.6 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-json:jar:2.0.3.RELEASE/com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.9.6 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-tomcat:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot-starter-tomcat:jar:2.0.3.RELEASE/org.apache.tomcat.embed:tomcat-embed-websocket:jar:8.5.31 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.hibernate.validator:hibernate-validator:jar:6.0.10.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.hibernate.validator:hibernate-validator:jar:6.0.10.Final/javax.validation:validation-api:jar:2.0.1.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-web:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-webmvc:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-web:jar:2.0.3.RELEASE/org.springframework:spring-webmvc:jar:5.0.7.RELEASE/org.springframework:spring-expression:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-autoconfigure:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-autoconfigure:jar:2.0.3.RELEASE/org.springframework.boot:spring-boot:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-slf4j-impl:jar:2.10.0/org.apache.logging.log4j:log4j-api:jar:2.10.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-core:jar:2.10.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.apache.logging.log4j:log4j-jul:jar:2.10.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-log4j2:jar:2.0.3.RELEASE/org.slf4j:jul-to-slf4j:jar:1.7.25 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-context:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-core:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-websocket:jar:5.0.7.RELEASE/org.springframework:spring-core:jar:5.0.7.RELEASE/org.springframework:spring-jcl:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.data:spring-data-commons:jar:2.0.8.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.data:spring-data-commons:jar:2.0.8.RELEASE/org.springframework:spring-beans:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE/org.springframework.data:spring-data-keyvalue:jar:2.0.8.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/org.springframework.data:spring-data-redis:jar:2.0.8.RELEASE/org.springframework:spring-oxm:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.projectreactor:reactor-core:jar:3.1.8.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.projectreactor:reactor-core:jar:3.1.8.RELEASE/org.reactivestreams:reactive-streams:jar:1.0.2 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-common:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final/io.netty:netty-buffer:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-transport:jar:4.1.25.Final/io.netty:netty-resolver:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-handler:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-data-redis:jar:2.0.3.RELEASE/io.lettuce:lettuce-core:jar:5.0.4.RELEASE/io.netty:netty-handler:jar:4.1.25.Final/io.netty:netty-codec:jar:4.1.25.Final - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/redis.clients:jedis:jar:2.9.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/redis.clients:jedis:jar:2.9.0/org.apache.commons:commons-pool2:jar:2.5.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework:spring-messaging:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/org.springframework.amqp:spring-amqp:jar:2.0.4.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/com.rabbitmq:amqp-client:jar:5.1.2 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework.boot:spring-boot-starter-amqp:jar:2.0.3.RELEASE/org.springframework.amqp:spring-rabbit:jar:2.0.4.RELEASE/org.springframework.retry:spring-retry:jar:1.2.2.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.csource:fastdfs-client-java:jar:1.27 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz:jar:2.3.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz:jar:2.3.0/com.mchange:mchange-commons-java:jar:0.2.11 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.quartz-scheduler:quartz-jobs:jar:2.3.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.springframework:spring-context-support:jar:5.0.7.RELEASE - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-spring:jar:1.4.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-web:jar:1.4.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/org.apache.shiro:shiro-ehcache:jar:1.4.0 - impp.framework:impp-framework-boot:jar:1.0-SNAPSHOT/net.sf.ehcache:ehcache-core:jar:2.6.11 - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.tomcat.embed:tomcat-embed-core:jar:8.5.31 - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.tomcat.embed:tomcat-embed-core:jar:8.5.31/org.apache.tomcat:tomcat-annotations-api:jar:8.5.31 - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5 - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5/org.apache.httpcomponents:httpcore:jar:4.4.9 - i3plus.platform:i3plus-platform-common:jar:1.0-SNAPSHOT/org.apache.httpcomponents:httpclient:jar:4.5.5/commons-codec:commons-codec:jar:1.11 - mysql:mysql-connector-java:jar:5.1.39 - org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31 - org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31/org.apache.tomcat.embed:tomcat-embed-el:jar:8.5.31 - org.apache.tomcat.embed:tomcat-embed-jasper:jar:8.5.31/org.eclipse.jdt:ecj:jar:3.12.3 - org.apache.commons:commons-lang3:jar:3.8.1 - com.alibaba:fastjson:jar:1.2.8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - All - All - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 32jdk1.8 - - - - - - - - \ No newline at end of file From 67873a62103045115e893f55121adcc27e5463de Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 18:15:12 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Test=20to=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-core-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 2fdf9a3..58de670 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=test +spring.profiles.active=dev ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 From ba940403fa96c4d3afd1ce1ca0ab9bd30cbf4e10 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 18:18:08 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Test=20to=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-core-api/pom.xml | 2 +- modules/i3plus-core-apiservice/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 155a733..cbfbca2 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index b25c5d2..50107af 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-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index b2b1556..0a79893 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice From b524929d7e987ed7086488cdeae69266ca91254a Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 11 Dec 2018 18:28:25 +0800 Subject: [PATCH 15/16] =?UTF-8?q?Base=20Url=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/controller/DemoAuthController.java | 3 ++- .../estsh/i3plus/core/apiservice/controller/DemoMongoController.java | 3 ++- .../i3plus/core/apiservice/controller/DemoRedisMqController.java | 3 ++- .../i3plus/core/apiservice/controller/DemoResourceController.java | 3 ++- .../i3plus/core/apiservice/controller/DemoScheduleController.java | 3 ++- .../core/apiservice/controller/DemoTreeAndExceptionController.java | 3 ++- .../estsh/i3plus/core/apiservice/controller/DemoUploadController.java | 3 ++- .../estsh/i3plus/core/apiservice/controller/base/AuthController.java | 3 ++- .../i3plus/core/apiservice/controller/base/SimpleController.java | 3 ++- .../core/apiservice/controller/busi/FactoryStoreController.java | 2 +- .../i3plus/core/apiservice/controller/busi/SysConfigController.java | 3 ++- .../core/apiservice/controller/busi/SysDepartmentController.java | 3 ++- .../core/apiservice/controller/busi/SysDictionaryController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysEnumController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysFileController.java | 3 ++- .../core/apiservice/controller/busi/SysLocaleLanguageController.java | 3 ++- .../core/apiservice/controller/busi/SysLocaleResourceController.java | 3 ++- .../core/apiservice/controller/busi/SysLogExceptionController.java | 3 ++- .../core/apiservice/controller/busi/SysLogOperateController.java | 3 ++- .../core/apiservice/controller/busi/SysLogSystemController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysMenuController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysMessageController.java | 3 ++- .../core/apiservice/controller/busi/SysOrderNoRuleController.java | 2 +- .../i3plus/core/apiservice/controller/busi/SysOrganizeController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysPositionController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysRoleController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysTaskTimeController.java | 3 ++- .../apiservice/controller/busi/SysTaskTimeExpressionController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysToolController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysToolTypeController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysTreeController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysUserController.java | 3 ++- .../i3plus/core/apiservice/controller/busi/SysUserInfoController.java | 3 ++- .../cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java | 4 +++- .../core/apiservice/serviceimpl/busi/TestDepartmentService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java | 2 +- .../core/apiservice/serviceimpl/busi/TestSysDictionaryService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java | 2 +- 39 files changed, 72 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index 2608546..30c3295 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -32,7 +33,7 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index d051389..3b776f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; @@ -26,7 +27,7 @@ import java.util.List; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-mongo-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service") public class DemoMongoController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index e16f953..66c918e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -34,7 +35,7 @@ import java.util.concurrent.TimeoutException; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoRedisMqController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoRedisMqController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 321419a..db7542c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -39,7 +40,7 @@ import java.util.Locale; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-system-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-system-service") public class DemoResourceController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java index 8cda612..4ed2ae2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; @@ -24,7 +25,7 @@ import java.util.List; **/ @RestController @Api(description="定时任务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/schedule") +@RequestMapping(PlatformConstWords.BASE_URL + "/schedule") public class DemoScheduleController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java index 3f8b9f4..b4328fa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -32,7 +33,7 @@ import java.net.URLConnection; **/ @RestController @Api(description="树和异常demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoTreeAndExceptionController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 57161c3..2152b77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -25,7 +26,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-upload") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-upload") public class DemoUploadController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 5aab9ca..4c88219 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysLocaleLanguageService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; @@ -40,7 +41,7 @@ import java.util.List; **/ @RestController @Api(description="用户所有权限操作服务") -@RequestMapping(CoreBaseController.BASE_URL + "/auth") +@RequestMapping(PlatformConstWords.BASE_URL + "/auth") public class AuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java index 8b95721..4c62aaa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.mes.MachineFactory; @@ -22,7 +23,7 @@ import java.util.List; **/ @RestController @Api(tags="SimpleController",description="简单服务demo") -@RequestMapping(CoreBaseController.BASE_URL +"/simple-service") +@RequestMapping(PlatformConstWords.BASE_URL +"/simple-service") public class SimpleController extends CoreBaseController{ private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index e74a533..81f4510 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -22,7 +22,7 @@ // **/ //@RestController //@Api(description="复杂对象服务demo") -//@RequestMapping(CoreBaseController.BASE_URL +"/factory-store") +//@RequestMapping(PlatformConstWords.BASE_URL +"/factory-store") //public class FactoryStoreController extends CoreBaseController { // private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); // diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index f0ce24b..150bf5f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "系统参数管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-config") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-config") public class SysConfigController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index fbde097..cf5a56f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "部门管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/department") +@RequestMapping(PlatformConstWords.BASE_URL +"/department") public class SysDepartmentController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index efd4fc1..c4d7c13 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "字典管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-dictionary") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-dictionary") public class SysDictionaryController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 349dfa6..bb06701 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; @@ -23,7 +24,7 @@ import java.util.List; **/ @RestController @Api(description = "系统枚举服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-enum") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-enum") public class SysEnumController extends CoreBaseController{ @GetMapping("/method-level") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 61cc61c..8f6243a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -50,7 +51,7 @@ import java.util.List; **/ @RestController @Api(description = "文件资源服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-file") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-file") public class SysFileController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 66c03ab..57fb717 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-language") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-language") public class SysLocaleLanguageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index b79e05e..cb6f9d6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言资源服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-resource") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-resource") public class SysLocaleResourceController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 7f866e1..1b53673 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @Api(description = "系统异常日志服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-exception") public class SysLogExceptionController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index d16a574..0b70c9c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -29,7 +30,7 @@ import java.util.List; **/ @RestController @Api(description = "操作日志") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-operate") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate") public class SysLogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 2941e13..4af9408 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -28,7 +29,7 @@ import java.util.List; **/ @RestController @Api(description = "系统日志服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-log-system") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system") public class SysLogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index a926a31..54bdf84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -3,6 +3,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; + import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -32,7 +33,7 @@ **/ @RestController @Api(description = "系统功能服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-menu") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-menu") public class SysMenuController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 1b350ed..3d24a1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -37,7 +38,7 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping(CoreBaseController.BASE_URL) +@RequestMapping(PlatformConstWords.BASE_URL) @Api(description = "消息管理服务") public class SysMessageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index b1a696e..2f9ccf8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -47,7 +47,7 @@ import java.util.List; **/ @RestController @Api(description = "系统单号规则管理服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-order-no-rule") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-order-no-rule") public class SysOrderNoRuleController extends CoreBaseController { @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 4720e11..7669312 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "组织") -@RequestMapping(CoreBaseController.BASE_URL +"/organize") +@RequestMapping(PlatformConstWords.BASE_URL +"/organize") public class SysOrganizeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysOrganizeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 7db1cf4..5c4ebd5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "岗位管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/position") +@RequestMapping(PlatformConstWords.BASE_URL +"/position") public class SysPositionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index d14399b..7a242f2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统角色服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-role") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-role") public class SysRoleController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java index df606a9..947ffc7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "定时任务服务") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time") public class SysTaskTimeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java index 808c256..20161d4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统时间表达式") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time-expression") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time-expression") public class SysTaskTimeExpressionController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeExpressionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index b51cb03..ff28147 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -41,7 +42,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool") public class SysToolController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 93e00c3..859f9e0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolTypeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件类型服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool-type") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool-type") public class SysToolTypeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolTypeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index de029c9..eee7d02 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "树服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-tree") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-tree") public class SysTreeController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 4b9dae6..abe288a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -42,7 +43,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user") public class SysUserController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 6bc8bd7..1482bfa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -38,7 +39,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user-info") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user-info") public class SysUserInfoController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java index 61ab42d..77ff2a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.core.apiservice.websocket; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +21,7 @@ import java.util.concurrent.ConcurrentMap; * @CreateDate : 2018-11-24 16:57 * @Modify: **/ -@ServerEndpoint(value= CoreBaseController.BASE_URL + "/message-websocket/{userId}") +@ServerEndpoint(value= PlatformConstWords.BASE_URL + "/message-websocket/{userId}") @Component public class MessageWebSocket { diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java index 3c5aa24..c330bce 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java @@ -34,7 +34,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Department obj = new Department(); // obj.setName("Junit Test " + i); -// obj.setDepartmentCode("TEST_JUNIT " + i); +// obj.setDepartmentCode("DEV_JUNIT " + i); // obj.setParentId(1057165194242953216L); // obj.setOrganizeId(1057163974900060160L); // obj = departmentService.insertDepartment(obj); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java index 11f7e07..af77e5d 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java @@ -35,7 +35,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Organize obj = new Organize(); // obj.setName("Junit Test " + i); -// obj.setOrganizeCode("TEST_JUNIT " + i); +// obj.setOrganizeCode("DEV_JUNIT " + i); // obj.setParentId(-1L); // obj = organizeService.insertOrganize(obj); // System.out.println(JSON.toJSONString(obj)); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java index 8626b4f..3e53b3b 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java @@ -35,7 +35,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Position position = new Position(); // position.setName("Junit Test " + i); -// position.setPositionCode("TEST_JUNIT " + i); +// position.setPositionCode("DEV_JUNIT " + i); // position = positionService.insertPosition(position); // System.out.println(JSON.toJSONString(position)); // } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java index 1ec458c..8922e68 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java @@ -53,7 +53,7 @@ // SysDictionary sysDictionary = new SysDictionary(); // sysDictionary.setName("字典测试"); // sysDictionary.setDictionaryCode("dic_test"); -// sysDictionary.setDictionaryValue("TEST"); +// sysDictionary.setDictionaryValue("DEV"); // sysDictionary.setDictionaryDescription("字典测试"); // // sysDictionaryService.insertSysDictionary(sysDictionary); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java index e056eac..ce918a3 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java @@ -68,7 +68,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // SysMenu obj = new SysMenu(); // obj.setName("Junit Test " + i); -// obj.setMenuCode("TEST_JUNIT " + i); +// obj.setMenuCode("DEV_JUNIT " + i); // obj.setParentId(-1L); // obj = sysMenuService.insertSysMenu(obj); // System.out.println(JSON.toJSONString(obj)); From e9b01fe54e43d576a5c9a14dca3cb262dd0706e0 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 12 Dec 2018 13:20:41 +0800 Subject: [PATCH 16/16] remove .idea --- i3plus-core.iml | 12 - modules/i3plus-core-api/i3plus-core-api.iml | 102 ------- .../i3plus-core-apiservice.iml | 294 --------------------- 3 files changed, 408 deletions(-) delete mode 100644 i3plus-core.iml delete mode 100644 modules/i3plus-core-api/i3plus-core-api.iml delete mode 100644 modules/i3plus-core-apiservice/i3plus-core-apiservice.iml diff --git a/i3plus-core.iml b/i3plus-core.iml deleted file mode 100644 index a0d4a1e..0000000 --- a/i3plus-core.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-api/i3plus-core-api.iml b/modules/i3plus-core-api/i3plus-core-api.iml deleted file mode 100644 index b27d1a0..0000000 --- a/modules/i3plus-core-api/i3plus-core-api.iml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml b/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml deleted file mode 100644 index 6628966..0000000 --- a/modules/i3plus-core-apiservice/i3plus-core-apiservice.iml +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file