From 82a410d9ec7a5d15eed27e9990cff371feab43a1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 27 三月 2023 18:25:38 +0800
Subject: [PATCH] 新增编码规则服务
---
Source/BladeX/blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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..f1f3f3c 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
@@ -21,7 +21,6 @@
import org.springblade.core.launch.constant.TokenConstant;
import org.springblade.core.tenant.BladeTenantProperties;
import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.*;
import org.springblade.system.entity.Tenant;
import org.springframework.security.authentication.BadCredentialsException;
@@ -30,7 +29,6 @@
import java.util.Base64;
import java.util.Calendar;
-import java.util.Date;
/**
* 璁よ瘉宸ュ叿绫�
@@ -55,6 +53,7 @@
public final static String DETAIL = TokenConstant.DETAIL;
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 DEPT_HEADER_KEY = "Dept-Id";
public final static String ROLE_HEADER_KEY = "Role-Id";
@@ -73,6 +72,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 +167,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