From 9eb58eb6f28eeed56e562d7c22384edde034a262 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Dec 2023 14:03:35 +0800
Subject: [PATCH] 增加户籍地址
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 44 ++++++++++----------------------------------
1 files changed, 10 insertions(+), 34 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 e1c813f..dbb47e1 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -118,15 +118,15 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
-// 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();
-// }
+ try {
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2024-01-31").getTime();
+ long now= System.currentTimeMillis();
+ if (parse < now){
+ throw new ServiceException("系统繁忙");
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
//校验
@@ -199,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");
@@ -212,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