登陆信息返回完善

vetti-admin/src/main/java/com/vetti/web/controller/system/SysLoginController.java

@@ -60,11 +60,8 @@ public class SysLoginController
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody)
     {
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+        AjaxResult ajax = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
         return ajax;
     }
 

vetti-framework/src/main/java/com/vetti/framework/web/service/SysLoginService.java

@@ -2,6 +2,7 @@ package com.vetti.framework.web.service;
 
 import javax.annotation.Resource;
 
+import com.vetti.common.core.domain.AjaxResult;
 import com.vetti.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -63,8 +64,9 @@ public class SysLoginService
      * @param uuid 唯一标识
      * @return 结果
      */
-    public String login(String username, String password, String code, String uuid)
+    public AjaxResult login(String username, String password, String code, String uuid)
     {
+        AjaxResult ajax = AjaxResult.success();
         // 验证码校验
 //        validateCaptcha(username, code, uuid);
         // 登录前置校验
@@ -99,7 +101,10 @@ public class SysLoginService
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordLoginInfo(loginUser.getUserId());
         // 生成token
-        return tokenService.createToken(loginUser);
+        ajax.put(Constants.TOKEN, tokenService.createToken(loginUser));
+        ajax.put("userId",loginUser.getUserId());
+        return ajax;
+
     }
 
     /**