From 87c9fd2d4105f3e3e2736ddb478f2767bd6ff2de Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 06 Nov 2023 11:26:17 +0800
Subject: [PATCH] 考试名称修改
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 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 d30bac8..58070a8 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -116,15 +116,15 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
- try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-12-08").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();
+// }
//校验
@@ -158,17 +158,74 @@
}
}
}
- }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);
}
+
+ /**
+ * 微信小程序授权登录
+ * @param username
+ * @param code
+ * @return
+ */
+ @ApiLog("登录用户验证")
+ @PostMapping("/oauth/token/wx")
+ 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");
+
+ String userType = Func.toStr(WebUtil.getRequest().getHeader(TokenUtil.USER_TYPE_HEADER_KEY), TokenUtil.DEFAULT_USER_TYPE);
+
+ TokenParameter tokenParameter = new TokenParameter();
+ tokenParameter.getArgs().set("tenantId", tenantId).set("username", username).set("code", code).set("grantType", grantType).set("refreshToken", refreshToken).set("userType", userType);
+
+ 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);
+ }
+
/**
* 新增登录记录信息
* @param userInfo
--
Gitblit v1.9.3