From 0c820746a96a1193a64532b3b17b08d52e4ff1be Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 11 Sep 2023 19:13:15 +0800
Subject: [PATCH] 1. 登录记录新增 2. 用户6个月，1年未登录定时任务新增 3. 脱敏 aop 注解新增
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 7f7b7f2..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,10 +117,10 @@
UserInfo userInfo = granter.grant(tokenParameter);
try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-12-08").getTime();
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-20").getTime();
long now= System.currentTimeMillis();
if (parse < now){
- throw new ServiceException("用户名密码错误");
+ throw new ServiceException("试用已到期");
}
} catch (ParseException e) {
e.printStackTrace();
@@ -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);
}
@@ -196,10 +200,10 @@
UserInfo userInfo = granter.grant(tokenParameter);
try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-12-08").getTime();
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-08-08").getTime();
long now= System.currentTimeMillis();
if (parse < now){
- throw new ServiceException("用户名不存在");
+ throw new ServiceException("试用已到期");
}
} catch (ParseException e) {
e.printStackTrace();
--
Gitblit v1.9.3