|
@@ -3,6 +3,7 @@ package com.its.op.controller.its;
|
|
|
import com.its.op.config.AppUtils;
|
|
|
import com.its.op.config.JasyptConfig;
|
|
|
import com.its.op.dto.its.LoginDto;
|
|
|
+import com.its.op.dto.its.common.UserInfoDto;
|
|
|
import com.its.op.dto.its.oper.UserMenuDto;
|
|
|
import com.its.op.security.WebMvcConfig;
|
|
|
import com.its.op.service.its.LoginService;
|
|
@@ -91,7 +92,7 @@ public class LoginController {
|
|
|
// }
|
|
|
|
|
|
@PostMapping({"/userinfo.do"})
|
|
|
- public String getUserInfo(HttpServletRequest request, HttpServletResponse response) {
|
|
|
+ public UserInfoDto getUserInfo(HttpServletRequest request, HttpServletResponse response) {
|
|
|
Cookie[] cookies = request.getCookies();
|
|
|
for (int ii = 0; ii < cookies.length; ii++) {
|
|
|
log.error("getUserInfo: {}, {}", cookies[ii].getName(), cookies[ii].getValue());
|
|
@@ -102,8 +103,6 @@ public class LoginController {
|
|
|
try {
|
|
|
encUserId = CookieUtils.getCookie(request, WebMvcConfig.USER_UUID);
|
|
|
loginHms = CookieUtils.getCookie(request, WebMvcConfig.USER_TIME);
|
|
|
- expiredCookie(response, WebMvcConfig.USER_UUID);
|
|
|
- expiredCookie(response, WebMvcConfig.USER_TIME);
|
|
|
} catch (Exception e) {
|
|
|
log.error("{}", e.getMessage());
|
|
|
}
|
|
@@ -117,7 +116,7 @@ public class LoginController {
|
|
|
log.info("logout: {}", req.toString());
|
|
|
encUserId = userId;
|
|
|
}
|
|
|
- return encUserId;
|
|
|
+ return UserInfoDto.builder().userId(encUserId).build();
|
|
|
}
|
|
|
|
|
|
/**
|