From 84aaa824c5c9f17c6006b9ea1e7f379bb5cd023a Mon Sep 17 00:00:00 2001
From: liulu <lu.liu@sunyard.com>
Date: Thu, 14 Nov 2024 17:23:38 +0800
Subject: [PATCH] fix

---
 .../chsm/sdf/adapter/JnaSdfAdaptor.java        |  2 +-
 .../chsm/sdf/adapter/SunyardJnaSdfAdaptor.java |  5 +++--
 .../com/sunyard/chsm/sdf/context/AlgId.java    | 18 +++++++++---------
 .../user/controller/ScUShieldController.java   |  2 --
 .../src/main/resources/application.yml         |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java
index 26627a4..9a386aa 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java
@@ -31,7 +31,7 @@ public abstract class JnaSdfAdaptor implements SdfApiAdapter {
 
     protected final SdfLibrary sdfLibrary;
 
-    protected abstract int getAlgId(String alg);
+    protected abstract int getAlgId(AlgId alg);
 
     @Override
     public String openDevice() {
diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SunyardJnaSdfAdaptor.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SunyardJnaSdfAdaptor.java
index 1c47d55..e7152bf 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SunyardJnaSdfAdaptor.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/adapter/SunyardJnaSdfAdaptor.java
@@ -2,6 +2,7 @@ package com.sunyard.chsm.sdf.adapter;
 
 import com.sun.jna.Native;
 import com.sun.jna.ptr.PointerByReference;
+import com.sunyard.chsm.sdf.context.AlgId;
 import com.sunyard.chsm.sdf.context.SunyardAlgId;
 import com.sunyard.chsm.sdf.lib.SunyardSdfLibrary;
 
@@ -50,8 +51,8 @@ public class SunyardJnaSdfAdaptor extends JnaSdfAdaptor {
     }
 
     @Override
-    protected int getAlgId(String alg) {
-        return SunyardAlgId.valueOf(alg).getValue();
+    protected int getAlgId(AlgId alg) {
+        return SunyardAlgId.valueOf(alg.name()).getValue();
     }
 
     public static byte[] safeStringBytes(String str) {
diff --git a/chsm-common/src/main/java/com/sunyard/chsm/sdf/context/AlgId.java b/chsm-common/src/main/java/com/sunyard/chsm/sdf/context/AlgId.java
index ce07226..17602b0 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/sdf/context/AlgId.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/sdf/context/AlgId.java
@@ -4,15 +4,15 @@ package com.sunyard.chsm.sdf.context;
  * @author liulu
  * @since 2024/11/5
  */
-public interface AlgId {
+public enum AlgId {
+    SGD_SM3,
 
-    String SGD_SM3 = "SGD_SM3";
+    SGD_SM4_CBC,
+    SGD_SM4_ECB,
+    SGD_SM4_MAC,
 
-    String SGD_SM4_CBC = "SGD_SMS4_CBC";
-    String SGD_SM4_ECB = "SGD_SMS4_ECB";
-    String SGD_SM4_MAC = "SGD_SMS4_MAC";
-
-    String SGD_SM2_1 = "SGD_SM2_1"; // 签名验签
-    String SGD_SM2_2 = "SGD_SM2_2";
-    String SGD_SM2_3 = "SGD_SM2_3"; // 加密解密
+    SGD_SM2_1,// 签名验签
+    SGD_SM2_2,
+    SGD_SM2_3,// 加密解密
+    ;
 }
diff --git a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/user/controller/ScUShieldController.java b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/user/controller/ScUShieldController.java
index 460d66f..74aa544 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/user/controller/ScUShieldController.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/ssp/modules/user/controller/ScUShieldController.java
@@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.jna.Pointer;
 import com.sunyard.ssp.common.Result;
 import com.sunyard.ssp.constv.Alg;
 import com.sunyard.ssp.modules.monitor.log.entity.AuditLog;
@@ -90,7 +89,6 @@ public class ScUShieldController {
 
     @Autowired
     private IParamConfService iParamConfService;
-    Pointer hDeviceHandle = null;
     @Autowired
     private SdkApiService sdkApiService;
     ObjectMapper mapper = new ObjectMapper();
diff --git a/chsm-web-server/src/main/resources/application.yml b/chsm-web-server/src/main/resources/application.yml
index a1e566e..1ebd77a 100644
--- a/chsm-web-server/src/main/resources/application.yml
+++ b/chsm-web-server/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 89
+  port: 8900
   tomcat:
     uri-encoding: UTF-8
     threads: