echo rename

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",
+            throw new ValidationException(e.getMessage(), e);
-                    response.getHttpHeaders().getHeader(REQUEST_ID)), e);
         }
     }
 

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.echo.model.EchoRequest;
-import com.czcb.scfs.api.service.health.model.EchoResponse;
+import com.czcb.scfs.api.service.echo.model.EchoResponse;
 
 import java.util.Objects;
 

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;
 

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;

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;

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() {
-//    public RsaProfile rsaProfile() {
+        return new RsaProfile.Builder()
-//        return new RsaProfile.Builder()
+                .channel(getChannel())
-//                .channel(getChannel())
+                .httpProfile(getHttpProfile())
-//                .httpProfile(getHttpProfile())
+                .privateKey(getPrivateKey())
-//                .privateKey(getPrivateKey())
+                .addCertificate(getCertificate())
-//                .addCertificate(getCertificate())
+                .build();
-//                .build();
+    }
-//    }
 }

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);
-    }
 }

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;

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;

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.echo.EchoService;
-import com.czcb.scfs.api.service.health.model.EchoResponse;
+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;