From b3264ae909538057d3be19450f5e9e21dfeb4ad7 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 20:40:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8B=86=E5=88=86=20=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 29454af..6eb145e 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8081 +server.port=8080 #用户登陆路径 filter.shiro.user.loginuri = /login From 3bce009cfcb8a92888fd083d4bf7907c615e8856 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 22:31:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/api/iservice/busi/ISysMenuService.java | 2 +- .../i3plus/core/api/iservice/busi/ISysUserService.java | 7 +++++++ .../core/apiservice/controller/DemoAuthController.java | 1 + .../apiservice/controller/busi/SysMenuController.java | 15 ++++++++------- .../apiservice/serviceimpl/busi/SysMenuService.java | 8 ++++---- .../apiservice/serviceimpl/busi/SysUserService.java | 18 ++++++++++++++++-- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java index d592364..2f1b057 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java @@ -47,7 +47,7 @@ public interface ISysMenuService { * @param id * @return */ - void deleteSysMenuById(String id); + void deleteSysMenuById(Long id); /** * 根据id批量删除 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 425febc..83d9de6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -3,6 +3,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.*; +import sun.rmi.runtime.Log; import java.util.List; @@ -56,6 +57,12 @@ public interface ISysUserService { void updateSysUserPassword(String userIdStr,String password,String newPwd) throws Exception; /** + * 修改用户最后登录时间 + * @param userId + */ + void updateUserLoginLastDateTime(Long userId); + + /** * 新增用户信息 * @param sysUser 新增用户 * @return 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 f24a71d..e865e49 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 @@ -33,6 +33,7 @@ import java.util.Map; @Api(description="登陆授权demo") public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); + @Autowired private ISystemLoginService systemLoginService; 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 64dc0f7..24e491f 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; + import cn.estsh.impp.framework.base.controller.BaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -33,7 +34,7 @@ @RestController @RequestMapping("/sys-menu") @Api(description = "系统功能服务") -public class SysMenuController { +public class SysMenuController extends BaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class); @@ -51,7 +52,7 @@ public class SysMenuController { .notNull("menuTypeId", menu.getMenuTypeId()); //新增初始化 - ConvertBean.modelInitialize(menu, AuthUtil.getSessionUser()); + ConvertBean.modelInitialize(menu, getSessionUser()); if(menu.getParentId() == null || menu.getParentId().intValue() == 0){ menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); } @@ -78,7 +79,7 @@ public class SysMenuController { .notNull("menuCode", sysMenu.getMenuCode()) .notNull("name", sysMenu.getName()); - ConvertBean.modelUpdate(sysMenu, AuthUtil.getSessionUser()); + ConvertBean.modelUpdate(sysMenu, getSessionUser()); sysMenuService.updateSysMenu(sysMenu); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -95,9 +96,9 @@ public class SysMenuController { public ResultBean deleteSysMenu(@PathVariable("id") String id) { try { // 数据校验 - ValidatorBean.checkNotNull(id, "系统功能id 不能为空"); + ValidatorBean.checkIsNumber(id, "系统功能id 不能为空"); - sysMenuService.deleteSysMenuById(id); + sysMenuService.deleteSysMenuById(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); @@ -172,7 +173,7 @@ public class SysMenuController { ValidatorBean.checkNotNull(id, "功能id 不能为空"); ValidatorBean.checkNotZero(status, "功能状态不能为空"); - sysMenuService.updateSysMenuStatus(id,status,AuthUtil.getSessionUser()); + sysMenuService.updateSysMenuStatus(id,status,getSessionUser()); return new ResultBean(true); } catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); @@ -192,7 +193,7 @@ public class SysMenuController { ValidatorBean.checkNotNull(ids, "功能id 不能为空"); ValidatorBean.checkNotZero(status, "功能状态不能为空"); - sysMenuService.updateSysMenuStatusByIds(ids,status,AuthUtil.getSessionUser()); + sysMenuService.updateSysMenuStatusByIds(ids,status,getSessionUser()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index a9aaf9c..9f7ebc6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -103,9 +103,9 @@ public class SysMenuService implements ISysMenuService { } @Override - public void deleteSysMenuById(String id) { + public void deleteSysMenuById(Long id) { LOGGER.info("系统功能 SYS_MENU Key:{}", id); - long count = sysMenuRDao.findByPropertyCount("parentId",Long.parseLong(id)); + long count = sysMenuRDao.findByPropertyCount("parentId",id); if(count >= 1){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) @@ -116,8 +116,8 @@ public class SysMenuService implements ISysMenuService { } - refRoleMenuRDao.deleteByProperty("menuId",id); - sysMenuRDao.deleteById(Long.parseLong(id)); + refRoleMenuRDao.deleteById(id); + sysMenuRDao.deleteById(id); } @Override 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 3ad8e85..5ba931b 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -100,6 +101,7 @@ public class SysUserService implements ISysUserService { packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode); AuthUtil.setSessionUser(sessionUser); + updateUserLoginLastDateTime(user.getId()); return sessionUser; } @@ -107,7 +109,7 @@ public class SysUserService implements ISysUserService { public void updateSysUserStatus(String id, int status, SessionUser user) { LOGGER.debug("平台用户 SYS_USER id:{} status:{} modifyUser:{}", id, status, user.getUserName()); SysUser sysUser = sysUserRDao.getById(Long.parseLong(id)); -// sysUser.setUserStatusId(status); + sysUser.setUserStatus(status); sysUser.setModifyUser(user.getUserName()); sysUserRDao.update(sysUser); } @@ -120,7 +122,7 @@ public class SysUserService implements ISysUserService { List list = sysUserRDao.findByHqlWhere(where); if(null != list && list.size() > 0){ for (SysUser sysUser : list) { -// sysUser.setUserStatusId(status); + sysUser.setUserStatus(status); sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.modelUpdate(sysUser,user); } @@ -182,6 +184,18 @@ public class SysUserService implements ISysUserService { } @Override + public void updateUserLoginLastDateTime(Long userId) { + SysUser user = sysUserRDao.getById(userId); + SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); + + user.setUserLoginLastDateTime(TimeTool.getNowTime(true)); + userInfo.setUserLoginLastDateTime(TimeTool.getNowTime(true)); + + sysUserInfoRDao.save(userInfo); + sysUserRDao.save(user); + } + + @Override public SysUser insertSysUser(SysUser sysUser)throws Exception { LOGGER.debug("平台用户 SYS_USER SysUser:{}", sysUser); From b3149f21b454ea0e4137bf4bbf9816702825da5f Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 22:40:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/TaskTimeController.java | 4 ++-- .../busi/TaskTimeExpressionController.java | 21 ++++++--------------- .../src/main/resources/application-dev.properties | 2 +- .../busi/TestTaskTimeExpressionService.java | 4 ++-- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index 406129b..78bf797 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -59,7 +59,7 @@ public class TaskTimeController { ValidatorBean.beginValid(taskTimeExpression); taskTime.setRedTimeName(taskTimeExpression.getName()); - taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression()); + taskTime.setRedTimeExpression(taskTimeExpression.getExpressionContent()); taskTime.setTaskStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue()); ConvertBean.modelInitialize(taskTime, AuthUtil.getSessionUser()); @@ -95,7 +95,7 @@ public class TaskTimeController { // 数据冗余 taskTime.setRedTimeName(taskTimeExpression.getName()); - taskTime.setRedTimeExpression(taskTimeExpression.getTimeExpression()); + taskTime.setRedTimeExpression(taskTimeExpression.getExpressionContent()); ConvertBean.modelUpdate(taskTime, AuthUtil.getSessionUser()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 7419418..935f3b9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java @@ -46,16 +46,12 @@ public class TaskTimeExpressionController { // 数据校验 ValidatorBean.beginValid(timeExpression) .notNull("name", timeExpression.getName()) - .notNull("timeExpression", timeExpression.getTimeExpression()) - .notNull("timeDescription", timeExpression.getTimeDescription()); + .notNull("expressionContent", timeExpression.getExpressionContent()) + .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime()); - ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser()); + taskTimeExpressionService.insertTaskTimeExpression(timeExpression); - timeExpression = taskTimeExpressionService.insertTaskTimeExpression(timeExpression); - - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(timeExpression); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -73,16 +69,11 @@ public class TaskTimeExpressionController { ValidatorBean.beginValid(timeExpression) .notNull("id", timeExpression.getId()) .notNull("name", timeExpression.getName()) - .notNull("timeExpression", timeExpression.getTimeExpression()) - .notNull("timeDescription", timeExpression.getTimeDescription()); - - ConvertBean.modelInitialize(timeExpression, AuthUtil.getSessionUser()); + .notNull("timeExpression", timeExpression.getExpressionContent()); taskTimeExpressionService.updateTaskTimeExpression(timeExpression); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(timeExpression); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep.getErrorShow()); 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 29454af..6eb145e 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8081 +server.port=8080 #用户登陆路径 filter.shiro.user.loginuri = /login diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java index 1da712a..396275e 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java @@ -54,8 +54,8 @@ public class TestTaskTimeExpressionService extends TestBase { public void testInsertTaskTimeExpression() { TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); taskTimeExpression.setName("表达式"); - taskTimeExpression.setTimeExpression("0000000"); - taskTimeExpression.setTimeDescription("描述"); + taskTimeExpression.setExpressionContent("0000000"); + taskTimeExpression.setExpressionDescription("描述"); for (int i = 0; i < 50; i++) { taskTimeExpression.setId(null); From 04ba139eb64185ea7f93be6f5b0909d193e65323 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 13 Nov 2018 23:22:50 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysUserService.java | 3 +- .../apiservice/controller/base/AuthController.java | 5 +- .../serviceimpl/base/SystemLoginService.java | 36 ++++++--------- .../serviceimpl/busi/SysUserService.java | 54 ++++++++++++---------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 83d9de6..9d014aa 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -3,6 +3,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.*; +import org.apache.shiro.authc.AuthenticationException; import sun.rmi.runtime.Log; import java.util.List; @@ -23,7 +24,7 @@ public interface ISysUserService { * @param languageCode 界面语言 * @return */ - SessionUser queryUserLogin(String loginName, String password, String languageCode); + SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException; /** * 修改权限状态 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 52b246e..5dc904a 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 @@ -14,6 +14,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authc.AuthenticationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -63,7 +64,9 @@ public class AuthController { ResultBean result = new ResultBean(true, "", AuthUtil.getSessionUser()); result.setUrl("/"); return result; - } catch (ImppBusiException e) { + }catch (AuthenticationException e) { + return new ResultBean(false,e.getMessage()); + }catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); }catch (Exception e){ return ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index fa54917..2d375db 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -13,6 +13,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 org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authc.AuthenticationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -86,31 +87,20 @@ public class SystemLoginService implements ISystemLoginService { */ public SysUser getUserLoginInfo(String loginName,String pwd) { SysUser user = sysUserRDao.getByProperty("userLoginName",loginName); - - try { // 密码加密 - pwd = EncryptTool.hexMD5(pwd); - }catch (Exception e){ - e.printStackTrace(); - } - if(user == null){ //用户不存在 - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) - .setErrorDetail("用户不存在") - .setErrorSolution("重新登陆") - .build(); - } - - if (!StringUtils.equals(user.getUserLoginPassword(),pwd )) { //密码不符 - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode()) - .setErrorCode(ImppExceptionEnum.LOGIN_EXCEPTION.getCode()) - .setErrorDetail("登陆密码错误") - .setErrorSolution("重新输入") - .build(); + throw new AuthenticationException("用户不存在"); + }else { + try { // 密码加密 + pwd = EncryptTool.hexMD5(pwd); + } catch (Exception e) { + LOGGER.error("登录密码加密出错。"); + throw new AuthenticationException("登陆密码错误"); + } + if (!StringUtils.equals(user.getUserLoginPassword(), pwd)) { //密码不符 + throw new AuthenticationException("登陆密码错误"); + } + return user; } - return user; } /** 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 5ba931b..4ddd263 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 @@ -19,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 cn.estsh.impp.framework.boot.util.ValidatorBean; +import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationToken; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -71,33 +72,38 @@ public class SysUserService implements ISysUserService { private RefUserPositionRepository refUserPositionRDao; @Override - public SessionUser queryUserLogin(String loginName, String password, String languageCode) { + public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException { LOGGER.debug("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode); - SysUser user = getSysUserByLoginName(loginName); - - if(user == null){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode()) - .setErrorDetail("用户名不存在") - .setErrorSolution("请重新输入用户名") - .build(); - } - - AuthenticationToken token = null; - switch (user.getUserTypeId()) { - case 2: - token = new AdminToken(loginName, password, languageCode); - break; - case 3: - token = new SaAdminToken(loginName, password, languageCode); - break; - default: - token = new UserToken(loginName, password, languageCode); - break; - } +// SysUser user = this.getSysUserByLoginName(loginName); +// +// if(user == null){ +// throw ImppExceptionBuilder.newInstance() +// .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) +// .setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode()) +// .setErrorDetail("用户名不存在") +// .setErrorSolution("请重新输入用户名") +// .build(); +// } +// +// AuthenticationToken token = null; +// switch (user.getUserTypeId()) { +// case 2: +// token = new AdminToken(loginName, password, languageCode); +// break; +// case 3: +// token = new SaAdminToken(loginName, password, languageCode); +// break; +// default: +// token = new UserToken(loginName, password, languageCode); +// break; +// } +// SessionUser sessionUser = AuthUtil.login(token); + + UserToken token = new UserToken(loginName,password,languageCode); + System.out.println("=============" + token); SessionUser sessionUser = AuthUtil.login(token); + SysUser user = this.getSysUserByLoginName(loginName); packSessionUser(sessionUser, user, user.getUserTypeId(), languageCode); AuthUtil.setSessionUser(sessionUser); From 9d111dfd59c63f4331bda0d20fe03235cc25dcb8 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 14 Nov 2018 09:20:56 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java index 9d014aa..b44a3e5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java @@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.*; import org.apache.shiro.authc.AuthenticationException; -import sun.rmi.runtime.Log; - import java.util.List; /** From 651a6ce000d86de0e700adb28c525b3f45bba1f4 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 14 Nov 2018 10:35:16 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 6900032..ccf06e4 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=8080 +server.port=51010 #用户登陆路径 filter.shiro.user.loginuri = /login