From 4edcc0bca2cf26ca28dfd679b4ee5c11a01a29d8 Mon Sep 17 00:00:00 2001
From: 13009 <wangwei@czcb.com.cn>
Date: Fri, 26 Jul 2024 11:03:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20uuid=20=E7=94=9F=E6=88=90=E5=8A=A0?=
 =?UTF-8?q?=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czcb/scfs/api/core/util/Nonce.java    |  5 ++++-
 .../czcb/scfs/api/core/util/NonceTest.java    | 15 ++++++++++++++
 .../api/test/service/InvoiceServiceTest.java  | 20 ++++++++++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java
index c0628e1..da8d267 100644
--- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java
+++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Nonce.java
@@ -7,6 +7,7 @@ import java.util.UUID;
  * @since 2.0.0
  */
 public class Nonce {
+    private static final Object lock = new Object();
 
     private Nonce() {
     }
@@ -15,6 +16,8 @@ public class Nonce {
      * @return nonce 随机串
      */
     public static String ofNonce() {
-        return UUID.randomUUID().toString().replace("-", "").toLowerCase();
+        synchronized (lock) {
+            return UUID.randomUUID().toString().replace("-", "").toLowerCase();
+        }
     }
 }
diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java
index d56cdaa..241a77e 100644
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/NonceTest.java
@@ -3,10 +3,25 @@ package com.czcb.scfs.api.core.util;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.HashSet;
+import java.util.Set;
+
 class NonceTest {
 
+
     @Test
     void ofNonce() {
         Assertions.assertEquals(32, Nonce.ofNonce().length());
     }
+
+    @Test
+    void ifNonceTest() {
+        Set<String> strings = new HashSet<>();
+        for (int j = 0; j < 1000000; j++) {
+            String s = Nonce.ofNonce();
+            strings.add(s);
+        }
+
+        Assertions.assertEquals(1000000, strings.size());
+    }
 }
\ No newline at end of file
diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/InvoiceServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/InvoiceServiceTest.java
index 4b58d73..946797e 100644
--- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/InvoiceServiceTest.java
+++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/InvoiceServiceTest.java
@@ -1,16 +1,16 @@
 package com.czcb.scfs.api.test.service;
 
 import com.czcb.scfs.api.service.v2.invoice.InvoiceService;
+import com.czcb.scfs.api.service.v2.invoice.model.InvoiceDepositQueryRequest;
+import com.czcb.scfs.api.service.v2.invoice.model.InvoiceDepositQueryResponse;
 import com.czcb.scfs.api.service.v2.invoice.model.InvoiceInfoSaveRequest;
 import com.czcb.scfs.api.service.v2.invoice.model.InvoiceSettleMatchRequest;
-import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,8 +26,9 @@ class InvoiceServiceTest {
     void addTest() {
         invoiceService.add(new InvoiceInfoSaveRequest());
     }
+
     @Test
-    void matchTest(){
+    void matchTest() {
         InvoiceSettleMatchRequest request = new InvoiceSettleMatchRequest();
         request.setChannelNo("1039");
         request.setAppNo("21");
@@ -46,4 +47,17 @@ class InvoiceServiceTest {
         request.setMatchType("1");
         invoiceService.settleMatch(request);
     }
+
+    @Test
+    void invoiceDepositQuery() {
+        InvoiceDepositQueryRequest request = new InvoiceDepositQueryRequest();
+        request.setChannelNo("1039");
+        request.setAppNo("21");
+        request.setSerialNo("123456");
+        request.setTransDate("2024-07-24");
+        request.setTransTradeTime("2024-07-24 15:52:11");
+
+        InvoiceDepositQueryResponse response = invoiceService.invoiceDepositQuery(request);
+        System.out.println(response);
+    }
 }