解决jni问题

license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java

@@ -12,8 +12,8 @@ import iot.sixiang.license.event.CreateForwarClientEvent;
 import iot.sixiang.license.event.DeviceClientInactiveEvent;
 import iot.sixiang.license.event.EventPublisher;
 import iot.sixiang.license.event.ForwardClientRequestEvent;
-import iot.sixiang.license.idreader.Safety;
 import iot.sixiang.license.model.SessionContext;
+import iot.sixiang.license.third_lib.LibHelper;
 import iot.sixiang.license.util.CommonUtil;
 import iot.sixiang.license.util.HexUtil;
 import iot.sixiang.license.util.SpringUtil;
@@ -30,8 +30,6 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
 
     @Autowired
     EventPublisher eventPublisher;
-    @Autowired
-    Safety safety;
 
     public DeviceServerHandler() {
         super();
@@ -122,7 +120,8 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
 
 
         //TODO 正式代码要放开
-        byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
+        LibHelper libHelper = SpringUtil.getBean(LibHelper.class);
+        byte[] bytes = libHelper.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
         if (bytes == null) {
             return false;
         }

license/src/main/java/iot/sixiang/license/idreader/Safety.java

-package iot.sixiang.license.idreader;
-
-import iot.sixiang.license.util.CommonUtil;
-import org.springframework.stereotype.Component;
-
-@Component
-public class Safety {
-    static {
-        System.load(CommonUtil.getLibFilePathByFileName("IdReaderSafetyLib"));
-    }
-
-    public native byte[] decodeExtendedPayload(byte[] data, int offset, int length);
-}
\ No newline at end of file

license/src/main/java/iot/sixiang/license/third_lib/LibHelper.java

+package iot.sixiang.license.third_lib;
+
+import iot.sixiang.license.idreader.LibPathUtil;
+import iot.sixiang.license.idreader.Safety;
+import iot.sixiang.license.util.CommonUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * Title: LibHelper
+ * Description: TODO
+ *
+ * @author tianlai3
+ * @date 2022-07-17 19:03:09
+ */
+@Component
+public class LibHelper {
+
+    private Safety safety;
+
+    @PostConstruct
+    public void init() {
+        LibPathUtil.libDir = CommonUtil.getServerParentDirectory();
+        safety = new Safety();
+    }
+
+    public byte[] decodeExtendedPayload(byte[] data, int offset, int length) {
+        return safety.decodeExtendedPayload(data, offset, length);
+    }
+
+}
\ No newline at end of file

license/src/main/java/iot/sixiang/license/util/CommonUtil.java

@@ -82,21 +82,9 @@ public class CommonUtil {
 	}
 
 	public static String getServerParentDirectory() {
-		return new File(new ApplicationHome(Consts.class).getSource().getParentFile().getPath()).getParent();
+		return new File(new ApplicationHome(Consts.class).getSource().getParentFile().getPath()).getParent()+ File.separator + "lib";
 	}
 
-	public static String getLibFilePathByFileName(String fileName) {
-		String os = System.getProperty("os.name");
-		String serverParentDirectory = getServerParentDirectory();
-		if (os != null) {
-			if (os.toLowerCase(Locale.ENGLISH).startsWith("win")) {
-				return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".dll";
-			} else {
-				return serverParentDirectory + File.separator + "lib" + File.separator + fileName + ".so";
-			}
-		}
-		return "";
-	}
 	/**
 	 * 名字脱敏
 	 * 规则，张三丰，脱敏为：张*丰