diff --git a/pom.xml b/pom.xml
index 745896b..ba0cfed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,12 @@
             <version>2.29.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
diff --git a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/StopWatchTest.java b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/StopWatchTest.java
index fdfcf18..3221804 100644
--- a/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/StopWatchTest.java
+++ b/scfs-api-core/src/test/java/com/czcb/scfs/api/core/util/StopWatchTest.java
@@ -5,6 +5,8 @@ import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
+import static org.awaitility.Awaitility.await;
+
 class StopWatchTest {
 
     @Test
@@ -15,13 +17,16 @@ class StopWatchTest {
     }
 
     @Test
-    void start() throws InterruptedException {
+    void start() {
         StopWatch stopWatch = new StopWatch().start("test");
         stopWatch.setKeepTaskList(true);
         Assertions.assertEquals("test", stopWatch.currentTaskName());
         Assertions.assertTrue(stopWatch.isRunning());
-        Thread.sleep(10);
-        stopWatch.stop();
+
+        await().atLeast(10, TimeUnit.MILLISECONDS).until(() -> {
+            stopWatch.stop();
+            return true;
+        });
 
         Assertions.assertTrue(stopWatch.getLastTaskTimeMillis() > 0);
         Assertions.assertTrue(stopWatch.getLastTaskTimeNanos() > 0);
@@ -52,12 +57,10 @@ class StopWatchTest {
         stopWatch.setKeepTaskList(true);
         Assertions.assertEquals("", stopWatch.currentTaskName());
         Assertions.assertEquals("11", stopWatch.getId());
-        try {
-            Thread.sleep(10);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        stopWatch.stop();
+        await().atLeast(10, TimeUnit.MILLISECONDS).until(() -> {
+            stopWatch.stop();
+            return true;
+        });
 
         Assertions.assertNotNull(stopWatch.getTaskInfo());
         Assertions.assertEquals(1, stopWatch.getTaskInfo().length);
diff --git a/scfs-api-test/pom.xml b/scfs-api-test/pom.xml
index 66e9ea6..07dbb94 100644
--- a/scfs-api-test/pom.xml
+++ b/scfs-api-test/pom.xml
@@ -23,6 +23,12 @@
         <dependency>
             <groupId>com.czcb.scfs</groupId>
             <artifactId>scfs-api-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.czcb.scfs</groupId>
+                    <artifactId>scfs-api-rsa</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties
index b9e2f25..22728a0 100644
--- a/scfs-api-test/src/main/resources/application.properties
+++ b/scfs-api-test/src/main/resources/application.properties
@@ -3,7 +3,7 @@ scfs.api-gateway.host=http://127.0.0.1:8888/api-gateway
 scfs.api-gateway.channel.app-no=10001
 scfs.api-gateway.channel.channel-no=1000
 scfs.api-gateway.cipher.store-type=resources
-scfs.api-gateway.cipher.channel-private-key=rsa_channel_private_key.pem
-scfs.api-gateway.cipher.certificate=rsa_channel_certificate.pem
-#scfs.api-gateway.cipher.channel-private-key=merchant_private_key.pem
-#scfs.api-gateway.cipher.certificate=merchant_certificate.pem
\ No newline at end of file
+#scfs.api-gateway.cipher.channel-private-key=rsa_channel_private_key.pem
+#scfs.api-gateway.cipher.certificate=rsa_channel_certificate.pem
+scfs.api-gateway.cipher.channel-private-key=merchant_private_key.pem
+scfs.api-gateway.cipher.certificate=merchant_certificate.pem
\ No newline at end of file
diff --git a/scfs-api-test/src/main/resources/merchant_certificate.pem b/scfs-api-test/src/main/resources/merchant_certificate.pem
index cb8ab96..5a424ab 100644
--- a/scfs-api-test/src/main/resources/merchant_certificate.pem
+++ b/scfs-api-test/src/main/resources/merchant_certificate.pem
@@ -1,17 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIICyTCCAmygAwIBAgIUVOf1ntjfRXDPsUeA6oFS1FpnXuYwDAYIKoEcz1UBg3UF
-ADCBjTFHMEUGA1UEAww+U2hlbiBaaGVuIGlUcnVzQ2hpbmEgQ2xhc3MgRW50ZXJw
-cmlzZSBTdWJzY3JpYmVyIENBIFNNMiAtIFRlc3QxGDAWBgNVBAsMD+a1i+ivlemD
-qOivleeUqDEbMBkGA1UECgwS5aSp6K+a5a6J5L+h6K+V55SoMQswCQYDVQQGEwJD
-TjAeFw0yMjA4MDQxMjE0MTlaFw0yMzA5MDMxMjE0MTlaMGsxCzAJBgNVBAYTAkNO
-MRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xKjAoBgNVBAsMIea3seWcs+W4
-guS8n+iNo+enkeaKgOaciemZkOWFrOWPuDETMBEGA1UEAwwKMjQ4MzI4MTc2MTBZ
-MBMGByqGSM49AgEGCCqBHM9VAYItA0IABHvNR/deoZ0EwKcrTacPV90bP5M3zF3R
-JBiBuRNDGTm/aaVe9rRnEMfhckUj0PZG3WlNJIOXb26FDUZjePqLL36jgcgwgcUw
-DAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwHwYDVR0jBBgwFoAUK0Y6T9Ge
-LM7UH4bC1j2avycoZPcwHQYDVR0OBBYEFBmE5STz2WNsXVrgclXrxsl6SCihMGUG
-A1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
-aXRydXNjcmw/Q0E9NzMzNUExQUYzNzRBMUU4QjQwM0FCMUFDMkQwNjVDQUU3NUNB
-QjIzNjAMBggqgRzPVQGDdQUAA0kAMEYCIQDK0r6D8VyiUVMfRnAfz40ZtiG8DJEF
-6Rn41oZ3qPW1aQIhAKtn5sKME+thLQFeyV70VSsraZ7h9Fccal2WzI2oCdtY
+MIICKDCCAc+gAwIBAgIhAMPbc74uYS3FysLkYMHB5P+q7DCzriTkomU9a3S9QAL9MAoGCCqBHM9V
+AYN1MIGNMQswCQYDVQQGEwJDTjESMBAGA1UECAwJ5rWZ5rGf55yBMRIwEAYDVQQHDAnmna3lt57l
+uIIxITAfBgNVBAoMGOa1meaxn+eooOW3nuWVhuS4mumTtuihjDEYMBYGA1UECwwP5pWw5a2X6YeR
+6J6N6YOoMRkwFwYDVQQDDBBzY2ZzLmN6Y2IuY29tLmNuMB4XDTI0MDIyMTA1NDU0MFoXDTI5MDIy
+MTA1NDU0MFowgY0xCzAJBgNVBAYTAkNOMRIwEAYDVQQIDAnmtZnmsZ/nnIExEjAQBgNVBAcMCead
+reW3nuW4gjEhMB8GA1UECgwY5rWZ5rGf56ig5bee5ZWG5Lia6ZO26KGMMRgwFgYDVQQLDA/mlbDl
+rZfph5Hono3pg6gxGTAXBgNVBAMMEHNjZnMuY3pjYi5jb20uY24wWTATBgcqhkjOPQIBBggqgRzP
+VQGCLQNCAAS3xG2kVL1N2p71VUsFO5WyD2QCzq5SFarPpKlYpEXCx57QeEUypZFmvzTDNpWv5y11
+e798SvOBSmZTFrF6CStIMAoGCCqBHM9VAYN1A0cAMEQCIHVbD5xUf/6OORWvelFm9wSHuTQ5NRjC
+iKP4iOpCTS+oAiB4VVZ0XOdVr3ENWvzI2c1ZVvkLXy4T66CQc/Pg57P0/Q==
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/scfs-api-test/src/main/resources/merchant_private_key.pem b/scfs-api-test/src/main/resources/merchant_private_key.pem
index 21e3b87..6a2f0c9 100644
--- a/scfs-api-test/src/main/resources/merchant_private_key.pem
+++ b/scfs-api-test/src/main/resources/merchant_private_key.pem
@@ -1,6 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQg/U9Saz5ceDGQhFBM
-f/cHIh2+q5Lzvhrb8L2SI4sPUR+gCgYIKoEcz1UBgi2hRANCAAR7zUf3XqGdBMCn
-K02nD1fdGz+TN8xd0SQYgbkTQxk5v2mlXva0ZxDH4XJFI9D2Rt1pTSSDl29uhQ1G
-Y3j6iy9+
+MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgplcULkGrRiFDra/9MywSc4Ornu/k
+jdlSSXCqoHPPM0WgCgYIKoEcz1UBgi2hRANCAAS3xG2kVL1N2p71VUsFO5WyD2QCzq5SFarPpKlY
+pEXCx57QeEUypZFmvzTDNpWv5y11e798SvOBSmZTFrF6CStI
 -----END PRIVATE KEY-----
\ No newline at end of file