From 3646cce811413a6755b5a0f7c4c464ab63db93ba Mon Sep 17 00:00:00 2001
From: liulu <liulu@yeah.net>
Date: Mon, 9 Dec 2024 15:17:15 +0800
Subject: [PATCH] sdf fix

---
 .../java/com/sunyard/chsm/sdf/adapter/JnaSdfAdaptor.java  | 1 -
 .../sunyard/chsm/sdf/adapter/SunyardJnaSdfAdaptor.java    | 8 +++-----
 2 files changed, 3 insertions(+), 6 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 08a4c71..94a8569 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
@@ -34,7 +34,6 @@ public abstract class JnaSdfAdaptor implements SdfApiAdapter {
     protected final SdfLibrary sdfLibrary;
 
     protected abstract int getAlgId(AlgId alg);
-    protected abstract void checkRes(int res);
 
     @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 1057eed..266494f 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
@@ -30,6 +30,7 @@ public class SunyardJnaSdfAdaptor extends JnaSdfAdaptor {
 
     private final String ip;
     private final Integer port;
+    private String libName;
     private final Integer connTimeout;
     private final Integer dealTimeout;
 
@@ -72,13 +73,14 @@ public class SunyardJnaSdfAdaptor extends JnaSdfAdaptor {
         ));
         this.ip = ip;
         this.port = port;
+        this.libName = libName;
         this.connTimeout = connTimeout;
         this.dealTimeout = dealTimeout;
     }
 
     @Override
     public String openDevice() {
-        SunyardSdfLibrary sunyardSdfLibrary = (SunyardSdfLibrary) sdfLibrary;
+        SunyardSdfLibrary sunyardSdfLibrary = SDF_LIB_MAP.computeIfAbsent(libName, k -> Native.load(libName, SunyardSdfLibrary.class));
         PointerByReference phDeviceHandle = new PointerByReference();
         sunyardSdfLibrary.SDF_OpenDevice(phDeviceHandle, safeStringBytes(ip), port, connTimeout, dealTimeout, 0);
         String key = UUID.randomUUID().toString();
@@ -91,10 +93,6 @@ public class SunyardJnaSdfAdaptor extends JnaSdfAdaptor {
         return SunyardAlgId.valueOf(alg.name()).getValue();
     }
 
-    @Override
-    protected void checkRes(int res) {
-
-    }
 
     public static byte[] safeStringBytes(String str) {
         if (null == str || str.isEmpty()) {