From daaf2caafd40f3657aa1f7e45bc1641d482baeb1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 01 Dec 2023 16:54:10 +0800
Subject: [PATCH] 保安员详情信息新增，修改，删除调整
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 74 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 40 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 b0f4db2..1e12306 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -48,6 +48,7 @@
import org.springblade.modules.loginrecord.entity.LoginRecord;
import org.springblade.modules.loginrecord.service.LoginRecordService;
import org.springblade.modules.system.entity.UserInfo;
+import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.zc.service.IZcService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
@@ -85,6 +86,7 @@
private final LoginRecordService loginRecordService;
private final ServerConfig serverConfig;
+ private final IUserService userService;
/**
* 登录
@@ -116,15 +118,15 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
- try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-20").getTime();
- long now= System.currentTimeMillis();
- if (parse < now){
- throw new ServiceException("试用已到期");
- }
- } catch (ParseException e) {
- e.printStackTrace();
- }
+// try {
+// Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-10-07").getTime();
+// long now= System.currentTimeMillis();
+// if (parse < now){
+// throw new ServiceException("试用已到期");
+// }
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
//校验
@@ -136,6 +138,10 @@
return authInfo.set("error_description", "审核不通过");
}
}
+ if (userInfo != null && userInfo.getUser().getIsFreeze().equals(1)) {
+ return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "该用户超半年未使用系统，已被冻结，请联系管理员！");
+ }
+
if (userInfo == null || userInfo.getUser() == null) {
return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "用户名或密码不正确");
}
@@ -158,13 +164,25 @@
}
}
}
- }else {
- System.out.println("grantType = " + grantType);
+ //如果是app模拟考试登录
+ if (loginType.equals(2)) {
+ //判断是否已报名
+ boolean flag = userService.getUserIsApply(userInfo.getUser().getId());
+ if (!flag){
+ return authInfo.set("error_description", "没有报名不能进行刷题");
+ }
+ }
//刷新 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);
}
@@ -181,8 +199,8 @@
public Kv token(@ApiParam(value = "租户ID", required = true) @RequestParam String tenantId,
@ApiParam(value = "账号", required = true) @RequestParam(required = false) String username,
@ApiParam(value = "编号", required = true) @RequestParam(required = false) String code) {
+
Kv authInfo = Kv.create();
- String s = iZcService.selectType(username);
String grantType = WebUtil.getRequest().getParameter("grant_type");
String refreshToken = WebUtil.getRequest().getParameter("refresh_token");
@@ -194,30 +212,6 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
-
- try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-08-08").getTime();
- long now= System.currentTimeMillis();
- if (parse < now){
- throw new ServiceException("试用已到期");
- }
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
-
- //校验
- if (null != s && s.equals("")) {
- if (s.equals("0")) {
- return authInfo.set("error_description", "用户未审核");
- }
- if (s.equals("2")) {
- return authInfo.set("error_description", "审核不通过");
- }
- }
- if (userInfo == null || userInfo.getUser() == null) {
- return authInfo.set("error_code", HttpServletResponse.SC_BAD_REQUEST).set("error_description", "用户不存在");
- }
return TokenUtil.createAuthInfo(userInfo);
}
--
Gitblit v1.9.3