diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 94616290..1ef39967 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -115,10 +115,13 @@ public class TokenController {
 
             AccessTokenVo accessTokenVo = JSON.parseObject(body, AccessTokenVo.class);
             String accessToken = accessTokenVo.getAccess_token();
+            Integer expiresIn = accessTokenVo.getExpires_in();
             AccessTokenVo.Account_info accountInfo = accessTokenVo.getAccount_info();
 
             // 用户登录
             LoginUser userInfo = sysLoginService.login(accountInfo);
+            userInfo.setToken(accessToken);
+            userInfo.setExpireTime(Long.valueOf(expiresIn));
             // 获取登录token
             Map<String, Object> token = tokenService.createToken(userInfo);
             token.put("checkTokenUri", oauth2ClientProperties.getCheckTokenUri());
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
index 493959aa..a6979432 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -51,25 +51,25 @@ public class TokenService
      */
     public Map<String, Object> createToken(LoginUser loginUser)
     {
-        String token = IdUtils.fastUUID();
+//        String token = IdUtils.fastUUID();
         Long userId = loginUser.getSysUser().getUserId();
         String userName = loginUser.getSysUser().getUserName();
-        loginUser.setToken(token);
+//        loginUser.setToken(token);
         loginUser.setUserid(userId);
         loginUser.setUsername(userName);
         loginUser.setIpaddr(IpUtils.getIpAddr());
         refreshToken(loginUser);
 
         // Jwt存储信息
-        Map<String, Object> claimsMap = new HashMap<String, Object>();
-        claimsMap.put(SecurityConstants.USER_KEY, token);
+        Map<String, Object> claimsMap = new HashMap<>();
+        claimsMap.put(SecurityConstants.USER_KEY, loginUser.getToken());
         claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId);
         claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName);
 
         // 接口返回信息
-        Map<String, Object> rspMap = new HashMap<String, Object>();
+        Map<String, Object> rspMap = new HashMap<>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
-        rspMap.put("expires_in", expireTime);
+        rspMap.put("expires_in", loginUser.getExpireTime());
         return rspMap;
     }