diff --git a/chsm-common/pom.xml b/chsm-common/pom.xml
index a87997d..207ee15 100644
--- a/chsm-common/pom.xml
+++ b/chsm-common/pom.xml
@@ -28,10 +28,6 @@
org.springframework.boot
spring-boot-starter-validation
-
- org.springframework.boot
- spring-boot-starter-aop
-
com.baomidou
mybatis-plus-boot-starter
diff --git a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyAlg.java b/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyAlg.java
index 4e36f6b..9b30645 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/enums/KeyAlg.java
+++ b/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"),
;
diff --git a/chsm-web-manage/pom.xml b/chsm-web-manage/pom.xml
index 04984ec..89646be 100644
--- a/chsm-web-manage/pom.xml
+++ b/chsm-web-manage/pom.xml
@@ -19,6 +19,15 @@
+
+ com.sunyard.chsm
+ chsm-common
+ ${project.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-aop
+
org.springframework.boot
spring-boot-starter-security
@@ -40,16 +49,9 @@
jedis
-
- com.sunyard.chsm
- chsm-common
- ${project.version}
-
-
com.dm
DmJdbcDriver
- 1.8
@@ -58,24 +60,12 @@
ssp.javasdk
1.0-SNAPSHOT
-
- com.sunyard
- sdf1418
- 1.0-SNAPSHOT
-
-
- com.sunyard
- sydapi4j
- 1.13.20221010
-
-
- *
- groovy-all
-
-
-
+
+ cn.hutool
+ hutool-core
+
org.apache.commons
commons-pool2
@@ -92,12 +82,12 @@
net.java.dev.jna
jna
- 5.5.0
io.swagger
swagger-annotations
1.5.13
+ provided
@@ -120,7 +110,6 @@
io.jsonwebtoken
jjwt
- 0.9.1
javax.persistence
diff --git a/chsm-web-manage/src/main/java/com/sunyard/config/WebConfig.java b/chsm-web-manage/src/main/java/com/sunyard/config/WebConfig.java
index a1bc59a..7fddeee 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/config/WebConfig.java
+++ b/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;
}
diff --git a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/cipherunit/controller/ScCipherMachineController.java b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/cipherunit/controller/ScCipherMachineController.java
index 4e28a96..c033093 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/sysconf/cipherunit/controller/ScCipherMachineController.java
+++ b/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
+
+ cn.hutool
+ hutool-core
+ 5.8.4
+
+
+ net.java.dev.jna
+ jna
+ 5.5.0
+
+
+ com.dm
+ DmJdbcDriver
+ 1.8
+
+
+ io.jsonwebtoken
+ jjwt
+ 0.9.1
+
com.baomidou
mybatis-plus-boot-starter