From 62b508a7f872fa4f8e14aa8d766e4a6c1e34cd34 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 22 十一月 2024 10:37:35 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/oauth2/OAuth2OpenController.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/oauth2/OAuth2OpenController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/oauth2/OAuth2OpenController.java
index 44791bf..0b3b283 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/oauth2/OAuth2OpenController.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/oauth2/OAuth2OpenController.java
@@ -1,5 +1,6 @@
package com.iailab.module.system.controller.admin.oauth2;
+import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -33,6 +34,7 @@
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -86,23 +88,23 @@
@Operation(summary = "获得访问令牌", description = "适合 code 授权码模式，或者 implicit 简化模式；在 sso.vue 单点登录界面被【获取】调用")
@Parameters({
@Parameter(name = "grant_type", required = true, description = "授权类型", example = "code"),
- @Parameter(name = "code", description = "授权范围", example = "userinfo.read"),
+ @Parameter(name = "code", description = "授权码", example = "asdfasdfasdf"),
@Parameter(name = "redirect_uri", description = "重定向 URI", example = "https://www.baidu.com"),
@Parameter(name = "state", description = "状态", example = "1"),
@Parameter(name = "username", example = "tudou"),
@Parameter(name = "password", example = "cai"), // 多个使用空格分隔
- @Parameter(name = "scope", example = "user_info"),
+ @Parameter(name = "scope", description = "授权范围", example = "user.read"),
@Parameter(name = "refresh_token", example = "123424233"),
})
- public CommonResult<OAuth2OpenAccessTokenRespVO> postAccessToken(HttpServletRequest request,
- @RequestParam("grant_type") String grantType,
- @RequestParam(value = "code", required = false) String code, // 授权码模式
- @RequestParam(value = "redirect_uri", required = false) String redirectUri, // 授权码模式
- @RequestParam(value = "state", required = false) String state, // 授权码模式
- @RequestParam(value = "username", required = false) String username, // 密码模式
- @RequestParam(value = "password", required = false) String password, // 密码模式
- @RequestParam(value = "scope", required = false) String scope, // 密码模式
- @RequestParam(value = "refresh_token", required = false) String refreshToken) { // 刷新模式
+ public Map<String, Object> postAccessToken(HttpServletRequest request,
+ @RequestParam("grant_type") String grantType,
+ @RequestParam(value = "code", required = false) String code, // 授权码模式
+ @RequestParam(value = "redirect_uri", required = false) String redirectUri, // 授权码模式
+ @RequestParam(value = "state", required = false) String state, // 授权码模式
+ @RequestParam(value = "username", required = false) String username, // 密码模式
+ @RequestParam(value = "password", required = false) String password, // 密码模式
+ @RequestParam(value = "scope", required = false) String scope, // 密码模式
+ @RequestParam(value = "refresh_token", required = false) String refreshToken) { // 刷新模式
List<String> scopes = OAuth2Utils.buildScopes(scope);
// 1.1 校验授权类型
OAuth2GrantTypeEnum grantTypeEnum = OAuth2GrantTypeEnum.getByGrantType(grantType);
@@ -137,7 +139,12 @@
throw new IllegalArgumentException("未知授权类型：" + grantType);
}
Assert.notNull(accessTokenDO, "访问令牌不能为空"); // 防御性检查
- return success(OAuth2OpenConvert.INSTANCE.convert(accessTokenDO));
+ Map<String, Object> map = new HashMap<>();
+ map.put("access_token", accessTokenDO.getAccessToken());
+ map.put("refresh_token", accessTokenDO.getRefreshToken());
+ map.put("expires_time", LocalDateTimeUtil.toEpochMilli(accessTokenDO.getExpiresTime()) / 1000L);
+ map.put("client_id", accessTokenDO.getClientId());
+ return map;
}
@DeleteMapping("/token")
--
Gitblit v1.9.3