|
@@ -1,6 +1,5 @@
|
|
|
package org.jeecg.modules.system.service.impl;
|
|
|
|
|
|
-import cn.hutool.core.collection.CollectionUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
@@ -15,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.shiro.SecurityUtils;
|
|
|
-import org.apache.shiro.authc.AuthenticationException;
|
|
|
import org.jeecg.common.api.CommonAPI;
|
|
|
import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.config.TenantContext;
|
|
@@ -42,7 +40,6 @@ import org.jeecg.modules.system.vo.lowapp.DepartAndUserInfo;
|
|
|
import org.jeecg.modules.system.vo.lowapp.DepartInfo;
|
|
|
import org.jeecg.modules.system.vo.lowapp.UpdateDepartInfo;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
@@ -1303,6 +1300,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
*/
|
|
|
@Override
|
|
|
public LoginUser getLoginUser(String token) {
|
|
|
+ if (StringUtils.isBlank(token)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
String username = JwtUtil.getUsername(token);
|
|
|
// 查询用户信息
|
|
|
return TokenUtils.getLoginUser(username, commonApi, redisUtil);
|