From 90f9d47c6c1259a303354c183b25a824a67c6370 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 三月 2023 20:20:43 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java b/Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
index b3d392e..b513083 100644
--- a/Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
+++ b/Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
@@ -73,6 +73,7 @@
public final static String USER_HAS_NO_TENANT = "鏈幏寰楃敤鎴风殑绉熸埛淇℃伅";
public final static String USER_HAS_NO_TENANT_PERMISSION = "绉熸埛鎺堟潈宸茶繃鏈�,璇疯仈绯荤鐞嗗憳";
public final static String USER_HAS_TOO_MANY_FAILS = "鐧诲綍閿欒娆℃暟杩囧,璇风◢鍚庡啀璇�";
+ public final static String IP_NOT_FOND = "璇P鍦板潃鏃犺闂潈闄愶紝璇烽厤缃甀P鐧藉悕鍗�";
public final static String HEADER_KEY = "Authorization";
public final static String HEADER_PREFIX = "Basic ";
public final static String DEFAULT_AVATAR = "";
@@ -167,14 +168,9 @@
if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), BladeConstant.ADMIN_TENANT_ID)) {
return false;
}
- Date expireTime = tenant.getExpireTime();
if (getTenantProperties().getLicense()) {
String licenseKey = tenant.getLicenseKey();
String decrypt = DesUtil.decryptFormHex(licenseKey, TenantConstant.DES_KEY);
- expireTime = JsonUtil.parse(decrypt, Tenant.class).getExpireTime();
- }
- if (expireTime != null && expireTime.before(DateUtil.now())) {
- throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT_PERMISSION);
}
return false;
}
--
Gitblit v1.9.3