From 04ec5ee8917efb67a7b19bc992934ae9510a03d7 Mon Sep 17 00:00:00 2001 From: 13009 Date: Tue, 26 Mar 2024 10:39:18 +0800 Subject: [PATCH] echo rename --- .../api/core/cipher/DefaultValidator.java | 3 +- .../service/{health => echo}/EchoService.java | 6 ++-- .../{health => echo}/model/EchoRequest.java | 2 +- .../{health => echo}/model/EchoResponse.java | 2 +- .../{health => echo}/EchoServiceTest.java | 4 +-- .../spring/boot/starter/RsaConfiguration.java | 17 +++++------ .../boot/starter/ScfsAutoConfiguration.java | 30 +++++++++++-------- .../czcb/scfs/api/test/ApiGatewayTest.java | 2 +- .../czcb/scfs/api/test/BeanResourceTest.java | 2 +- .../czcb/scfs/api/test/MockServiceTest.java | 4 +-- 10 files changed, 38 insertions(+), 34 deletions(-) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/{health => echo}/EchoService.java (86%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/{health => echo}/model/EchoRequest.java (86%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/{health => echo}/model/EchoResponse.java (94%) rename scfs-api-service/src/test/java/com/czcb/scfs/api/service/{health => echo}/EchoServiceTest.java (94%) diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/cipher/DefaultValidator.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/cipher/DefaultValidator.java index 8bf7d54..ca7f8b2 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/cipher/DefaultValidator.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/cipher/DefaultValidator.java @@ -85,8 +85,7 @@ public final class DefaultValidator implements Validator { response.getHttpHeaders().getHeader(REQUEST_ID))); } } catch (Exception e) { - throw new ValidationException(String.format("响应校验失败, 签名校验异常, Request-Id=%s", - response.getHttpHeaders().getHeader(REQUEST_ID)), e); + throw new ValidationException(e.getMessage(), e); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/EchoService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java similarity index 86% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/EchoService.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java index 95a81e6..967de50 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/EchoService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/EchoService.java @@ -1,12 +1,12 @@ -package com.czcb.scfs.api.service.health; +package com.czcb.scfs.api.service.echo; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.exception.ValidationException; import com.czcb.scfs.api.core.http.HttpHeaders; import com.czcb.scfs.api.core.http.HttpResponse; import com.czcb.scfs.api.core.util.DateTimes; -import com.czcb.scfs.api.service.health.model.EchoRequest; -import com.czcb.scfs.api.service.health.model.EchoResponse; +import com.czcb.scfs.api.service.echo.model.EchoRequest; +import com.czcb.scfs.api.service.echo.model.EchoResponse; import java.util.Objects; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java similarity index 86% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java index cdcfa74..0826ef5 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.health.model; +package com.czcb.scfs.api.service.echo.model; import com.czcb.scfs.api.core.ApiRequest; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoResponse.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoResponse.java index d63bfe5..3a3f664 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/health/model/EchoResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/echo/model/EchoResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.health.model; +package com.czcb.scfs.api.service.echo.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/health/EchoServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/echo/EchoServiceTest.java similarity index 94% rename from scfs-api-service/src/test/java/com/czcb/scfs/api/service/health/EchoServiceTest.java rename to scfs-api-service/src/test/java/com/czcb/scfs/api/service/echo/EchoServiceTest.java index 7c4048b..1b0a779 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/health/EchoServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/echo/EchoServiceTest.java @@ -1,10 +1,10 @@ -package com.czcb.scfs.api.service.health; +package com.czcb.scfs.api.service.echo; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.exception.ValidationException; import com.czcb.scfs.api.core.http.HttpMethod; import com.czcb.scfs.api.service.MockResponse; -import com.czcb.scfs.api.service.health.model.EchoResponse; +import com.czcb.scfs.api.service.echo.model.EchoResponse; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/RsaConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/RsaConfiguration.java index dcc2dab..bb419c7 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/RsaConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/RsaConfiguration.java @@ -45,13 +45,12 @@ public class RsaConfiguration extends AbstractAutoConfiguration { return PemFile.loadPrivateKeyFromStream(inputStream); } -// @Bean -// public RsaProfile rsaProfile() { -// return new RsaProfile.Builder() -// .channel(getChannel()) -// .httpProfile(getHttpProfile()) -// .privateKey(getPrivateKey()) -// .addCertificate(getCertificate()) -// .build(); -// } + public RsaProfile rsaProfile() { + return new RsaProfile.Builder() + .channel(getChannel()) + .httpProfile(getHttpProfile()) + .privateKey(getPrivateKey()) + .addCertificate(getCertificate()) + .build(); + } } diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java index eb5c7d8..c032998 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java @@ -3,11 +3,12 @@ package com.czcb.scfs.spring.boot.starter; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.Profile; import com.czcb.scfs.api.core.http.ApiClientBuilder; -import com.czcb.scfs.api.service.health.EchoService; +import com.czcb.scfs.api.service.echo.EchoService; import com.czcb.scfs.api.service.v1.account.AccountService; import com.czcb.scfs.api.service.v1.bmd.BmdService; import com.czcb.scfs.api.service.v1.face.FaceService; import com.czcb.scfs.api.service.v1.file.FileService; +import com.czcb.scfs.api.service.v1.loan.LoanService; import com.czcb.scfs.api.service.v1.ocr.OcrService; import com.czcb.scfs.api.service.v1.pay.PayService; import com.czcb.scfs.api.service.v1.sms.SmsService; @@ -26,7 +27,7 @@ import javax.annotation.Resource; @Configuration @ComponentScan("com.czcb.scfs.spring.boot.starter") @EnableConfigurationProperties({ScfsApiGatewayProperties.class}) -@Import({RsaConfiguration.class, SmConfiguration.class}) +@Import({SmConfiguration.class, RsaConfiguration.class}) public class ScfsAutoConfiguration { @Resource private Profile profile; @@ -38,6 +39,11 @@ public class ScfsAutoConfiguration { .build(); } + @Bean + public EchoService echoService(ApiClient apiClient) { + return new EchoService(apiClient); + } + @Bean public AccountService accountService(ApiClient apiClient) { return new AccountService(apiClient); @@ -53,6 +59,16 @@ public class ScfsAutoConfiguration { return new FaceService(apiClient); } + @Bean + public FileService fileService(ApiClient apiClient) { + return new FileService(apiClient); + } + + @Bean + public LoanService loanService(ApiClient apiClient) { + return new LoanService(apiClient); + } + @Bean public OcrService ocrService(ApiClient apiClient) { return new OcrService(apiClient); @@ -63,11 +79,6 @@ public class ScfsAutoConfiguration { return new PayService(apiClient); } - @Bean - public FileService fileService(ApiClient apiClient) { - return new FileService(apiClient); - } - @Bean public SmsService smsService(ApiClient apiClient) { return new SmsService(apiClient); @@ -77,9 +88,4 @@ public class ScfsAutoConfiguration { public TransService transService(ApiClient apiClient) { return new TransService(apiClient); } - - @Bean - public EchoService echoService(ApiClient apiClient) { - return new EchoService(apiClient); - } } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java index 8c0d52e..063bec8 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ApiGatewayTest.java @@ -1,6 +1,6 @@ package com.czcb.scfs.api.test; -import com.czcb.scfs.api.service.health.EchoService; +import com.czcb.scfs.api.service.echo.EchoService; import com.czcb.scfs.api.service.v1.account.AccountService; import com.czcb.scfs.api.service.v1.account.model.QueryBalanceRequest; import com.czcb.scfs.api.service.v1.account.model.QueryBalanceResponse; diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/BeanResourceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/BeanResourceTest.java index 0575a1f..20a8c36 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/BeanResourceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/BeanResourceTest.java @@ -1,6 +1,6 @@ package com.czcb.scfs.api.test; -import com.czcb.scfs.api.service.health.EchoService; +import com.czcb.scfs.api.service.echo.EchoService; import com.czcb.scfs.api.service.v1.sms.SmsService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockServiceTest.java index 37ce433..eca070b 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockServiceTest.java @@ -1,8 +1,8 @@ package com.czcb.scfs.api.test; import com.czcb.scfs.api.core.http.HttpMethod; -import com.czcb.scfs.api.service.health.EchoService; -import com.czcb.scfs.api.service.health.model.EchoResponse; +import com.czcb.scfs.api.service.echo.EchoService; +import com.czcb.scfs.api.service.echo.model.EchoResponse; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;