From b7624be989e599505cdf2ccf4f43f3ac952733f0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:37:54 +0800
Subject: [PATCH] 角色查询修改，只查询当前角色下级角色，用户查询排除超级管理员查询，角色数查询除超级管理员查询查全部外，其他角色只查询当有有的权限菜单
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 9e37982..5c9cafc 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -117,7 +117,7 @@
UserInfo userInfo = granter.grant(tokenParameter);
try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-11").getTime();
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-20").getTime();
long now= System.currentTimeMillis();
if (parse < now){
throw new ServiceException("试用已到期");
@@ -158,13 +158,17 @@
}
}
}
- }else {
- System.out.println("grantType = " + grantType);
//刷新 token 不新增登录记录
-// if (!grantType.equals("refresh_token")){
-// //新增登录记录
-// this.saveLoginRecord(userInfo);
-// }
+ if (!grantType.equals("refresh_token")){
+ //新增登录记录
+ this.saveLoginRecord(userInfo);
+ }
+ }else {
+ //刷新 token 不新增登录记录
+ if (!grantType.equals("refresh_token")){
+ //新增登录记录
+ this.saveLoginRecord(userInfo);
+ }
}
return TokenUtil.createAuthInfo(userInfo);
}
--
Gitblit v1.9.3