From 154228e6349e56fcdb40d81a2e1f49ee3eb36979 Mon Sep 17 00:00:00 2001 From: 13009 Date: Wed, 26 Jun 2024 08:52:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20service=20=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czcb/scfs/api/test/Sequence.java | 13 ------- .../czcb/scfs/api/test/ApiGatewayTest.java | 29 +------------- .../test/{ => cat}/ProjectServiceTest.java | 2 +- .../api/test/{ => mock}/MockResponse.java | 2 +- .../api/test/{ => mock}/MockServiceTest.java | 2 +- .../scfs/api/test/{ => mock}/SMKeyText.java | 2 +- .../api/test/service/AccountServiceTest.java | 30 ++++++++++++++ .../api/test/service/BillServiceTest.java | 8 ++++ .../scfs/api/test/service/BmdServiceTest.java | 8 ++++ .../test/service/CommunalDataServiceTest.java | 4 +- .../api/test/service/EchoServiceTest.java | 20 ++++++++++ .../api/test/service/FaceServiceTest.java | 8 ++++ .../api/test/service/FileServiceTest.java | 39 +++++++++++++++++++ .../api/test/service/LoanServiceTest.java | 8 ++++ .../scfs/api/test/service/OcrServiceTest.java | 8 ++++ .../scfs/api/test/service/PayServiceTest.java | 8 ++++ .../scfs/api/test/service/SmsServiceTest.java | 29 ++++++++++++++ .../api/test/service/TransServiceTest.java | 8 ++++ 18 files changed, 181 insertions(+), 47 deletions(-) delete mode 100644 scfs-api-test/src/main/java/com/czcb/scfs/api/test/Sequence.java rename scfs-api-test/src/test/java/com/czcb/scfs/api/test/{ => cat}/ProjectServiceTest.java (98%) rename scfs-api-test/src/test/java/com/czcb/scfs/api/test/{ => mock}/MockResponse.java (97%) rename scfs-api-test/src/test/java/com/czcb/scfs/api/test/{ => mock}/MockServiceTest.java (97%) rename scfs-api-test/src/test/java/com/czcb/scfs/api/test/{ => mock}/SMKeyText.java (99%) create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BillServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BmdServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EchoServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/LoanServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/PayServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java create mode 100644 scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/TransServiceTest.java diff --git a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/Sequence.java b/scfs-api-test/src/main/java/com/czcb/scfs/api/test/Sequence.java deleted file mode 100644 index 92f8561..0000000 --- a/scfs-api-test/src/main/java/com/czcb/scfs/api/test/Sequence.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.czcb.scfs.api.test; - -import lombok.experimental.UtilityClass; - -import java.util.UUID; - -@UtilityClass -public final class Sequence { - - public static String serialNo() { - return UUID.randomUUID().toString().replace("-", ""); - } -} 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 e737e33..5694601 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 @@ -3,7 +3,6 @@ package com.czcb.scfs.api.test; import com.czcb.scfs.api.core.util.Compression; import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.core.util.PemFile; -import com.czcb.scfs.api.service.echo.EchoService; import com.czcb.scfs.api.service.v2.account.AccountService; import com.czcb.scfs.api.service.v2.account.model.QueryBalanceRequest; import com.czcb.scfs.api.service.v2.account.model.QueryBalanceResponse; @@ -30,23 +29,14 @@ import java.util.UUID; @SpringBootTest class ApiGatewayTest { - @Resource - private EchoService echoService; - @Resource private AccountService accountService; - @Resource - private FileService fileService; + @Resource private SmsService service; - @Test - void test() { - echoService.echo(); - } - @Test void testQuery() { QueryBalanceRequest queryBalanceRequest = new QueryBalanceRequest(); @@ -61,24 +51,7 @@ class ApiGatewayTest { System.out.println(response); } - @Test - void testUploadFile() { - UploadFileRequest fileRequest = new UploadFileRequest(); - fileRequest.setChannelNo("0000"); - fileRequest.setSerialNo(Nonce.ofNonce()); - UploadFileRequest.FileList fileList = new UploadFileRequest.FileList(); - fileList.setFileIndex(0); - fileList.setFileData(Compression.zipAndEncodeFromFile("C:\\Users\\Administrator.CZCB-20230627EN\\Documents\\临时文件\\附件3：中国人民银行调查统计司关于印发2024年金融机构金融统计修订内容的通知（银调发〔2024〕2号）.pdf")); - - fileRequest.setFileList(Lists.list(fileList)); - fileRequest.setTransDate("2024-03-20"); - fileRequest.setTransTradeTime("2024-03-20 12:20:20"); - - - UploadFileResponse response = fileService.uploadFile(fileRequest); - System.out.println(response); - } @Test void testPath() throws Exception { diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ProjectServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/cat/ProjectServiceTest.java similarity index 98% rename from scfs-api-test/src/test/java/com/czcb/scfs/api/test/ProjectServiceTest.java rename to scfs-api-test/src/test/java/com/czcb/scfs/api/test/cat/ProjectServiceTest.java index fe78b6c..32bee4e 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/ProjectServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/cat/ProjectServiceTest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.test; +package com.czcb.scfs.api.test.cat; import com.czcb.scfs.service.cat.project.ProjectService; import com.czcb.scfs.service.cat.project.model.ProjectAddRequest; diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockResponse.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/MockResponse.java similarity index 97% rename from scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockResponse.java rename to scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/MockResponse.java index 1301cee..5d64587 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockResponse.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/MockResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.test; +package com.czcb.scfs.api.test.mock; import com.czcb.scfs.api.core.ApiClient; import com.czcb.scfs.api.core.util.DateTimes; 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/mock/MockServiceTest.java similarity index 97% rename from scfs-api-test/src/test/java/com/czcb/scfs/api/test/MockServiceTest.java rename to scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/MockServiceTest.java index eca070b..7ce7215 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/mock/MockServiceTest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.test; +package com.czcb.scfs.api.test.mock; import com.czcb.scfs.api.core.http.HttpMethod; import com.czcb.scfs.api.service.echo.EchoService; diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/SMKeyText.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/SMKeyText.java similarity index 99% rename from scfs-api-test/src/test/java/com/czcb/scfs/api/test/SMKeyText.java rename to scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/SMKeyText.java index b30add2..7e8367d 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/SMKeyText.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/mock/SMKeyText.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.test; +package com.czcb.scfs.api.test.mock; import com.czcb.scfs.api.core.util.PemFile; import com.tencent.kona.KonaProvider; diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java index 4c066f5..72fa205 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/AccountServiceTest.java @@ -1,8 +1,38 @@ package com.czcb.scfs.api.test.service; +import com.czcb.scfs.api.core.util.Nonce; +import com.czcb.scfs.api.service.v2.account.AccountService; +import com.czcb.scfs.api.service.v2.account.model.QueryBalanceRequest; +import com.czcb.scfs.api.service.v2.account.model.QueryBalanceResponse; +import com.czcb.scfs.api.test.FmtDate; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import javax.annotation.Resource; + +@SpringBootTest class AccountServiceTest { + @Resource + private AccountService accountService; + + @Test + void testQuery() { + QueryBalanceRequest queryBalanceRequest = new QueryBalanceRequest(); + queryBalanceRequest.setChannelNo("0000"); + queryBalanceRequest.setAppNo("10"); + queryBalanceRequest.setSerialNo(Nonce.ofNonce()); + queryBalanceRequest.setAccountNo("1012230221000010"); + queryBalanceRequest.setRelationAcct("1"); + + queryBalanceRequest.setTransDate(FmtDate.transDate()); + queryBalanceRequest.setTransTradeTime(FmtDate.transTradeTime()); + + QueryBalanceResponse response = accountService.queryBalance(queryBalanceRequest); + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); + } + @Test void personOpenAccountThreeElementTest() { diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BillServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BillServiceTest.java new file mode 100644 index 0000000..5bb29ea --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BillServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BillServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BmdServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BmdServiceTest.java new file mode 100644 index 0000000..4cb82f7 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/BmdServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BmdServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/CommunalDataServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/CommunalDataServiceTest.java index bee0aa7..c5797ca 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/CommunalDataServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/CommunalDataServiceTest.java @@ -1,10 +1,10 @@ package com.czcb.scfs.api.test.service; +import com.czcb.scfs.api.core.util.Nonce; import com.czcb.scfs.api.service.v2.communal.CommunalDataService; import com.czcb.scfs.api.service.v2.communal.model.FiveCascadeQueryRequest; import com.czcb.scfs.api.service.v2.communal.model.FiveCascadeQueryResponse; import com.czcb.scfs.api.test.FmtDate; -import com.czcb.scfs.api.test.Sequence; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -26,7 +26,7 @@ class CommunalDataServiceTest { FiveCascadeQueryRequest request = new FiveCascadeQueryRequest(); request.setChannelNo("0000"); request.setAppNo("10"); - request.setSerialNo(Sequence.serialNo()); + request.setSerialNo(Nonce.ofNonce()); request.setZoningCode("110101001000000"); request.setTransTradeTime(FmtDate.transTradeTime()); request.setTransDate(FmtDate.transDate()); diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EchoServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EchoServiceTest.java new file mode 100644 index 0000000..bf9bc25 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EchoServiceTest.java @@ -0,0 +1,20 @@ +package com.czcb.scfs.api.test.service; + +import com.czcb.scfs.api.service.echo.EchoService; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import javax.annotation.Resource; + +@SpringBootTest +class EchoServiceTest { + + @Resource + private EchoService echoService; + + @Test + void test() { + Assertions.assertDoesNotThrow(() -> echoService.echo()); + } +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java new file mode 100644 index 0000000..ef43219 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FaceServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FaceServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java new file mode 100644 index 0000000..5180028 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/FileServiceTest.java @@ -0,0 +1,39 @@ +package com.czcb.scfs.api.test.service; + +import com.czcb.scfs.api.core.util.Compression; +import com.czcb.scfs.api.core.util.Nonce; +import com.czcb.scfs.api.service.v2.file.FileService; +import com.czcb.scfs.api.service.v2.file.model.UploadFileRequest; +import com.czcb.scfs.api.service.v2.file.model.UploadFileResponse; +import org.assertj.core.util.Lists; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import javax.annotation.Resource; + +@SpringBootTest +class FileServiceTest { + @Resource + private FileService fileService; + + @Test + void testUploadFile() { + UploadFileRequest fileRequest = new UploadFileRequest(); + fileRequest.setChannelNo("0000"); + fileRequest.setSerialNo(Nonce.ofNonce()); + + UploadFileRequest.FileList fileList = new UploadFileRequest.FileList(); + fileList.setFileIndex(0); + fileList.setFileData(Compression.zipAndEncodeFromFile("C:\\Users\\Administrator.CZCB-20230627EN\\Documents\\临时文件\\附件3：中国人民银行调查统计司关于印发2024年金融机构金融统计修订内容的通知（银调发〔2024〕2号）.pdf")); + + fileRequest.setFileList(Lists.list(fileList)); + fileRequest.setTransDate("2024-03-20"); + fileRequest.setTransTradeTime("2024-03-20 12:20:20"); + + + UploadFileResponse response = fileService.uploadFile(fileRequest); + System.out.println(response); + Assertions.assertEquals("000000", response.getRecode()); + } +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/LoanServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/LoanServiceTest.java new file mode 100644 index 0000000..97345e6 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/LoanServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class LoanServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java new file mode 100644 index 0000000..e487f1a --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/OcrServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OcrServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/PayServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/PayServiceTest.java new file mode 100644 index 0000000..f3aad0f --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/PayServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PayServiceTest { + +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java new file mode 100644 index 0000000..6586d3c --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/SmsServiceTest.java @@ -0,0 +1,29 @@ +package com.czcb.scfs.api.test.service; + +import com.czcb.scfs.api.core.util.Nonce; +import com.czcb.scfs.api.service.v2.sms.SmsService; +import com.czcb.scfs.api.service.v2.sms.model.SendVerifySignRequest; +import com.czcb.scfs.api.service.v2.sms.model.SendVerifySignResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +import javax.annotation.Resource; + +@SpringBootTest +class SmsServiceTest { + @Resource + private SmsService service; + + @Test + void testSms() { + SendVerifySignRequest request = new SendVerifySignRequest(); + request.setAppNo("41"); + request.setChannelNo("1038"); + request.setMobile("13819135970"); + request.setSerialNo(Nonce.ofNonce()); + request.setCardNo("6222024709526474589"); + SendVerifySignResponse response = service.send(request); + Assertions.assertEquals("000000", response.getRecode()); + } +} diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/TransServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/TransServiceTest.java new file mode 100644 index 0000000..f7d3462 --- /dev/null +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/TransServiceTest.java @@ -0,0 +1,8 @@ +package com.czcb.scfs.api.test.service; + +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TransServiceTest { + +}