From 426fcd72a112c5c16950615fd059ea0369fe4c4e Mon Sep 17 00:00:00 2001
From: Weasley J <1432689025@qq.com>
Date: Sat, 10 Jun 2023 00:18:55 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=8A=A0=E7=AD=BE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=87=8D=E5=91=BD=E5=90=8D=20-=20[=E8=AF=BB?=
 =?UTF-8?q?=E5=8D=A1=E5=99=A8=E5=BA=95=E5=B1=82=E5=BA=93]=E5=A4=8D?=
 =?UTF-8?q?=E4=BD=8D=E8=AF=BB=E5=8D=A1=E5=99=A8=E5=A4=B1=E8=B4=A5=E4=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=8D=E5=90=AFu-key=E7=9A=84Windows?=
 =?UTF-8?q?=E8=BF=9B=E7=A8=8B=EF=BC=8C=E5=B8=8C=E6=9C=9B=E8=83=BD=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E8=87=AA=E6=88=91=E5=AE=B9=E7=81=BE=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 pom.xml                                       | 30 +++----------------
 .../core/WebSocketClientHandler.java          |  7 +++--
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d55d90..05b8848 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ hs_err_pid*
 !**/src/main/resources/*-lwj.yml
 !**/src/main/resources/*-*lwj.yml
 !**/src/main/resources/*-lwj*.yml
+/.fastRequest/
diff --git a/pom.xml b/pom.xml
index efd62d8..3e4e5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0-M3</version>
+        <version>3.1.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>cn.gov.chinaport</groupId>
     <artifactId>chinaport-data-signature</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
     <name>chinaport-data-signature</name>
     <url>https://github.com/Weasley-J/chinaport-data-signature.git</url>
 
@@ -25,10 +25,10 @@
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring-cloud.version>2022.0.0-M1</spring-cloud.version>
+        <spring-cloud.version>2022.0.3</spring-cloud.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <hutool-all.version>5.8.10</hutool-all.version>
+        <hutool-all.version>5.8.18</hutool-all.version>
         <smart-doc.version>2.3.7</smart-doc.version>
         <xmlsec.version>3.0.1</xmlsec.version>
         <jna.version>3.0.9</jna.version>
@@ -242,26 +242,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>
diff --git a/src/main/java/cn/alphahub/eport/signature/core/WebSocketClientHandler.java b/src/main/java/cn/alphahub/eport/signature/core/WebSocketClientHandler.java
index c9efce0..5349c96 100644
--- a/src/main/java/cn/alphahub/eport/signature/core/WebSocketClientHandler.java
+++ b/src/main/java/cn/alphahub/eport/signature/core/WebSocketClientHandler.java
@@ -102,6 +102,8 @@ public class WebSocketClientHandler extends TextWebSocketHandler {
      * {"_id":1,"_method":"cus-sec_SpcSignDataAsPEM","_status":"00","_args":{"Result":false,"Data":[],"Error":["[读卡器底层库]复位读卡器失败:错误码=50070","Err:Custom50070"]}}
      *
      * @param cause cause
+     * @apiNote [读卡器底层库]复位读卡器失败会自动重启u-key的Windows进程，希望能提升自我容灾机制
+     * @since 2023-06-10
      */
     @Email
     public void handleFailedToProcessSign(String cause) {
@@ -112,10 +114,11 @@ public class WebSocketClientHandler extends TextWebSocketHandler {
             messageDomain.setCc(StringUtils.split(emailProperties.getCc(), ","));
             messageDomain.setSentDate(LocalDateTime.now());
             messageDomain.setSubject("电子口岸u-key加签失败");
-            if (cause.contains("[读卡器底层库]复位读卡器失败"))
+            if (cause.contains("[读卡器底层库]复位读卡器失败")) {
                 messageDomain.setText("电子口岸u-key加签失败，原因：\n" + cause + "\n\n如遇：“[读卡器底层库]复位读卡器失败”等错误，请手动重启加签exe客户端程序");
-            else
+            } else {
                 messageDomain.setText("电子口岸u-key加签失败，原因：\n" + cause);
+            }
             emailTemplate.send(messageDomain);
         }
     }