From ab0470c04c153c53173865b5bc423c9d00550c0c Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Wed, 29 Jul 2026 11:49:16 +0800 Subject: [PATCH] =?UTF-8?q?style(system):=20=E7=9F=AD=E4=BF=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=9B=B8=E5=85=B3=E5=91=98=E5=B7=A5=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=AD=A3=EF=BC=9B?= =?UTF-8?q?=E5=AE=89=E7=9C=BC=E5=81=A5=E5=BA=B7=E7=9B=91=E6=B5=8B=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E8=B7=B3=E8=BD=AC=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?token=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4=E4=B8=BA=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E8=AE=A4=E8=AF=81=E7=9B=B4=E6=8E=A5=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anyan/client/AnYanClientExecutor.java | 48 ++++++++++++++++++- .../anyan/config/RestTemplateUtil.java | 11 ++++- .../controller/SysMessageController.java | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) 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 cd717d2..f545199 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 @@ -258,8 +258,11 @@ public class AnYanClientExecutor implements AnYanClient { return token; } - @Override - public AuthResult publicNetworkTokenNoCache() { + /** + * @description: 旧版公网获取token实现（SM4 + AnYanResult 包裹解密），保留备份 + * @author PengJ + */ + public AuthResult publicNetworkTokenNoCacheBAK() { JSONObject param = new JSONObject(); String password = anYanProperties.getPublicPassWrod(); String userName = anYanProperties.getPublicUserNmae(); @@ -289,6 +292,47 @@ public class AnYanClientExecutor implements AnYanClient { return null; } + /** + * @description: 公网获取token（密码模式，调用方式与 getAuthTokenByPassword 保持一致） + * 表单提交 + 公网 host + QUERY_AUTH_TOKEN，仅 RSA 加密密码，不写 Redis（缓存由调用方负责） + * @author PengJ + */ + @Override + public AuthResult publicNetworkTokenNoCache() { + String username = anYanProperties.getPublicUserNmae(); + String password = anYanProperties.getPublicPassWrod(); + try { + // 仅 RSA 加密密码，与 getAuthTokenByPassword 保持一致 + 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", 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); + if (HttpStatus.OK.equals(authResult.getStatusCode()) + && ObjectUtils.isNotEmpty(authResult.getBody())) { + return authResult.getBody(); + } else { + log.error("------安眼系统获取公网token失败{}------", authResult.getBody()); + ExceptionAssertsUtil.fail("------安眼系统获取公网token失败------" + authResult.getBody()); + 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); + ExceptionAssertsUtil.fail(bean.getMessage()); + } catch (Exception e) { + ExceptionAssertsUtil.fail(e.getMessage()); + } + return null; + } + /** * @description: 根据token获取用户信息 * @author PengJ 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 eca2526..dfd004a 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 @@ -1,5 +1,6 @@ package com.renkang.anyan.config; +import com.alibaba.fastjson.JSON; import com.renkang.anyan.enums.AnYanApiEnum; import com.renkang.anyan.model.vo.AnYanResult; import lombok.extern.slf4j.Slf4j; @@ -81,7 +82,15 @@ public class RestTemplateUtil { public static ResponseEntity postExchangeForGetToken(AnYanApiEnum api, Object requestBody, Class responseType) { String url = getProperties().getPublicHost() + api.getMethodPath() + api.getMethodParam(); HttpEntity requestEntity = new HttpEntity<>(requestBody); - return getRestTemplate().exchange(url, api.getHttpMethod(), requestEntity, responseType); + // 打印请求入参，便于排查 + String bodyJson = JSON.toJSONString(requestBody); + log.info("安眼获取token请求入参: url={}, body={}", url, bodyJson); + // 打印等价 curl（application/json），便于本地手动调试 + log.info("安眼获取token等价curl: curl -X POST '{}' -H 'Content-Type: application/json' -d '{}'", url, bodyJson); + ResponseEntity response = getRestTemplate().exchange(url, api.getHttpMethod(), requestEntity, responseType); + // 打印返回信息（状态码 + 响应体） + log.info("安眼获取token返回信息: statusCode={}, body={}", response.getStatusCode(), JSON.toJSONString(response.getBody())); + return response; } /** diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java index 33c1c7e..203acdf 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java @@ -48,7 +48,7 @@ public class SysMessageController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = sysMessageService.page(page, queryWrapper);