From 4d285c14810d7026eca993e2af40049c178fb09a Mon Sep 17 00:00:00 2001 From: 13009 Date: Mon, 20 May 2024 17:24:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/http/client/ApacheHttpclientProxyTest.java | 4 ++++ .../api/core/http/client/ApacheHttpclientTest.java | 10 ++++++++++ .../http/client/ApacheHttpclientTestProxyTest.java | 4 ++++ .../api/core/http/client/ApacheHttpclientV2Test.java | 8 ++++++++ .../api/core/http/client/ApacheHttpclientV3Test.java | 8 ++++++++ .../java/com/czcb/scfs/api/service/MockResponse.java | 4 ++++ 6 files changed, 38 insertions(+) diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientProxyTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientProxyTest.java index 00f42bb..9daa86e 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientProxyTest.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientProxyTest.java @@ -77,10 +77,14 @@ class ApacheHttpclientProxyTest { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp() + 800); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n"; diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTest.java index ced90da..4ac9b9b 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTest.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTest.java @@ -38,6 +38,9 @@ class ApacheHttpclientTest { this.client = client; } + /** + * 构建配置 + */ private Profile profile(boolean compressionEnabled) { PrivateKey privateKey = KeyText.loadTestPrivateKeyRSA(); X509Certificate certificate = KeyText.loadTestRSA(); @@ -64,13 +67,16 @@ class ApacheHttpclientTest { void doRemoteExecute() { TestResponse mockResponse = new TestResponse(); mockResponse.setName("123456"); + // mock 结果 ApiClient apiClient = mock(mockResponse.toJsonResponse().getBody(), false); + // 请求参数 TestRequest request = new TestRequest(); RequestBody requestBody = new JsonRequestBody.Builder() .body(request.toJsonRequest().getBody()) .build(); + // 发起调用 HttpResponse response = apiClient.post("/mock/xxx", requestBody, TestResponse.class); assertThatJson("{\"name\":\"123456\"}").isEqualTo(response.getServiceResponse().toJsonResponse().getBody()); @@ -109,6 +115,8 @@ class ApacheHttpclientTest { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp()); if (compressionEnabled) { @@ -120,6 +128,8 @@ class ApacheHttpclientTest { String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n"; diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTestProxyTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTestProxyTest.java index d1e48cf..108d3ee 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTestProxyTest.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientTestProxyTest.java @@ -77,10 +77,14 @@ class ApacheHttpclientTestProxyTest { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp() + 800); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n"; diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV2Test.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV2Test.java index 1f4b67a..6d0a808 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV2Test.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV2Test.java @@ -78,10 +78,14 @@ class ApacheHttpclientV2Test { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp()); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + "\n"; @@ -122,10 +126,14 @@ class ApacheHttpclientV2Test { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp()); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n"; diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV3Test.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV3Test.java index bfac8b9..b4d480b 100644 --- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV3Test.java +++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/http/client/ApacheHttpclientV3Test.java @@ -77,11 +77,15 @@ class ApacheHttpclientV3Test { .withBody(responseBody) .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(REQUEST_ID, Nonce.ofNonce()) .withHeader(TIMESTAMP, DateTimes.ofTimestamp() + 800); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + "\n"; @@ -120,10 +124,14 @@ class ApacheHttpclientV3Test { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp()); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n"; diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/MockResponse.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/MockResponse.java index b1cf577..70ca4ed 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/MockResponse.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/MockResponse.java @@ -74,10 +74,14 @@ public class MockResponse { .withHeader(NONCE, Nonce.ofNonce()) .withHeader(SECRET_KEY, secretKey) .withHeader(REQUEST_ID, Nonce.ofNonce()) + .withHeader(BANK_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") + .withHeader(CHANNEL_CERTIFICATE_SERIAL, "6CDDAA92CAD75998325027647847330C1756291") .withHeader(TIMESTAMP, DateTimes.ofTimestamp()); String buildAuth = NONCE + "=" + mock.getHeader(NONCE).get(0) + "," + TIMESTAMP + "=" + mock.getHeader(TIMESTAMP).get(0) + "," + + BANK_CERTIFICATE_SERIAL + "=" + mock.getHeader(BANK_CERTIFICATE_SERIAL).get(0) + "," + + CHANNEL_CERTIFICATE_SERIAL + "=" + mock.getHeader(CHANNEL_CERTIFICATE_SERIAL).get(0) + "," + SECRET_KEY + "=" + secretKey; String message = buildAuth + "\n" + responseBody + "\n";