diff --git a/device-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java index f800cfc2b41035d81716a3db134bade605b8c4a7..bea4dd92a6d45a6319f492945db324503161891d 100644 --- a/device-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java +++ b/device-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java @@ -8,6 +8,8 @@ import com.mortals.framework.service.IUser; import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.StringUtils; import com.mortals.xhx.base.system.user.model.UserEntity; +import com.mortals.xhx.base.system.user.model.UserQuery; +import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.common.code.PlatformTypeEnum; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; @@ -17,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletRequest; import java.util.Base64; @@ -58,6 +61,9 @@ public class AuthTokenServiceImpl implements IAuthTokenService { @Value("${platform.type:cloud}") private String platFormType;//鐗堟湰锛岄粯璁や簯鏈嶅姟鐗堟湰 + @Autowired + private UserService userService; + protected static final Long SECOND = 1l; protected static final Long SECOND_MINUTE = 60 * SECOND; @@ -98,10 +104,14 @@ public class AuthTokenServiceImpl implements IAuthTokenService { } else { userStr = cacheService.get(userKey); } - if (StringUtils.isNotEmpty(userStr)) { UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class); userEntity.setToken(token); + //鏇存柊portal 涓殑id 涓� device涓殑id + UserEntity temp = userService.selectOne(new UserQuery().loginName(userEntity.getLoginName())); + if(!ObjectUtils.isEmpty(temp)){ + userEntity.setId(temp.getId()); + } return userEntity; } } catch (Exception e) {