From dfa74d70bc18445534c120a27b4b9260aeb2e2f3 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期四, 12 十月 2023 10:04:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java index 386b7bc..f7b79a3 100644 --- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java +++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java @@ -54,6 +54,10 @@ public final static String LICENSE = TokenConstant.LICENSE; public final static String LICENSE_NAME = TokenConstant.LICENSE_NAME; public final static String STRATEGYUPDATESTATUS = "strategyUpdateStatus"; + public final static String TENANTNAME = "tenantName"; + public final static String DEPTNAME = "deptName"; + public final static String EMAIL = "email"; + public final static String SECRETGRADE = "secretGrade"; public final static String DEPT_HEADER_KEY = "Dept-Id"; public final static String ROLE_HEADER_KEY = "Role-Id"; @@ -164,7 +168,7 @@ if (tenant == null || tenant.getId() == null) { throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT); } - if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), BladeConstant.ADMIN_TENANT_ID)) { + if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), nacosConfigCache.getAdminUserInfo().getTenantId())) { return false; } if (getTenantProperties().getLicense()) { -- Gitblit v1.9.3