diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java index 3bb3b85..800b5bb 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java @@ -96,12 +96,14 @@ public class AnYanClientExecutor implements AnYanClient { @Override public AuthResult getAuthTokenByPassword(String username, String password) { try { + + String encryptPassword = StringUtils.encryptByPublicKey(publicKey, password); HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.MULTIPART_FORM_DATA); MultiValueMap formData = new LinkedMultiValueMap<>(); formData.add("grant_type", "password"); formData.add("username", username); - formData.add("password", password); + formData.add("password", encryptPassword); formData.add("client_id", anYanProperties.getClientId()); formData.add("client_secret", anYanProperties.getClientSecret()); ResponseEntity authResult = RestTemplateUtil.postExchangeForGetTokenByPassword(AnYanApiEnum.QUERY_AUTH_TOKEN, formData, headers, AuthResult.class); @@ -114,6 +116,7 @@ public class AnYanClientExecutor implements AnYanClient { return null; } } catch (HttpClientErrorException e) { + log.error("------安眼系统获取token失败(密码模式){}------", e.getMessage()); String replace = Objects.requireNonNull(e.getMessage()).replace("401 Unauthorized: ", ""); replace = replace.replace("\"", ""); AuthResult bean = JSONUtil.toBean(replace, AuthResult.class); diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java index c07d8bc..5fdf098 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/config/RestTemplateUtil.java @@ -62,7 +62,7 @@ public class RestTemplateUtil { public static ResponseEntity postExchangeForGetTokenByPassword(AnYanApiEnum api, MultiValueMap formData, HttpHeaders headers, Class responseType) { String url = getProperties().getPublicHost() + api.getMethodPath(); HttpEntity> requestEntity = new HttpEntity<>(formData, headers); - log.info("开始发送请求到: {}", url); + log.info("开始发送请求到: {},入参:{}", url, formData); ResponseEntity response = getRestTemplate().exchange(url, api.getHttpMethod(), requestEntity, responseType); log.info("收到响应: {}", response); return response; @@ -98,8 +98,8 @@ public class RestTemplateUtil { /** * 通用调用方法 * - * @param api 请求接口 - * @param headers 请求头 + * @param api 请求接口 + * @param headers 请求头 * @return Result对象 */ public static ResponseEntity getExchange(AnYanApiEnum api, HttpHeaders headers, Class responseType) {