去除生成token格式

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

@@ -53,12 +53,10 @@ public class SysLoginController
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody) {
-        AjaxResult ajax = AjaxResult.success();
-        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid());
-        ajax.put(Constants.TOKEN, token);
-        return ajax;
+    public  R<?> login(@RequestBody LoginBody loginBody) {
+        Map<String, Object> login = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid(),loginBody.getUserType());
+        return R.ok(login);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java

@@ -28,23 +28,23 @@ public class LoginBody
     private String uuid;
 
 
-    /**
-     *  单点登陆新增判断是否走验证码
-     */
-    private String value;
+//    /**
+//     *  单点登陆新增判断是否走验证码
+//     */
+//    private String value;
 
     /**
      * 用户类型：00系统用户，01：企业用户，02：政务用户）
      */
     private String userType;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
+//
+//    public String getValue() {
+//        return value;
+//    }
+//
+//    public void setValue(String value) {
+//        this.value = value;
+//    }
 
     public String getUserType() {
         return userType;

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

@@ -31,6 +31,7 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 /**
  * 登录校验方法
@@ -73,7 +74,7 @@ public class SysLoginService {
      * @param uuid     唯一标识
      * @return 结果
      */
-    public String login(String username, String password, String code, String uuid) {
+    public Map<String, Object> login(String username, String password, String code, String uuid, String userType) {
         // 验证码校验
         validateCaptcha(username, code, uuid);
         // 登录前置校验
@@ -98,7 +99,29 @@ public class SysLoginService {
         }
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
-        recordLoginInfo(loginUser.getUserId());
+        //        recordLoginInfo(loginUser.getUserId());
+        if (StringUtils.isNull(loginUser) || StringUtils.isNull(loginUser.getUserId())) {
+            addRecord(username, Constants.LOGIN_FAIL, "登录用户不存在");
+            throw new ServiceException("登录用户：" + username + " 不存在");
+        }
+
+        SysUser user = loginUser.getUser();
+        // 判断用户类型
+        if (!"admin".equals(username)) {
+            if (!userType.equals(user.getUserType())) {
+                throw new ServiceException("该用户类型错误");
+            }
+        }
+
+        if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
+            addRecord(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除");
+            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
+        }
+        if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+            addRecord(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
+            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
+        }
+//        sysPasswordService.validate(user);
 
         // 生成token
         return tokenService.createToken(loginUser);

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -51,7 +51,7 @@ public class SysRegisterService
 
         // 验证码开关
         boolean captchaEnabled = configService.selectCaptchaEnabled();
-        if (captchaEnabled && registerBody.getValue() == null)
+        if (captchaEnabled)
         {
             validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
         }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -111,7 +111,7 @@ public class TokenService
      * @param loginUser 用户信息
      * @return 令牌
      */
-    public String createToken(LoginUser loginUser) {
+    public Map<String, Object> createToken(LoginUser loginUser) {
         String token = IdUtils.fastUUID();
         loginUser.setToken(token);
         setUserAgent(loginUser);
@@ -119,7 +119,13 @@ public class TokenService
 
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.LOGIN_USER_KEY, token);
-        return createToken(claims);
+        String token1 = createToken(claims);
+
+        // 接口返回信息
+        Map<String, Object> rspMap = new HashMap<>();
+        rspMap.put("access_token", token1);
+        rspMap.put("expires_in", expireTime);
+        return rspMap;
     }
 
     /**