From a3ae9dc14e3625b2af4f01b6fe4714512ab6bf32 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 18 Jul 2019 14:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=9A=E8=AF=9D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87ID=20=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=95=99=E7=A0=94=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E8=A1=A8=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java | 4 ++-- .../i3plus/core/apiservice/controller/base/WhiteController.java | 6 +++--- .../i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 7 ++++--- 3 files changed, 9 insertions(+), 8 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 4604a25..0eff148 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 @@ -26,7 +26,7 @@ public interface ISysUserService { * @return */ @ApiOperation(value = "账号登录",notes = "普通账号登录功能") - SessionUser queryUserLogin(String loginName, String password, String languageCode,Integer loginPlatform) throws AuthenticationException; + SessionUser queryUserLogin(String loginName, String password, String languageCode,Integer loginPlatform,String deviceId) throws AuthenticationException; @ApiOperation(value = "获取Token",notes = "根据登录名判断是否是管理员") BaseToken getToken(String loginName, String password, String languageCode,Integer loginPlatform); @@ -247,7 +247,7 @@ public interface ISysUserService { * @return */ @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") - SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType,Integer loginPlatform, String languageCode); + SessionUser packSessionUser(SessionUser sessionUser, SysUser user, Integer userType,Integer loginPlatform, String languageCode, String deviceId); /** * 根据id查询用户信息 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index cb77483..e3b8cd4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -114,7 +114,8 @@ public class WhiteController extends CoreBaseController { @GetMapping(value="/auth/login") @ApiOperation(value="登陆",notes="登陆") public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, String languageCode, - @RequestParam(required = false) String ipAddr){ + @RequestParam(required = false) String ipAddr, + @RequestParam(required = false) String deviceId){ startMultiService(); LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); @@ -125,13 +126,12 @@ public class WhiteController extends CoreBaseController { ValidatorBean.checkNotNull(languageCode,"语言不能为空"); logout(); - SessionUser user = userService.queryUserLogin(loginName.trim(), loginPwd.trim(), languageCode, getLoginPlatform().getValue()); + SessionUser user = userService.queryUserLogin(loginName.trim(), loginPwd.trim(), languageCode, getLoginPlatform().getValue(),deviceId); String redisKey = CommonConstWords.USER_LOGIN_ERROR + "_" + user.getUser().getId(); redisCore.deleteKey(redisKey); LOGGER.info("会员登陆：{}",user); - // Session 信息分装 result = new ResultBean(true, AuthUtil.getSession().getId().toString(), AuthUtil.getSessionUser()); result.setUrl("/"); 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 0cb2328..fce464a 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 @@ -113,7 +113,7 @@ public class SysUserService implements ISysUserService { @Override @ApiOperation(value = "用户登录", notes = "用户登录功能实现") @Transactional(propagation = Propagation.REQUIRED) - public SessionUser queryUserLogin(String loginName, String password, String languageCode,Integer loginPlatform) throws AuthenticationException { + public SessionUser queryUserLogin(String loginName, String password, String languageCode,Integer loginPlatform,String deviceId) throws AuthenticationException { LOGGER.debug("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode); BaseToken token = getToken(loginName, password, languageCode, loginPlatform); @@ -123,7 +123,7 @@ public class SysUserService implements ISysUserService { if(user == null){ throw new CredentialsException("用户不存在"); } - packSessionUser(sessionUser, user, user.getUserType(),loginPlatform, languageCode); + packSessionUser(sessionUser, user, user.getUserType(),loginPlatform, languageCode,deviceId); AuthUtil.setSessionUser(sessionUser); refreshUserLoginInformation(user.getId()); AuthUtil.online(sessionUser); @@ -567,7 +567,7 @@ public class SysUserService implements ISysUserService { */ @Override @ApiOperation(value = "封装用户信息",notes = "封装登录完成后的用户信息(角色、权限、部门、组织、岗位)") - public SessionUser packSessionUser(SessionUser sessionUser, SysUser user,Integer userType,Integer loginPlatform, String languageCode) { + public SessionUser packSessionUser(SessionUser sessionUser, SysUser user,Integer userType,Integer loginPlatform, String languageCode, String deviceId) { LOGGER.debug("平台用户 SYS_USER user id :{}", user.getId()); SysUserInfo userInfo = sysUserInfoRDao.getById(user.getUserInfoId()); @@ -593,6 +593,7 @@ public class SysUserService implements ISysUserService { // sessionUser.setUserType(CommonEnumUtil.USER_TYPE.valueOf(userType)); sessionUser.setUserId(user.getId()); + sessionUser.setDeviceId(deviceId); sessionUser.setLanguageCode(languageCode); sessionUser.setLoginPlatform(loginPlatform); sessionUser.setToken(AuthUtil.getSession().getId().toString());