|
@@ -198,7 +198,17 @@ public class SSOLoginLogoutController {
|
|
|
loginResult.setUpdate(false);
|
|
|
return loginResult;
|
|
|
}else {
|
|
|
- response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=3600; Path=/", eiToken));
|
|
|
+// response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=3600; Path=/", eiToken));
|
|
|
+// response.setHeader("Set-Cookie", String.format("WISEUser=%s; Max-Age=3600; Path=/", usernameSSO));
|
|
|
+
|
|
|
+ Cookie cookie = new Cookie("EIToken", eiToken);
|
|
|
+ Cookie cookie1 = new Cookie("WISEUser", usernameSSO);
|
|
|
+ cookie.setMaxAge(3600);
|
|
|
+ cookie1.setMaxAge(3600);
|
|
|
+ cookie.setPath("/");
|
|
|
+ cookie1.setPath("/");
|
|
|
+ response.addCookie(cookie);
|
|
|
+ response.addCookie(cookie1);
|
|
|
|
|
|
// 如果没有联锁token,或者有但与sso现在登录的账号名字不一样,都需要登录并返回登录信息
|
|
|
if(lsToken==null || "".equals(lsToken) || !usernameSSO.equals(JwtUtil.getUsername(lsToken))){
|
|
@@ -258,7 +268,16 @@ public class SSOLoginLogoutController {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=3600; Path=/", eiToken));
|
|
|
+// response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=3600; Path=/", eiToken));
|
|
|
+// response.setHeader("Set-Cookie", String.format("WISEUser=%s; Max-Age=3600; Path=/", username));
|
|
|
+ Cookie cookie = new Cookie("EIToken", eiToken);
|
|
|
+ Cookie cookie1 = new Cookie("WISEUser", username);
|
|
|
+ cookie.setMaxAge(3600);
|
|
|
+ cookie1.setMaxAge(3600);
|
|
|
+ cookie.setPath("/");
|
|
|
+ cookie1.setPath("/");
|
|
|
+ response.addCookie(cookie);
|
|
|
+ response.addCookie(cookie1);
|
|
|
|
|
|
//1. 校验用户是否有效
|
|
|
SysUser sysUser = sysUserService.getUserAll(username);
|
|
@@ -502,7 +521,15 @@ public class SSOLoginLogoutController {
|
|
|
String msg = IoTedgessolgout(response);
|
|
|
if(!SSOConstants.LOGOUT_SUCCESS.equals(msg)) return Result.error(msg);
|
|
|
|
|
|
- response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=0; Path=/", ""));
|
|
|
+// response.setHeader("Set-Cookie", String.format("EIToken=%s; Max-Age=0; Path=/", ""));
|
|
|
+ Cookie cookie = new Cookie("EIToken", "");
|
|
|
+ Cookie cookie1 = new Cookie("WISEUser", "");
|
|
|
+ cookie.setMaxAge(0);
|
|
|
+ cookie1.setMaxAge(0);
|
|
|
+ cookie.setPath("/");
|
|
|
+ cookie1.setPath("/");
|
|
|
+ response.addCookie(cookie);
|
|
|
+ response.addCookie(cookie1);
|
|
|
|
|
|
//用户退出逻辑
|
|
|
String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN);
|