fix

chsm-common/pom.xml

@@ -28,10 +28,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>

chsm-common/src/main/java/com/sunyard/chsm/enums/KeyAlg.java

@@ -14,6 +14,7 @@ import java.util.Objects;
 @AllArgsConstructor
 public enum KeyAlg {
 
+    SM1(KeyCategory.SYM_KEY, "SM1", "国密SM1"),
     SM4(KeyCategory.SYM_KEY, "SM4", "国密SM4"),
     SM2(KeyCategory.ASYM_KEY, "SM2", "国密SM2"),
     ;

chsm-web-manage/pom.xml

@@ -19,6 +19,15 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>com.sunyard.chsm</groupId>
+            <artifactId>chsm-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -40,16 +49,9 @@
             <artifactId>jedis</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.sunyard.chsm</groupId>
-            <artifactId>chsm-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.dm</groupId>
             <artifactId>DmJdbcDriver</artifactId>
-            <version>1.8</version>
         </dependency>
 
         <!-- sunyard -->
@@ -58,24 +60,12 @@
             <artifactId>ssp.javasdk</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.sunyard</groupId>
-            <artifactId>sdf1418</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sunyard</groupId>
-            <artifactId>sydapi4j</artifactId>
-            <version>1.13.20221010</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>groovy-all</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <!-- 工具包 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
@@ -92,12 +82,12 @@
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna</artifactId>
-            <version>5.5.0</version>
         </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.13</version>
+            <scope>provided</scope>
         </dependency>
 
 
@@ -120,7 +110,6 @@
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>

chsm-web-manage/src/main/java/com/sunyard/config/WebConfig.java

@@ -47,6 +47,7 @@ public class WebConfig {
         loggingFilter.setIncludeQueryString(true);
         loggingFilter.setIncludePayload(true);
         loggingFilter.setMaxPayloadLength(2000);
+        loggingFilter.setBeforeMessagePrefix("http request [");
         return loggingFilter;
     }
 

chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/cipherunit/controller/ScCipherMachineController.java

@@ -2,7 +2,6 @@ package com.sunyard.ssp.modules.sysconf.cipherunit.controller;
 
 import com.sun.jna.Pointer;
 import com.sun.jna.ptr.PointerByReference;
-import com.sunyard.proto.Util;
 import com.sunyard.ssp.common.Result;
 import com.sunyard.ssp.common.annotation.AuditControllerLog;
 import com.sunyard.ssp.common.exception.SspwebException;
@@ -18,6 +17,7 @@ import com.sunyard.ssp.utils.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.binary.Hex;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -97,7 +97,7 @@ public class ScCipherMachineController {
                 return new ResultUtil<Object>().setErrorMsg(ret, "生成随机数失败，密码模块初始化失败");
             }
             // 返回结果
-            String result = Util.bytes2HexString(nakedSign);
+            String result = Hex.encodeHexString(nakedSign);
             log.info("检测功能响应结果：{}", result);
             return new ResultUtil<>().setData(result);
         } catch (SspwebException e) {

pom.xml

@@ -53,6 +53,26 @@
                 <artifactId>proto</artifactId>
                 <version>1.0.20221215</version>
             </dependency>
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-core</artifactId>
+                <version>5.8.4</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jna</groupId>
+                <artifactId>jna</artifactId>
+                <version>5.5.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.dm</groupId>
+                <artifactId>DmJdbcDriver</artifactId>
+                <version>1.8</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+                <version>0.9.1</version>
+            </dependency>
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-boot-starter</artifactId>