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-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 3357d31..0e89344 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -284,6 +284,7 @@ public class ReportManageConroller { return Result.success(); } + // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉 /** * 测试 */ @@ -294,6 +295,8 @@ public class ReportManageConroller { stringRedisTemplate.boundValueOps("1121212").set("1212"); } + + // TODO 测试完不需要的代码请删掉,然后再把这个TODO也删掉 @ApiOperation("testPath") @GetMapping("/testPath") @Deprecated 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; }