merge
This commit is contained in:
@@ -153,7 +153,7 @@ public class SysUserControl {
|
||||
@GetMapping("getLoginUserInfo")
|
||||
public JSONObject getLoginUserInfo() {
|
||||
String token = ThreadLocalUtil.getToken();
|
||||
String userName = (String) CommonDataUtil.getToken(token);
|
||||
String userName = (String) CommonDataUtil.getData(token);
|
||||
SysUser sysUser = sysUserService.getByUserName(userName);
|
||||
if (sysUser == null) {
|
||||
return JsonResult.toJSONObj("未获取到当前登录用户信息");
|
||||
|
||||
@@ -52,14 +52,14 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
|
||||
String token = request.getHeader("token");
|
||||
if (session == null) {
|
||||
getOutputStream(response, "登录超时,请重新登录");
|
||||
CommonDataUtil.removeToken(token);
|
||||
CommonDataUtil.removeData(token);
|
||||
return false;
|
||||
} else {
|
||||
if (StringUtils.isEmpty(token)) {
|
||||
getOutputStream(response, "token不能为空");
|
||||
return false;
|
||||
} else {
|
||||
if (CommonDataUtil.getToken(token) != null) {
|
||||
if (CommonDataUtil.getData(token) != null) {
|
||||
ThreadLocalUtil.setToken(token);
|
||||
return true;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user