add feshu acount type

XiaoMi · Jul 14, 2023 · d950067 · d950067
1 parent 3522c82
commit d950067
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 161 deletions.
diff --git a/...tpclogin-common/src/main/java/com/xiaomi/mone/tpc/login/common/enums/AccountTypeEnum.java b/...tpclogin-common/src/main/java/com/xiaomi/mone/tpc/login/common/enums/AccountTypeEnum.java
@@ -10,12 +10,12 @@
  */
 @ToString
 public enum AccountTypeEnum implements Base {
-    EMAIL(0, "邮箱账号", UserTypeEnum.EMAIL),
+    EMAIL(0, "邮箱账号", 2),
     ;
     private Integer code;
     private String desc;
-    private UserTypeEnum userType;
-    AccountTypeEnum(Integer code, String desc, UserTypeEnum userType) {
+    private Integer userType;
+    AccountTypeEnum(Integer code, String desc, Integer userType) {
         this.code = code;
         this.desc = desc;
         this.userType = userType;
@@ -43,7 +43,7 @@ public String getDesc() {
         return desc;
     }
 
-    public UserTypeEnum getUserType() {
+    public Integer getUserType() {
         return userType;
     }
 

diff --git a/...mi-tpclogin-common/src/main/java/com/xiaomi/mone/tpc/login/common/enums/UserTypeEnum.java b/...mi-tpclogin-common/src/main/java/com/xiaomi/mone/tpc/login/common/enums/UserTypeEnum.java
diff --git a/...ogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/AuthHermesFilter.java b/...ogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/AuthHermesFilter.java
diff --git a/...gin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java b/...gin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java
@@ -50,11 +50,6 @@ public void init(FilterConfig filterConfig) throws ServletException {
             tokenFilter = new AuthTokenFilter();
             tokenFilter.init(filterConfig);
         }
-        boolean openHermes = Boolean.parseBoolean(filterConfig.getInitParameter(ConstUtil.openHermes));
-        if (openHermes) {
-            hermesFilter = new AuthHermesFilter();
-            hermesFilter.init(filterConfig);
-        }
     }
 
     @Override

diff --git a/...n/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/util/ConstUtil.java b/...n/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/util/ConstUtil.java
@@ -24,11 +24,6 @@ public class ConstUtil {
      */
     public final static String HEADER_KEY_SIGN_AND_USER_DATA = "x-proxy-userdetail";
 
-    public final static String hermesUrl = "hermesUrl";
-
-    public final static String hermesProjectName = "hermesProjectName";
-
-    public final static String openHermes = "openHermes";
     public final static String loginUrl = "loginUrl";
     public final static String logoutUrl = "logoutUrl";
 

diff --git a/...in/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/util/UserUtil.java b/...in/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/util/UserUtil.java
@@ -71,22 +71,10 @@ public static AuthUserVo parseFullAccount(String fullAccount) {
             param.setUserType(UserTypeEnum.CAS_TYPE.getCode());
             return param;
         }
-        try {
-            Integer userType = Integer.parseInt(fullAccount.substring(pos + 1));
-            UserTypeEnum userTypeEnum = UserTypeEnum.getEnum(userType);
-            if (userTypeEnum != null) {
-                param.setAccount(fullAccount.substring(0, pos));
-                param.setUserType(userTypeEnum.getCode());
-            } else {
-                param.setAccount(fullAccount);
-                param.setUserType(UserTypeEnum.CAS_TYPE.getCode());
-            }
-            return param;
-        } catch (Throwable e) {
-            param.setAccount(fullAccount);
-            param.setUserType(UserTypeEnum.CAS_TYPE.getCode());
-            return param;
-        }
+        Integer userType = Integer.parseInt(fullAccount.substring(pos + 1));
+        param.setAccount(fullAccount.substring(0, pos));
+        param.setUserType(userType);
+        return param;
     }
 
 }
diff --git a/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java b/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java
@@ -1,8 +1,8 @@
 package com.xiaomi.mone.tpc.login;
 
 import com.alibaba.nacos.api.config.annotation.NacosValue;
-import com.xiaomi.mone.tpc.login.common.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.common.vo.AuthAccountVo;
+import com.xiaomi.mone.tpc.login.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.vo.AuthUserVo;
 import com.xiaomi.mone.tpc.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...i-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GiteeLoginMgr.java b/...i-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GiteeLoginMgr.java
@@ -1,8 +1,8 @@
 package com.xiaomi.mone.tpc.login;
 
 import com.alibaba.nacos.api.config.annotation.NacosValue;
-import com.xiaomi.mone.tpc.login.common.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.common.vo.AuthAccountVo;
+import com.xiaomi.mone.tpc.login.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.vo.AuthUserVo;
 import com.xiaomi.mone.tpc.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GithubLoginMgr.java b/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GithubLoginMgr.java
@@ -1,8 +1,8 @@
 package com.xiaomi.mone.tpc.login;
 
 import com.alibaba.nacos.api.config.annotation.NacosValue;
-import com.xiaomi.mone.tpc.login.common.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.common.vo.AuthAccountVo;
+import com.xiaomi.mone.tpc.login.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.vo.AuthUserVo;
 import com.xiaomi.mone.tpc.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GitlabLoginMgr.java b/...-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/GitlabLoginMgr.java
@@ -1,8 +1,8 @@
 package com.xiaomi.mone.tpc.login;
 
 import com.alibaba.nacos.api.config.annotation.NacosValue;
-import com.xiaomi.mone.tpc.login.common.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.common.vo.AuthAccountVo;
+import com.xiaomi.mone.tpc.login.enums.UserTypeEnum;
 import com.xiaomi.mone.tpc.login.vo.AuthUserVo;
 import com.xiaomi.mone.tpc.util.TokenUtil;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/LoginService.java b/...mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/LoginService.java
@@ -161,7 +161,7 @@ public ResultVo register(LoginRegisterParam param) {
         }
         UserRegisterParam registerParam = new UserRegisterParam();
         registerParam.setAccount(entity.getAccount());
-        registerParam.setUserType(accountTypeEnum.getUserType().getCode());
+        registerParam.setUserType(accountTypeEnum.getUserType());
         userFacade.register(registerParam);
         return ResponseCode.SUCCESS.build();
     }
@@ -218,7 +218,7 @@ public ResultVo<AuthUserVo> session(LoginSessionParam param) {
         }
         authUserVo.setState(param.getState());
         authUserVo.setAccount(entity.getAccount());
-        authUserVo.setUserType(accountTypeEnum.getUserType().getCode());
+        authUserVo.setUserType(accountTypeEnum.getUserType());
         authUserVo.setExprTime((int)(ModuleEnum.LOGIN.getUnit().toSeconds(ModuleEnum.LOGIN.getTime())));
         authUserVo.setName(entity.getName());
         authUserVo.setToken(TokenUtil.createToken(authUserVo.getExprTime(), authUserVo.getAccount(), authUserVo.getUserType()));

diff --git a/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/enums/UserTypeEnum.java b/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/enums/UserTypeEnum.java
@@ -16,6 +16,7 @@ public enum UserTypeEnum implements Base {
     GITLAB_TYPE(3, "GITLAB"),
     GITEE_TYPE(4, "GITEE"),
     SERVICE_TYPE(5, "服务账号"),
+    FEISHU_TYPE(6, "飞书"),
     ;
     private Integer code;
     private String desc;