From 3d462841427d2f1f94358b46870ddabde4945ca6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十月 2023 10:39:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java | 10 +++++++++-
1 files changed, 9 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..2b7a3e2 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";
@@ -81,6 +87,8 @@
public final static String REFRESH_TOKEN_KEY = "refresh_token";
private static BladeTenantProperties tenantProperties;
+ @Autowired
+ private static NacosConfigCache nacosConfigCache;
/**
* 鑾峰彇绉熸埛閰嶇疆
@@ -164,7 +172,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