Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0a90715b60
|
|
@ -42,7 +42,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
|
||||||
Object forced = request.getAttribute("forceLogoutByOtherDevice");
|
Object forced = request.getAttribute("forceLogoutByOtherDevice");
|
||||||
if (Boolean.TRUE.equals(forced))
|
if (Boolean.TRUE.equals(forced))
|
||||||
{
|
{
|
||||||
String msg = "检测到您的账号已在其他设备登录";
|
String msg = "multipleDeviceLogin";
|
||||||
ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.UNAUTHORIZED, msg)));
|
ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(HttpStatus.UNAUTHORIZED, msg)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
|
||||||
Object forced = request.getAttribute("forceLogoutByOtherDevice");
|
Object forced = request.getAttribute("forceLogoutByOtherDevice");
|
||||||
if (Boolean.TRUE.equals(forced))
|
if (Boolean.TRUE.equals(forced))
|
||||||
{
|
{
|
||||||
msg = "检测到您的账号已在其他设备登录,当前会话已下线。如非本人操作,请立即修改密码。";
|
msg = "multipleDeviceLogin";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue