From 1b170a825afedf359d76023557203e22dfe2ea41 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 24 Feb 2020 23:54:38 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E8=B6=85=E7=AE=A1=E4=B8=8D=E5=8F=97?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E8=BF=87=E6=9C=9F=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/BladeUserDetailsServiceImpl.java  |  5 +---
 .../org/springblade/auth/utils/TokenUtil.java | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
index b9c77658..797c9dd5 100644
--- a/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
+++ b/blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java
@@ -23,7 +23,6 @@ import org.springblade.auth.constant.AuthConstant;
 import org.springblade.auth.enums.BladeUserEnum;
 import org.springblade.auth.utils.TokenUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
@@ -39,7 +38,6 @@ import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthoriza
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 
 /**
  * 用户信息
@@ -68,8 +66,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 		// 获取租户信息
 		R<Tenant> tenant = sysClient.getTenant(tenantId);
 		if (tenant.isSuccess()) {
-			Date expireTime = tenant.getData().getExpireTime();
-			if (expireTime != null && expireTime.before(DateUtil.now())) {
+			if (TokenUtil.judgeTenant(tenant.getData())) {
 				throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
 			}
 		} else {
diff --git a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
index 5ab0cc08..10ef786f 100644
--- a/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
+++ b/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
@@ -18,14 +18,19 @@ package org.springblade.auth.utils;
 
 import lombok.SneakyThrows;
 import org.springblade.core.launch.constant.TokenConstant;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Charsets;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.WebUtil;
+import org.springblade.system.entity.Tenant;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.oauth2.common.exceptions.UnapprovedClientAuthenticationException;
+import org.springframework.security.oauth2.common.exceptions.UserDeniedAuthorizationException;
 
 import java.util.Base64;
 import java.util.Calendar;
+import java.util.Date;
 
 /**
  * 认证工具类
@@ -125,4 +130,24 @@ public class TokenUtil {
 		return 60 * 60 * 24 * 15;
 	}
 
+	/**
+	 * 判断租户权限
+	 *
+	 * @param tenant 租户信息
+	 * @return boolean
+	 */
+	public static boolean judgeTenant(Tenant tenant) {
+		if (tenant == null) {
+			throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT);
+		}
+		if (AuthUtil.isAdministrator()) {
+			return false;
+		}
+		Date expireTime = tenant.getExpireTime();
+		if (expireTime != null && expireTime.before(DateUtil.now())) {
+			throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
+		}
+		return false;
+	}
+
 }