From a297980511dbbe165a24b83f66231818923a7bcc Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 18 May 2023 16:59:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=90=8E=E4=B8=8D=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=99=BB=E9=99=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将新的sessionId返回给前端 --- .../com/adc/da/login/rest/LoginRestController.java | 14 ++++++++------ .../src/main/java/com/adc/da/sys/vo/UserVO.java | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java b/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java index ea81179..f599cf8 100644 --- a/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java +++ b/adc-da-login/src/main/java/com/adc/da/login/rest/LoginRestController.java @@ -350,7 +350,9 @@ public class LoginRestController { CacheUtils.putShiroSessionCache(userEO.getUsid(), session.getId()); } - return Result.success(beanMapper.map(returnEO, UserVO.class)); + ResponseMessage result = Result.success(beanMapper.map(returnEO, UserVO.class)); + result.getData().setSessionId(session.getId()); + return result; } catch (CaptchaException e) { log.info("验证码验证失败"); @@ -506,12 +508,12 @@ public class LoginRestController { @ResponseBody @ApiOperation(value = "SSO，根据Code返回用户信息") public ResponseMessage ssoLogin(String code, HttpServletRequest request){ -// if (StrUtil.isBlank(code)) { -// return Result.error("无法单点登录，code为空"); -// } -// String username = userService.ssoLogin(code); + if (StrUtil.isBlank(code)) { + return Result.error("无法单点登录，code为空"); + } + String username = userService.ssoLogin(code); - UsernamePasswordToken token = new UsernamePasswordToken("chh"); + UsernamePasswordToken token = new UsernamePasswordToken(username); return login(request, token); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java index 6c69d6f..7b4e4be 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/UserVO.java @@ -56,4 +56,6 @@ public class UserVO { private List orgEOList = new ArrayList(); private String employeeTypeId; + + private String sessionId; }