From c936810044538086d57e0018f956534477ce4966 Mon Sep 17 00:00:00 2001 From: yechuan Date: Thu, 17 Aug 2023 13:22:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/java/work/xuye/common/dto/HttpRequestParams.java | 4 ++-- common/src/main/java/work/xuye/common/dto/HttpRes.java | 2 +- common/src/main/java/work/xuye/common/service/UrlMD5Service.java | 2 +- .../work/xuye/common/utils/signature/AbstractSignatureService.java | 4 ++-- .../java/work/xuye/common/utils/signature/RSASignatureService.java | 6 +++--- source/src/main/java/work/xuye/source/handler/SourceHandler.java | 5 ++--- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/work/xuye/common/dto/HttpRequestParams.java b/common/src/main/java/work/xuye/common/dto/HttpRequestParams.java index 67f65e4..fa5364f 100644 --- a/common/src/main/java/work/xuye/common/dto/HttpRequestParams.java +++ b/common/src/main/java/work/xuye/common/dto/HttpRequestParams.java @@ -37,7 +37,7 @@ public class HttpRequestParams { private Map placeholderExpressions = Map.of(); private String mediaType = MediaType.APPLICATION_JSON_VALUE; - private RequestSignatureConfig signature; + private RequestSignatureConfig signatureConfig; /** * 仅计算一次的表达式（同次请求后续使用上次计算值） @@ -103,7 +103,7 @@ public class HttpRequestParams { @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public static class RequestSignatureConfig extends SignatureConfig { - private String signatureFile; + private String signatureField; private String signatureContext; private SignatureEnumGroup.SignatureLocation signatureLocation; } diff --git a/common/src/main/java/work/xuye/common/dto/HttpRes.java b/common/src/main/java/work/xuye/common/dto/HttpRes.java index 16f6785..cbad376 100644 --- a/common/src/main/java/work/xuye/common/dto/HttpRes.java +++ b/common/src/main/java/work/xuye/common/dto/HttpRes.java @@ -27,7 +27,7 @@ public class HttpRes { private Long costTimeMillis; /** - * 零时变量 + * 临时变量 */ @JsonInclude private Object temporary; diff --git a/common/src/main/java/work/xuye/common/service/UrlMD5Service.java b/common/src/main/java/work/xuye/common/service/UrlMD5Service.java index 388c380..99d6a77 100644 --- a/common/src/main/java/work/xuye/common/service/UrlMD5Service.java +++ b/common/src/main/java/work/xuye/common/service/UrlMD5Service.java @@ -50,7 +50,7 @@ public class UrlMD5Service { parentOtherCacheKeySet.forEach(this::removeUrlMD5); } String sendUrl = message.getHeaders().get(MessageConstants.SEED_URL, String.class); - if (!StringUtils.hasText(sendUrl)) { + if (StringUtils.hasText(sendUrl)) { this.removeUrlMD5(sendUrl); } } diff --git a/common/src/main/java/work/xuye/common/utils/signature/AbstractSignatureService.java b/common/src/main/java/work/xuye/common/utils/signature/AbstractSignatureService.java index 1b2101d..66225f5 100644 --- a/common/src/main/java/work/xuye/common/utils/signature/AbstractSignatureService.java +++ b/common/src/main/java/work/xuye/common/utils/signature/AbstractSignatureService.java @@ -17,11 +17,11 @@ public abstract class AbstractSignatureService { /** * 使用私钥加密 * - * @param context + * @param content * @return * @throws GeneralSecurityException */ - public abstract String signatureByPriKey(String context) throws GeneralSecurityException; + public abstract String signatureByPriKey(String content) throws GeneralSecurityException; void init(SignatureConfig signatureConfig) throws GeneralSecurityException { diff --git a/common/src/main/java/work/xuye/common/utils/signature/RSASignatureService.java b/common/src/main/java/work/xuye/common/utils/signature/RSASignatureService.java index 54df1e5..661bfd0 100644 --- a/common/src/main/java/work/xuye/common/utils/signature/RSASignatureService.java +++ b/common/src/main/java/work/xuye/common/utils/signature/RSASignatureService.java @@ -23,15 +23,15 @@ import java.security.spec.X509EncodedKeySpec; class RSASignatureService extends AbstractSignatureService { @Override - public String signatureByPriKey(String context) throws GeneralSecurityException { + public String signatureByPriKey(String content) throws GeneralSecurityException { if (signatureContext == null) { throw new RuntimeException("未初始化公私钥信息"); } Signature signature = signatureContext.getSignature(); PrivateKey priKey = signatureContext.getPriKey(); signature.initSign(priKey); - context = DigestUtils.md5DigestAsHex(context.getBytes(StandardCharsets.UTF_8)).toUpperCase(); - signature.update(context.getBytes(StandardCharsets.UTF_8)); + content = DigestUtils.md5DigestAsHex(content.getBytes(StandardCharsets.UTF_8)).toUpperCase(); + signature.update(content.getBytes(StandardCharsets.UTF_8)); return Base64.encodeBase64String(signature.sign()); } diff --git a/source/src/main/java/work/xuye/source/handler/SourceHandler.java b/source/src/main/java/work/xuye/source/handler/SourceHandler.java index a3e9bd8..3446dd8 100644 --- a/source/src/main/java/work/xuye/source/handler/SourceHandler.java +++ b/source/src/main/java/work/xuye/source/handler/SourceHandler.java @@ -236,7 +236,6 @@ public class SourceHandler { .setHeader(MessageConstants.TASK_ID, task.getId()) .setHeader(MessageConstants.TASK_NAME, task.getName()) .setHeader(MessageConstants.SEED_URL, httpRes.getRequestParams().getUrl()) - .setHeader(MessageConstants.SEED_URL, httpRes.getRequestParams().getUrl()) .setHeader(MessageConstants.OTHER_CACHE_KEY_SET, otherCacheKeySet) .build(); resultMap.put(topic, nextTaskMessage); @@ -328,7 +327,7 @@ public class SourceHandler { private void preHandleSignature(HttpRequestParams requestParams) { - HttpRequestParams.RequestSignatureConfig signatureConfig = requestParams.getSignature(); + HttpRequestParams.RequestSignatureConfig signatureConfig = requestParams.getSignatureConfig(); if (ObjectUtils.isEmpty(signatureConfig)) { return; } @@ -340,7 +339,7 @@ public class SourceHandler { String signature = signatureService.signatureByPriKey(signatureContext); // 优化 if (SignatureEnumGroup.SignatureLocation.header.equals(signatureConfig.getSignatureLocation())) { - requestParams.getHeaders().put(signatureConfig.getSignatureFile(), signature); + requestParams.getHeaders().put(signatureConfig.getSignatureField(), signature); } } catch (GeneralSecurityException e) { throw new RuntimeException(e);