From 2e739cf9946f6951d2f05fd353f499c2178f1e53 Mon Sep 17 00:00:00 2001 From: zhanggaofeng Date: Wed, 2 Aug 2023 11:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9E=9A=E4=B8=BE=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mone/tpc/login/filter/DoceanReqUserFilter.java | 7 +++---- .../xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java | 7 +++---- .../java/com/xiaomi/mone/tpc/login/vo/AuthUserVo.java | 9 ++------- .../java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java | 2 +- .../java/com/xiaomi/mone/tpc/common/vo/NodeChangeVo.java | 2 ++ .../tpc/node/change/ProNodeChangeRocketMQHelper.java | 2 ++ 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/DoceanReqUserFilter.java b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/DoceanReqUserFilter.java index abe87211c..01956127d 100644 --- a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/DoceanReqUserFilter.java +++ b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/DoceanReqUserFilter.java @@ -52,12 +52,11 @@ public boolean doFilter(MvcContext mvcContext) { mockAcc = "test"; } String mockAccType = mvcContext.getHeaders().get("userType"); - UserTypeEnum userType = UserTypeEnum.getEnum(mockAccType); - if (userType == null) { - userType = UserTypeEnum.CAS_TYPE; + if (StringUtils.isBlank(mockAccType)) { + mockAccType = UserTypeEnum.CAS_TYPE.getCode() + ""; } AuthUserVo authUserVo = new AuthUserVo(); - authUserVo.setUserType(userType.getCode()); + authUserVo.setUserType(Integer.parseInt(mockAccType)); authUserVo.setAccount(mockAcc); authUserVo.setName(mockAcc); mvcContext.session().setAttribute(ConstUtil.TPC_USER, authUserVo); diff --git a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java index e50047b73..91ae9acc1 100644 --- a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java +++ b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/filter/HttpReqUserFilter.java @@ -61,13 +61,12 @@ public void doFilter(ServletRequest var1, ServletResponse var2, FilterChain var3 mockAcc = "test"; } String mockAccType = ((HttpServletRequest)var1).getHeader("userType"); - UserTypeEnum userType = UserTypeEnum.getEnum(mockAccType); - if (userType == null) { - userType = UserTypeEnum.CAS_TYPE; + if (StringUtils.isBlank(mockAccType)) { + mockAccType = UserTypeEnum.CAS_TYPE.getCode() + ""; } try { AuthUserVo authUserVo = new AuthUserVo(); - authUserVo.setUserType(userType.getCode()); + authUserVo.setUserType(Integer.parseInt(mockAccType)); authUserVo.setAccount(mockAcc); authUserVo.setName(mockAcc); UserUtil.setUser(authUserVo); diff --git a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/vo/AuthUserVo.java b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/vo/AuthUserVo.java index 75a069f22..f8639f628 100644 --- a/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/vo/AuthUserVo.java +++ b/mone-login/mi-tpclogin/mi-tpclogin-sdk/src/main/java/com/xiaomi/mone/tpc/login/vo/AuthUserVo.java @@ -1,6 +1,6 @@ package com.xiaomi.mone.tpc.login.vo; -import com.xiaomi.mone.tpc.login.enums.UserTypeEnum; +import com.xiaomi.mone.tpc.login.util.UserUtil; public class AuthUserVo { private String account; @@ -131,12 +131,7 @@ public void setState(String state) { } public String genFullAccount() { - if (UserTypeEnum.CAS_TYPE.getCode().equals(userType)) { - return account; - } - StringBuilder fullAccount = new StringBuilder(); - fullAccount.append(account).append("#").append(userType); - return fullAccount.toString(); + return UserUtil.getFullAccount(account, userType); } @Override diff --git a/mone-login/mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java b/mone-login/mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java index c451f8291..415e858bf 100644 --- a/mone-login/mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java +++ b/mone-login/mi-tpclogin/mi-tpclogin-service/src/main/java/com/xiaomi/mone/tpc/login/FeiShuLoginMgr.java @@ -71,7 +71,7 @@ public AuthUserVo getUserVo(String code, String pageUrl, String vcode, String st ResponseEntity responseEntity = restTemplate.exchange(getUserUrl(), HttpMethod.GET, entity, Map.class); log.info("userInfo.feishu={}", responseEntity); if (responseEntity.getBody().get("email") == null) { - log.error("feishu没有拿到user_id字段， responseEntity={}", responseEntity); + log.error("feishu没有拿到email字段， responseEntity={}", responseEntity); return null; } String account = responseEntity.getBody().get("email").toString(); diff --git a/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/vo/NodeChangeVo.java b/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/vo/NodeChangeVo.java index fae3e39f3..1221e124c 100644 --- a/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/vo/NodeChangeVo.java +++ b/tpc/mi-tpc/mi-tpc-common/src/main/java/com/xiaomi/mone/tpc/common/vo/NodeChangeVo.java @@ -16,4 +16,6 @@ public class NodeChangeVo { private int appType = 0; private int delete = 0; private List joinedMembers; + private Integer iamTreeId; + private Integer iamTreeType; } diff --git a/tpc/mi-tpc/mi-tpc-service/src/main/java/com/xiaomi/mone/tpc/node/change/ProNodeChangeRocketMQHelper.java b/tpc/mi-tpc/mi-tpc-service/src/main/java/com/xiaomi/mone/tpc/node/change/ProNodeChangeRocketMQHelper.java index d1892e74e..a79f67307 100644 --- a/tpc/mi-tpc/mi-tpc-service/src/main/java/com/xiaomi/mone/tpc/node/change/ProNodeChangeRocketMQHelper.java +++ b/tpc/mi-tpc/mi-tpc-service/src/main/java/com/xiaomi/mone/tpc/node/change/ProNodeChangeRocketMQHelper.java @@ -72,6 +72,8 @@ public void init() throws MQClientException { @Override void realChange(NodeChangeEnum nodeChange, NodeVo nodeVo) throws Throwable { NodeChangeVo eventVo = new NodeChangeVo(); + eventVo.setIamTreeType(1);//0-米IAM;1-TPC + eventVo.setIamTreeId(nodeVo.getId().intValue()); eventVo.setId(nodeVo.getOutId() != null && nodeVo.getOutId() > 0L ? nodeVo.getOutId() : nodeVo.getId()); eventVo.setAppName(nodeVo.getNodeName()); eventVo.setDelete(NodeChangeEnum.DEL.equals(nodeChange) ? 1 : 0);