diff --git a/readme.md b/readme.md index ee15a8d..406f451 100644 --- a/readme.md +++ b/readme.md @@ -32,6 +32,8 @@ Profile profile=new RsaProfile.Builder() ### 通过openSSL生成RSA证书 +使用密钥工具生成 + * https://slproweb.com/products/Win32OpenSSL.htm ```shell @@ -60,14 +62,15 @@ openssl x509 -req -days 3650 -in rsa_csr.pem -signkey rsa_private_key.pem -out r ## 更新版本号 ```shell -# 快照版本 -mvn versions:set -DnewVersion=dev-snapshot +# 开发测试阶段使用快照版本 +mvn versions:set -DnewVersion=1.0.1-snapshot # 正式版本,版本号加一 -mvn versions:set -DnewVersion=2.0.0 +mvn versions:set -DnewVersion=1.0.2 ``` ## 代码扫描 +使用jenkins扫描 配置maven脚本 \bin\mvn.cmd,添加一行命令 `set JAVA_HOME="C:\Ext\zulu17"` @@ -103,3 +106,8 @@ scfs.api-gateway.cipher.channel-private-key=CZCB-SM-FB4E3DCE0297438ED390771F4657 scfs.api-gateway.cipher.channel-certificate-serial=FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5 scfs.api-gateway.cipher.certificate=CZCB-SM-FB4E3DCE0297438ED390771F46576B92FD7E6B7F1E9BD12A7D87E821B59948E5-CERTIFICATE.pem ``` +## 单元测试 + +```shell +mvn clean test +``` \ No newline at end of file diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java index d0685ee..7b21b41 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java @@ -119,14 +119,14 @@ class InvoiceServiceTest { extractedInvoiceInfoQueryRequestAssertions(request); String requestJson = Json.toJson(request); - Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"invoice_no\":\"setInvoiceNo\",\"invoice_register_date_start\":\"setInvoiceRegisterDateStart\",\"invoice_register_date_end\":\"setInvoiceRegisterDateEnd\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\"}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"invoice_no\":\"setInvoiceNo\",\"invoice_register_date_start\":\"setInvoiceRegisterDateStart\",\"invoice_register_date_end\":\"setInvoiceRegisterDateEnd\",\"create_time_start\":\"setCreateTimeStart\",\"create_time_end\":\"setCreateTimeEnd\",\"invoice_status\":\"setInvoiceStatus\",\"match_status\":\"setMatchStatus\",\"settle_status\":\"setSettleStatus\",\"invoice_amount\":100.0,\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\"}", requestJson); InvoiceInfoQueryResponse response = new InvoiceInfoQueryResponse(); extractedInvoiceInfoQueryResponseParams(response); extractedInvoiceInfoQueryResponseAssertions(response); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"invoice_no\":\"setInvoiceNo\",\"invoice_type\":\"setInvoiceType\",\"invoice_register_date\":\"setInvoiceRegisterDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\",\"invoice_belong_start_date\":\"setInvoiceBelongStartDate\",\"invoice_belong_end_date\":\"setInvoiceBelongEndDate\",\"invoice_amount\":100.0,\"invoice_status\":\"setInvoiceStatus\",\"match_amount\":100.0,\"match_status\":\"setMatchStatus\",\"settle_amount\":100.0,\"settle_status\":\"setSettleStatus\"}]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"invoice_no\":\"setInvoiceNo\",\"invoice_type\":\"setInvoiceType\",\"invoice_register_date\":\"setInvoiceRegisterDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\",\"invoice_belong_start_date\":\"setInvoiceBelongStartDate\",\"invoice_belong_end_date\":\"setInvoiceBelongEndDate\",\"invoice_amount\":100.0,\"invoice_status\":\"setInvoiceStatus\",\"match_amount\":100.0,\"match_status\":\"setMatchStatus\",\"settle_amount\":100.0,\"settle_status\":\"setSettleStatus\",\"create_time\":\"setCreateTime\",\"update_time\":\"setUpdateTime\"}]}", responseJson); HttpResponse httpResponse = MockHttpResponse.create("/invoice/query", response, InvoiceInfoQueryResponse.class); Mockito.when(apiClient.post( @@ -139,7 +139,7 @@ class InvoiceServiceTest { InvoiceInfoQueryResponse result = service.query(request); String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"invoice_no\":\"setInvoiceNo\",\"invoice_type\":\"setInvoiceType\",\"invoice_register_date\":\"setInvoiceRegisterDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\",\"invoice_belong_start_date\":\"setInvoiceBelongStartDate\",\"invoice_belong_end_date\":\"setInvoiceBelongEndDate\",\"invoice_amount\":100.0,\"invoice_status\":\"setInvoiceStatus\",\"match_amount\":100.0,\"match_status\":\"setMatchStatus\",\"settle_amount\":100.0,\"settle_status\":\"setSettleStatus\"}]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"invoice_no\":\"setInvoiceNo\",\"invoice_type\":\"setInvoiceType\",\"invoice_register_date\":\"setInvoiceRegisterDate\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"settle_account_no\":\"setSettleAccountNo\",\"settle_account_name\":\"setSettleAccountName\",\"invoice_belong_start_date\":\"setInvoiceBelongStartDate\",\"invoice_belong_end_date\":\"setInvoiceBelongEndDate\",\"invoice_amount\":100.0,\"invoice_status\":\"setInvoiceStatus\",\"match_amount\":100.0,\"match_status\":\"setMatchStatus\",\"settle_amount\":100.0,\"settle_status\":\"setSettleStatus\",\"create_time\":\"setCreateTime\",\"update_time\":\"setUpdateTime\"}]}", resultJson); } void extractedInvoiceInfoQueryRequestParams(InvoiceInfoQueryRequest request) {