diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index ae7f1d8..2362109 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -65,15 +65,15 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { @Override public void updateSysLocaleResource(SysLocaleResource sysLocaleResource) { LOGGER.info("系统资源 SYS_LOCALE_RESOURCE SysLocaleResource:{}",sysLocaleResource); - String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource); - int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack); - if (count > 0){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("语言资源已存在") - .setErrorSolution("请重新输入语言代码与资源键") - .build(); + String hqlPack = CoreHqlPack.packHqlSysLocaleResourceKey(sysLocaleResource); + int count = sysLocaleResourceRDao.findByHqlWhereCount(hqlPack); + if (count > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("语言资源已存在") + .setErrorSolution("请重新输入语言代码与资源键") + .build(); } // 设置语言名称冗余 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 39e738f..8cdeeaa 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 @@ -139,8 +139,8 @@ public class SysUserService implements ISysUserService { LOGGER.debug("平台用户 SYS_USER Override:{} password:{} newPwd:{}", userId,password,newPwd); SysUser user = sysUserRDao.getById(userId); if(user != null){ - String md5 = EncryptTool.hexMD5(password); - if(md5.equals(user.getUserLoginPassword())){ + String pwdMd5 = EncryptTool.hexMD5(password); + if(pwdMd5.equals(user.getUserLoginPassword())){ user.setUserLoginPassword(EncryptTool.hexMD5(newPwd)); sysUserRDao.save(user); }else { @@ -335,7 +335,7 @@ public class SysUserService implements ISysUserService { @Override @ApiOperation(value = "检查-账号登录名", notes = "判断账号是否存在") public boolean checkSysUserLoginName(String userLoginName, long id) { - int count; + int count = 0; if(id > 0){ StringBuffer sw = new StringBuffer(); HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw); 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 f79b292..a20c70a 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -136,7 +136,7 @@ impp.schedule.thread-priority=5 ################ 数据池设置 ################ -spring.datasource.maximum-pool-size=100 +spring.datasource.maximum-pool-size=10 spring.datasource.max-active=3 spring.datasource.max-idle=3 spring.datasource.min-idle=1 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 214ecea..c44a5d0 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-prod.properties @@ -131,7 +131,7 @@ impp.schedule.thread-priority=5 ################ 数据池设置 ################ -spring.datasource.maximum-pool-size=100 +spring.datasource.maximum-pool-size=10 spring.datasource.max-active=3 spring.datasource.max-idle=3 spring.datasource.min-idle=1 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 e5a0fcd..dc8c7ee 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -136,7 +136,7 @@ impp.schedule.thread-priority=5 ################ 数据池设置 ################ -spring.datasource.maximum-pool-size=100 +spring.datasource.maximum-pool-size=10 spring.datasource.max-active=3 spring.datasource.max-idle=3 spring.datasource.min-idle=1