Quellcode durchsuchen

:zap: 超管不受租户过期限制

smallchill vor 6 Jahren
Ursprung
Commit
9d5f75bb92

+ 1 - 1
src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java

@@ -69,7 +69,7 @@ public class CaptchaTokenGranter implements ITokenGranter {
 		if (Func.isNoneBlank(username, password)) {
 			// 获取租户信息
 			Tenant tenant = tenantService.getByTenantId(tenantId);
-			if (!TokenUtil.judgeTenant(tenant)) {
+			if (TokenUtil.judgeTenant(tenant)) {
 				throw new ServiceException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
 			}
 			// 获取用户类型

+ 1 - 1
src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java

@@ -51,7 +51,7 @@ public class PasswordTokenGranter implements ITokenGranter {
 		if (Func.isNoneBlank(username, password)) {
 			// 获取租户信息
 			Tenant tenant = tenantService.getByTenantId(tenantId);
-			if (!TokenUtil.judgeTenant(tenant)) {
+			if (TokenUtil.judgeTenant(tenant)) {
 				throw new ServiceException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
 			}
 			// 获取用户类型

+ 1 - 1
src/main/java/org/springblade/modules/auth/granter/RefreshTokenGranter.java

@@ -57,7 +57,7 @@ public class RefreshTokenGranter implements ITokenGranter {
 			if (tokenType.equals(TokenConstant.REFRESH_TOKEN)) {
 				// 获取租户信息
 				Tenant tenant = tenantService.getByTenantId(tenantId);
-				if (!TokenUtil.judgeTenant(tenant)) {
+				if (TokenUtil.judgeTenant(tenant)) {
 					throw new ServiceException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
 				}
 				// 获取用户信息

+ 5 - 1
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -19,6 +19,7 @@ package org.springblade.modules.auth.utils;
 import org.springblade.core.launch.constant.TokenConstant;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.TokenInfo;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.DateUtil;
@@ -119,11 +120,14 @@ public class TokenUtil {
 		if (tenant == null) {
 			throw new ServiceException(TokenUtil.USER_HAS_NO_TENANT);
 		}
+		if (AuthUtil.isAdministrator()) {
+			return false;
+		}
 		Date expireTime = tenant.getExpireTime();
 		if (expireTime != null && expireTime.before(DateUtil.now())) {
 			throw new ServiceException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
 		}
-		return true;
+		return false;
 	}
 
 }