|
|
@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.sky.ioc.config.RestTemplateConfig;
|
|
|
import com.sky.ioc.constant.Constant;
|
|
|
-import com.sky.ioc.entity.domain.system.Menus;
|
|
|
import com.sky.ioc.entity.domain.system.Users;
|
|
|
import com.sky.ioc.entity.result.system.LoginUserVo;
|
|
|
import com.sky.ioc.mapper.job.TokenMapper;
|
|
|
@@ -23,14 +22,16 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.http.HttpEntity;
|
|
|
import org.springframework.http.HttpHeaders;
|
|
|
import org.springframework.http.MediaType;
|
|
|
-import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.util.*;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
@Service
|
|
|
@Slf4j
|
|
|
@@ -70,6 +71,7 @@ public class UserServiceImpl implements UserService {
|
|
|
// 认证成功
|
|
|
LoginUserVo loginUser = new LoginUserVo();
|
|
|
BeanUtils.copyProperties(users, loginUser);
|
|
|
+ loginUser.setId(users.getId());
|
|
|
|
|
|
String token = JwtUtil.genJwtToken(users);
|
|
|
|
tianyabing