提交所有代码到 qiaoxinjiu 分支

app/api/controller/userController.py

@@ -2,7 +2,7 @@
 from .baseCrudController import BaseCrudController
 from ..model.userModel import User
 from ..service.userService import UserService
-from ..utils.authMiddleware import TOKEN_REFRESH_THRESHOLD_SECONDS, create_token
+from ..utils.authMiddleware import TOKEN_REFRESH_THRESHOLD_SECONDS, create_token, create_refresh_token
 
 
 class UserController(BaseCrudController):
@@ -118,11 +118,14 @@ class UserController(BaseCrudController):
             return {}, '用户已禁用！'
         UserService.update_last_login_time(self.session, user.id)
         token, expire_seconds = create_token(user.id)
+        refresh_token, refresh_expire_seconds = create_refresh_token(user.id)
         ret = self.serialize(user, ['is_delete', 'password_hash'])
         ret['role_ids'] = UserService.get_user_role_ids(self.session, user.id)
         ret['token'] = token
         ret['token_type'] = 'Bearer'
         ret['expires_in'] = expire_seconds
+        ret['refresh_token'] = refresh_token
+        ret['refresh_expires_in'] = refresh_expire_seconds
         ret['refresh_threshold_seconds'] = TOKEN_REFRESH_THRESHOLD_SECONDS
         ret['refresh_mechanism'] = '请求任意已登录接口时，若token剩余有效期小于阈值则自动续期到完整有效期'
         return ret, ''