From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 227b74d..5be3e0a 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -41,6 +41,7 @@
import org.springblade.modules.auth.provider.TokenParameter;
import org.springblade.modules.auth.utils.TokenUtil;
import org.springblade.modules.system.entity.UserInfo;
+import org.springblade.modules.zc.service.IZcService;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -64,6 +65,7 @@
private final BladeRedis bladeRedis;
private final JwtProperties jwtProperties;
+ private final IZcService iZcService;
@ApiLog("登录用户验证")
@PostMapping("/oauth/token")
@@ -73,6 +75,7 @@
@ApiParam(value = "密码", required = true) @RequestParam(required = false) String password) {
Kv authInfo = Kv.create();
+ String s = iZcService.selectType(username);
String grantType = WebUtil.getRequest().getParameter("grant_type");
String refreshToken = WebUtil.getRequest().getParameter("refresh_token");
@@ -85,7 +88,13 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
- if (userInfo == null || userInfo.getUser() == null) {
+ if (userInfo == null || userInfo.getUser() == null && s.equals("0")) {
+ return authInfo.set("error_description", "用户未审核");
+ }
+ if (userInfo == null || userInfo.getUser() == null && 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", "用户名或密码不正确");
}
--
Gitblit v1.9.3