修改AuthVO

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/auth/vo/AuthVO.java

@@ -6,7 +6,6 @@
 package org.eco.vip.auth.domain.auth.vo;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,11 +23,6 @@ import lombok.NoArgsConstructor;
 @Builder
 public class AuthVO {
 
-    /**
-     * 用户编号
-     */
-    private String userId;
-
     /**
      * 授权令牌
      */
@@ -40,12 +34,7 @@ public class AuthVO {
     private String refreshToken;
 
     /**
-     * 过期时间
-     */
-    private Long expiresTime;
-
-    /**
-     * 刷新令牌 的有效期
+     * 授权令牌 access_token 的有效期
      */
-    private Long refreshExpire;
+    private Long expireIn;
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/AuthService.java

@@ -20,8 +20,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class AuthService implements IAuthService {
-    @Resource
-    private IUserService userService;
     @Override
     public AuthVO login(AuthQuery authQuery) {
         return IAuthStrategy.login(authQuery, "password");

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/IAuthStrategy.java

@@ -31,7 +31,7 @@ public interface IAuthStrategy {
         // 授权类型和客户端id
         String beanName = grantType + BASE_NAME;
         if (!SpringUtils.containsBean(beanName)) {
-            throw new BusinessException("授权类型不正确!");
+            throw new BusinessException("无效授权类型!");
         }
         IAuthStrategy instance = SpringUtils.getBean(beanName);
         return instance.login(authQuery);

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/auth/PasswordAuthStrategy.java

@@ -49,16 +49,21 @@ public class PasswordAuthStrategy implements IAuthStrategy {
         LoginUser loginUser = new LoginUser();
         loginUser.setUserId("sdsd");
         loginUser.setUserType("pc");
+        SaLoginParameter loginParameter = createLoginModel();
+        LoginHelper.login(loginUser, loginParameter);
+        AuthVO authVO = new AuthVO();
+        authVO.setAccessToken(StpUtil.getTokenValue());
+        authVO.setExpireIn(StpUtil.getTokenTimeout());
+        return authVO;
+    }
+
+    private static SaLoginParameter createLoginModel() {
         SaLoginParameter loginParameter = new SaLoginParameter();
         loginParameter.setDeviceType("pc");
         loginParameter.setTimeout(10);
         loginParameter.setActiveTimeout(30);
         loginParameter.setExtra(LoginHelper.CLIENT_KEY, "");
-        LoginHelper.login(loginUser, loginParameter);
-        AuthVO authVO = new AuthVO();
-        authVO.setAccessToken(StpUtil.getTokenValue());
-        authVO.setExpiresTime(StpUtil.getTokenTimeout());
-        return authVO;
+        return loginParameter;
     }
 
     private UserVO getUserByAccount(String tenantId, String account) {