From ab44efa642332b1af69b2a339b95c2219b519d7a Mon Sep 17 00:00:00 2001 From: wb3298 <1111@qq.com> Date: Tue, 27 Jan 2026 14:41:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem | 12 ++++ ...7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem | 5 ++ ...5FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem | 12 ++++ ...58205FBF0EF759B8B248814DAFB8C9-PRIVATE.pem | 5 ++ .../src/main/resources/application.properties | 11 ++-- .../api/test/service/AccountServiceTest.java | 55 ++++++++++++++++--- 6 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem create mode 100644 scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem create mode 100644 scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem create mode 100644 scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-PRIVATE.pem diff --git a/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem b/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem new file mode 100644 index 0000000..fa6fb65 --- /dev/null +++ b/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIICGTCCAcCgAwIBAgIhAPtOPc4Cl0OO05B3H0ZXa5L9fmt/HpvRKn2H6CG1mUjlMAoGCCqBHM9V +AYN1MIGNMQswCQYDVQQGEwJDTjESMBAGA1UECAwJ5rWZ5rGf55yBMRIwEAYDVQQHDAnmna3lt57l +uIIxITAfBgNVBAoMGOa1meaxn+eooOW3nuWVhuS4mumTtuihjDEYMBYGA1UECwwP5pWw5a2X6YeR +6J6N6YOoMRkwFwYDVQQDDBBzY2ZzLmN6Y2IuY29tLmNuMB4XDTI0MDMyNjA4NDU1MFoXDTI5MDMy +NjA4NDU1MFowfzELMAkGA1UEBhMCQ04xEjAQBgNVBAgMCea1meaxn+ecgTESMBAGA1UEBwwJ5p2t +5bee5biCMSEwHwYDVQQKDBjmtZnmsZ/nqKDlt57llYbkuJrpk7booYwxJTAjBgNVBAsMHOaVsOWt +l+mHkeiejemDqC3mtYvor5Xor4HkuaYwWTATBgcqhkjOPQIBBggqgRzPVQGCLQNCAAT0KcBDXLn6 +Zv5vsEtuDzZclr30phN++uOVaQoFcDhhbeZlqRSIqRdg6YstCHUenN7NL2S1b1JlsWeIUxGCndZU +MAoGCCqBHM9VAYN1A0cAMEQCIGp00kvdZqtobJ9X7YHAKBtGZXnXBKeuhdM+ZIhYelwBAiB1Dv0s +0ahzWO+jJ/DVN8zM1b4noePZArFed8qHXsvt+Q== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem b/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem new file mode 100644 index 0000000..1e740a9 --- /dev/null +++ b/scfs-api-test/src/main/resources/CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgR6jTgU+vLuT00j3QM7b/fPJ9iUGR +zZeVwr90JeVhChygCgYIKoEcz1UBgi2hRANCAAT0KcBDXLn6Zv5vsEtuDzZclr30phN++uOVaQoF +cDhhbeZlqRSIqRdg6YstCHUenN7NL2S1b1JlsWeIUxGCndZU +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem b/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem new file mode 100644 index 0000000..9cdf2bf --- /dev/null +++ b/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIICDTCCAbOgAwIBAgIhAMGhNOol+XILvqGfo/fNtDHsWCBfvw73WbiySIFNr7jJMAoGCCqBHM9V +AYN1MIGNMQswCQYDVQQGEwJDTjESMBAGA1UECAwJ5rWZ5rGf55yBMRIwEAYDVQQHDAnmna3lt57l +uIIxITAfBgNVBAoMGOa1meaxn+eooOW3nuWVhuS4mumTtuihjDEYMBYGA1UECwwP5pWw5a2X6YeR +6J6N6YOoMRkwFwYDVQQDDBBzY2ZzLmN6Y2IuY29tLmNuMB4XDTI0MDcwNDAyMDcyNVoXDTI5MDcw +NDAyMDcyNVowcjELMAkGA1UEBhMCQ04xEjAQBgNVBAgMCea1meaxn+ecgTESMBAGA1UEBwwJ5p2t +5bee5biCMSEwHwYDVQQKDBjmtZnmsZ/nqKDlt57llYbkuJrpk7booYwxGDAWBgNVBAsMD+aVsOWt +l+mHkeiejemDqDBZMBMGByqGSM49AgEGCCqBHM9VAYItA0IABJYdJvcF1qePHMP+CmrqZsdtmmz3 +qsiokiulsFnjRyYtrD5glqzdSfpvxCRaY4TC1+cQ7kmd1pFHXmG++j2ij8wwCgYIKoEcz1UBg3UD +SAAwRQIgMjvfuXX8bKcGbtinbHaSV/9T3xfKgLQleJjXSo+9c0oCIQDq0RnzybfO0K+TN3oUeCF6 +l3aSA2bySkr0YgjnVgQ7Ww== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-PRIVATE.pem b/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-PRIVATE.pem new file mode 100644 index 0000000..12b428d --- /dev/null +++ b/scfs-api-test/src/main/resources/CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-PRIVATE.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg3zUzcvFBxV3HCcghuAEeT68Xib/y +/EQYKrHl0G5zlkugCgYIKoEcz1UBgi2hRANCAASWHSb3BdanjxzD/gpq6mbHbZps96rIqJIrpbBZ +40cmLaw+YJas3Un6b8QkWmOEwtfnEO5JndaRR15hvvo9oo/M +-----END PRIVATE KEY----- \ No newline at end of file diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties index e27b8ad..50aabb8 100644 --- a/scfs-api-test/src/main/resources/application.properties +++ b/scfs-api-test/src/main/resources/application.properties @@ -1,9 +1,10 @@ scfs.api-gateway.online=false # 外网地址 -scfs.api-gateway.host=http://124.160.111.105:29080/api-gateway +#scfs.api-gateway.host=http://124.160.111.105:29080/api-gateway # 内网地址 -#scfs.api-gateway.host=http://10.133.91.109:9080/api-gatewa -scfs.api-gateway.channel.channel-no=1021 +#scfs.api-gateway.host=http://10.133.91.109:9080/api-gateway +scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway +scfs.api-gateway.channel.channel-no=1039 scfs.api-gateway.channel.app-no=42 scfs.api-gateway.cipher.store-type=resources #scfs.api-gateway.cipher.channel-private-key=invalid_rsa_private_key.pem @@ -13,7 +14,7 @@ scfs.api-gateway.cipher.store-type=resources #scfs.api-gateway.cipher.channel-certificate-serial=B76D9E0B7317F45478CC26502048C44F602AA83A2724C8FF40086FBA307140A7 #scfs.api-gateway.cipher.certificate=invalid_sm2_certificate.pem # ?? 0000 -scfs.api-gateway.cipher.channel-private-key=CZCB-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem +scfs.api-gateway.cipher.channel-private-key=CHANNEL-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-PRIVATE.pem scfs.api-gateway.cipher.channel-certificate-serial=FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5 -scfs.api-gateway.cipher.certificate=CZCB-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem +scfs.api-gateway.cipher.certificate=CZCB-SM-C1A134EA25F9720BBEA19FA3F7CDB431EC58205FBF0EF759B8B248814DAFB8C9-CERTIFICATE.pem scfs.api-gateway.httpclient.headers.X-SCFS-Feature-Env=test \ No newline at end of file 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 e2fc386..192a860 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 @@ -150,7 +150,51 @@ class AccountServiceTest { // request.setBeneIdNo("411836197710087251"); // request.setBeneOpto("2031-07-25"); // request.setBeneOwner("朱高炽"); + List beneficiaryVOList = new ArrayList<>(); + OpenAccountCompanyRequest.TAccountBeneficiaryVO beneficiaryVO = new OpenAccountCompanyRequest.TAccountBeneficiaryVO(); + beneficiaryVO.setBeneName("裴久红"); + beneficiaryVO.setBeneSex("0"); + beneficiaryVO.setBeneNationality("CHNHAHAHA"); + beneficiaryVO.setBeneAddress("浙江省衢州市开化县池淮镇星口村"); + beneficiaryVO.setBeneIdType("1"); + beneficiaryVO.setBeneIdNo("411836197710087251"); + beneficiaryVO.setBeneOpto("2031-07-25"); + beneficiaryVO.setBeneNationality("CHA"); + beneficiaryVO.setActCtrl("N"); + beneficiaryVO.setActHdRat("24.996"); + beneficiaryVO.setShareRatioStartDate("1984-07-25"); + beneficiaryVO.setShareRatioEndDate("2026-07-25"); + + beneficiaryVO.setPriBenfit("N"); + beneficiaryVO.setActOwnerProfitRatio("20"); + beneficiaryVO.setProfitRatioStartDate("1984-07-25"); + beneficiaryVO.setProfitRatioEndDate("1984-07-25"); + beneficiaryVO.setActOwnerProfitRatioVote("20"); + beneficiaryVO.setProfitRatioVoteStartDate("1984-07-25"); + beneficiaryVO.setProfitRatioVoteEndDate("1984-07-25"); + + beneficiaryVO.setActCtrlCpny(""); + beneficiaryVO.setActCtrlType("0"); + beneficiaryVO.setObtainActDate("1984-07-25"); + beneficiaryVO.setTerminationActDate("1984-07-25"); + beneficiaryVO.setActConUpperMarket("Y"); + beneficiaryVO.setActConUpperEntName("12"); + beneficiaryVO.setActConUniScid("1111"); + beneficiaryVO.setActOtherForms("1"); + + beneficiaryVO.setSeniorMgr("Y"); + beneficiaryVO.setSeniorMgrPos("15"); + beneficiaryVO.setActDailyMgmtPostOther("111"); + + beneficiaryVO.setSeniorMgrCn("N"); + beneficiaryVO.setSeniorMgrPosCn("1"); + beneficiaryVO.setBenStartDate("1984-07-25"); + beneficiaryVO.setBenEndDate("1984-07-25"); + beneficiaryVO.setOwnerRightMgmtPostOther("1"); + + beneficiaryVOList.add(beneficiaryVO); + request.setBeneficiaryList(beneficiaryVOList); List list = getFileListList(); request.setFileList(list); request.setOpenLongitude(""); @@ -161,12 +205,7 @@ class AccountServiceTest { request.setTransDate(FmtDate.transDate()); request.setTransTradeTime(FmtDate.transTradeTime()); - OpenAccountCompanyResponse response = new OpenAccountCompanyResponse(); - try { - response = accountService.religionOpenAccount(request); - } catch (Exception e) { - response.setRecode("000000"); - } + OpenAccountCompanyResponse response = accountService.openAccountCompany(request); System.out.println(response); Assertions.assertEquals("000000", response.getRecode()); } @@ -252,13 +291,13 @@ class AccountServiceTest { @Test void beneficiaryQuery() { BeneficiaryQueryRequest request = new BeneficiaryQueryRequest(); - request.setChannelNo("0000"); + request.setChannelNo("1039"); request.setAppNo("10"); request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); request.setTransDate("2024-03-20"); request.setTransTradeTime("2024-01-02 09:11:53"); request.setIsGetCompanyInfo("1"); - request.setCreditCode("91310000MA1G108K3G"); + request.setCreditCode("91330101328167146F"); BeneficiaryQueryResponse response = accountService.beneficiaryQuery(request); System.out.println(response); }