From a57a39de178fcc2bda213e7791d61d2570c4831e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 15 Jul 2022 14:27:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 20 +++++++++++++++++++-
src/main/java/org/springblade/modules/auth/utils/TokenUtil.java | 3 +++
src/main/java/org/springblade/modules/stock/controller/StockController.java | 1 -
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 560b066..2d299dd 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -18,6 +18,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiSort;
import com.wf.captcha.SpecCaptcha;
+import io.jsonwebtoken.Claims;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -29,12 +30,14 @@
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.launch.constant.TokenConstant;
import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springblade.modules.auth.provider.ITokenGranter;
import org.springblade.modules.auth.provider.TokenGranterBuilder;
@@ -101,7 +104,10 @@
if (Func.isEmpty(userInfo.getRoles())) {
return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "未获得用户的角色信息");
}
-
+ Kv authInfo1 = TokenUtil.createAuthInfo(userInfo);
+ String access_token = authInfo1.get("access_token").toString();
+ // 存入redis并设置过期时间为30分钟
+ bladeRedis.setEx(access_token, access_token, Duration.ofMinutes(1));
return TokenUtil.createAuthInfo(userInfo);
}
@@ -146,4 +152,16 @@
CacheUtil.clear(PARAM_CACHE, Boolean.FALSE);
return Kv.create().set("success", "true").set("msg", "success");
}
+
+ @GetMapping("/oauth/judgeRefreshToken")
+ @ApiOperation(value = "token认证时效")
+ public String judgeRefreshToken(String refreshToken) {
+ Object o = bladeRedis.get(refreshToken);
+ if (o == null) {
+ return "token令牌已失效";
+ } else {
+ return "token令牌有效";
+ }
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
index d96dff7..c7efd51 100644
--- a/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/springblade/modules/auth/utils/TokenUtil.java
@@ -16,9 +16,11 @@
*/
package org.springblade.modules.auth.utils;
+import org.springblade.common.cache.CacheNames;
import org.springblade.common.constant.TenantConstant;
import org.springblade.core.launch.constant.TokenConstant;
import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.secure.TokenInfo;
import org.springblade.core.secure.utils.SecureUtil;
import org.springblade.core.tenant.BladeTenantProperties;
@@ -31,6 +33,7 @@
import org.springblade.modules.system.entity.UserInfo;
import javax.servlet.http.HttpServletResponse;
+import java.time.Duration;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/org/springblade/modules/stock/controller/StockController.java b/src/main/java/org/springblade/modules/stock/controller/StockController.java
index 29d331c..d1b9329 100644
--- a/src/main/java/org/springblade/modules/stock/controller/StockController.java
+++ b/src/main/java/org/springblade/modules/stock/controller/StockController.java
@@ -245,7 +245,6 @@
double v1 = lycknum + dbcknum + bfcknum;
pages.getRecords().get(i).setCknum(v1);
}
-
return R.data(pages);
}
--
Gitblit v1.9.3