From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 03 四月 2025 14:35:02 +0800 Subject: [PATCH] 添加非密字段显示 --- Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java | 9 ++++++++- 1 files changed, 8 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..424fa68 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 @@ -16,6 +16,7 @@ */ package com.vci.ubcs.auth.utils; +import com.vci.ubcs.system.cache.NacosConfigCache; import lombok.SneakyThrows; import com.vci.ubcs.common.constant.TenantConstant; import org.springblade.core.launch.constant.TokenConstant; @@ -23,6 +24,7 @@ import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.*; import com.vci.ubcs.system.entity.Tenant; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException; import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException; @@ -54,6 +56,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"; @@ -79,6 +85,7 @@ public final static String PASSWORD_KEY = "password"; public final static String GRANT_TYPE_KEY = "grant_type"; public final static String REFRESH_TOKEN_KEY = "refresh_token"; + public final static String USER_LOCK = "褰撳墠鐧诲綍鐢ㄦ埛宸茶鍋滅敤锛岃鑱旂郴绠$悊瑙e皝璐﹀彿銆�"; private static BladeTenantProperties tenantProperties; @@ -164,7 +171,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