From b0430a610332aca416ce8fa735b623650dfdac6c Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 14 三月 2025 15:50:58 +0800 Subject: [PATCH] sdk密码授权模式修改为客户端模式,只需要用户名和客户端id、secret --- iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabClient.java | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabAuthClient.java b/iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabClient.java similarity index 95% rename from iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabAuthClient.java rename to iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabClient.java index 5635425..2c06c3c 100644 --- a/iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabAuthClient.java +++ b/iailab-plat-sdk/src/main/java/com/iailab/sdk/auth/client/IailabClient.java @@ -31,7 +31,7 @@ * @Description * @createTime 2025年02月18日 */ -public class IailabAuthClient { +public class IailabClient { private static final RestTemplate restTemplate = new RestTemplate(); @@ -52,18 +52,17 @@ private static String CLIENT_ID = SdkAutoConfiguration.CLIENT_ID; private static String CLIENT_SECRET = SdkAutoConfiguration.CLIENT_SECRET; private static String USERNAME = SdkAutoConfiguration.USERNAME; - private static String PASSWORD = SdkAutoConfiguration.PASSWORD; - private static final String GRAND_TYPE = "password"; + private static final String GRAND_TYPE = "client_credentials"; private static final String SCOPE = "user.read user.write"; private static final String CHARSET = "utf-8"; - private static final IailabAuthClient iailabAuthClient = new IailabAuthClient(); + private static final IailabClient iailabClient = new IailabClient(); - public static IailabAuthClient getInstance() { - return iailabAuthClient; + public static IailabClient getInstance() { + return iailabClient; } @@ -89,10 +88,9 @@ headers.setContentType(MediaType.APPLICATION_JSON_UTF8); // 1.2 构建authenticate请求URL String authenticateUrl = BASE_URL + "/system/oauth2/token?" - // 密码模式的参数 + // 客户端模式的参数 + "&grant_type=" + GRAND_TYPE + "&username=" + USERNAME - + "&password=" + PASSWORD + "&scope=" + SCOPE; // 2. 执行请求 ResponseEntity<Map<String, Object>> exchange = restTemplate.exchange( @@ -106,8 +104,6 @@ Object code = authMap.get("code"); if (SdkErrorCodeConstants.AUTH_BAD_CREDENTIALS.getCode().equals(code)) { throw exception(SdkErrorCodeConstants.AUTH_BAD_CREDENTIALS); - } else if (SdkErrorCodeConstants.AUTH_LOGIN_BAD_CREDENTIALS.getCode().equals(code)) { - throw exception(SdkErrorCodeConstants.AUTH_LOGIN_BAD_CREDENTIALS); } else if (SdkErrorCodeConstants.OAUTH2_CLIENT_REDIRECT_URI_NOT_MATCH.getCode().equals(code)) { throw exception(SdkErrorCodeConstants.OAUTH2_CLIENT_REDIRECT_URI_NOT_MATCH); } else if (SdkErrorCodeConstants.OAUTH2_CLIENT_CLIENT_SECRET_ERROR.getCode().equals(code)) { -- Gitblit v1.9.3