From 0f5a172f08169dfe1d42392ccc1ca17b2dcea1d8 Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 30 Jul 2026 15:47:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/config/BearerTokenService.java | 2 +- .../platform/config/OAuth2TokenController.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/BearerTokenService.java b/backend/src/main/java/com/yfd/platform/config/BearerTokenService.java index e31fbc33..d02088e6 100644 --- a/backend/src/main/java/com/yfd/platform/config/BearerTokenService.java +++ b/backend/src/main/java/com/yfd/platform/config/BearerTokenService.java @@ -39,7 +39,7 @@ public class BearerTokenService { * @return token 信息(accessToken, expiresIn 等) */ public BearerTokenResult createToken(HttpServletRequest request, String clientId) { - String token = UUID.randomUUID().toString().replace("-", ""); + String token = UUID.randomUUID().toString(); long expireAt = System.currentTimeMillis() + DEFAULT_EXPIRE_MILLIS; JSONObject payload = new JSONObject(); diff --git a/backend/src/main/java/com/yfd/platform/config/OAuth2TokenController.java b/backend/src/main/java/com/yfd/platform/config/OAuth2TokenController.java index 9be0d6b9..a4b04149 100644 --- a/backend/src/main/java/com/yfd/platform/config/OAuth2TokenController.java +++ b/backend/src/main/java/com/yfd/platform/config/OAuth2TokenController.java @@ -70,7 +70,7 @@ public class OAuth2TokenController { } String clientId = resolveClientId(authHeader); - if (StrUtil.isBlank(clientId)|| !"client".equals(clientId)) { + if (StrUtil.isBlank(clientId)|| !"client:secret".equals(clientId)) { log.warn("获取 Token 失败: 无法解析 client"); result.put("success", false); result.put("errorCode", -1); @@ -84,7 +84,8 @@ public class OAuth2TokenController { log.warn("获取 Token 失败: 不支持的 grant_type={}", grantType); result.put("success", false); result.put("errorCode", -1); - result.put("message", "仅支持 client_credentials 授权模式"); + // 仅支持 client_credentials 授权模式 + result.put("message", "授权模式错误"); return result; } @@ -111,13 +112,12 @@ public class OAuth2TokenController { try { String base64 = authHeader.substring(6).trim(); byte[] decoded = Base64.getDecoder().decode(base64); - String credentials = new String(decoded, StandardCharsets.UTF_8); - // 格式: clientId:clientSecret - int colonIdx = credentials.indexOf(':'); - if (colonIdx > 0) { - return credentials.substring(0, colonIdx); - } - return credentials; + // // 格式: client:secret +// int colonIdx = credentials.indexOf(':'); +// if (colonIdx > 0) { +// return credentials.substring(0, colonIdx); +// } + return new String(decoded, StandardCharsets.UTF_8); } catch (Exception e) { log.warn("解析 Basic 认证信息失败: {}", e.getMessage()); return null;