From 371daf2eee34dff73edc9025254bd3dfa4011eb1 Mon Sep 17 00:00:00 2001
From: zc <jingyun1127@outlook.com>
Date: Fri, 10 Apr 2026 01:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=87=E8=A7=86=E6=89=93?=
 =?UTF-8?q?=E5=8C=85jar=E5=8C=85=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    | 51 +++++++++++++++++++
 wms-webapi/pom.xml                            | 35 ++++++++++---
 .../wms/admin/controller/ys/lib/BaseFun.java  |  5 +-
 .../main/resources/config/application-dev.yml |  6 +--
 4 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5e7da13
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,51 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+logs/
+sdklog/
+*.log
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Maven ###
+.flattened-pom.xml
+
+### JVM ###
+hs_err_pid*
+replay_pid*
+
+### OS ###
+.DS_Store
+Thumbs.db
+
+### Spotless ###
+spotless-index
diff --git a/wms-webapi/pom.xml b/wms-webapi/pom.xml
index daae4b1..aee3a84 100644
--- a/wms-webapi/pom.xml
+++ b/wms-webapi/pom.xml
@@ -110,7 +110,7 @@
             <systemPath>${project.basedir}/Library/MvCameraControlWrapper.jar</systemPath>
         </dependency>
 
-        <!-- 本地库：JNA -->
+        <!-- 本地库：JNA (宇视SDK依赖旧版本) -->
         <dependency>
             <groupId>com.sun.jna</groupId>
             <artifactId>jna</artifactId>
@@ -118,11 +118,6 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
         </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>5.13.0</version>
-        </dependency>
 
         <!-- 串口通信依赖 -->
         <dependency>
@@ -160,7 +155,7 @@
                         </manifest>
                         <manifestEntries>
                             <!--为 MANIFEST.MF 中的 Class-Path 加入配置文件目录前缀 -->
-                            <Class-Path>../${config-path}</Class-Path>
+                            <Class-Path>../${config-path} ../${config-path}lib/jna.jar ../${lib-path}jna.jar</Class-Path>
                         </manifestEntries>
                     </archive>
                     <outputDirectory>${project.build.directory}/app/${bin-path}</outputDirectory>
@@ -179,6 +174,18 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/app/${lib-path}</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-system-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/app/${lib-path}</outputDirectory>
+                            <includeScope>system</includeScope>
                         </configuration>
                     </execution>
                 </executions>
@@ -207,11 +214,23 @@
                                         <include>logback-spring.xml</include>
                                     </includes>
                                 </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/app/${config-path}</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-lib-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
                                 <resource>
                                     <directory>src/main/resources/lib</directory>
                                 </resource>
                             </resources>
-                            <outputDirectory>${project.build.directory}/app/${config-path}</outputDirectory>
+                            <outputDirectory>${project.build.directory}/app/${config-path}lib</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java
index 3aa6307..6aaf297 100644
--- a/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java
+++ b/wms-webapi/src/main/java/top/wms/admin/controller/ys/lib/BaseFun.java
@@ -1,7 +1,9 @@
 package top.wms.admin.controller.ys.lib;
 
 import com.sun.jna.Platform;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 class BaseFun {
     // 获取操作平台信息
     public static String getOsArch() {
@@ -51,7 +53,8 @@ class BaseFun {
             loadLibrary = filePath + "\\config\\lib\\win64\\";
         }
         String loadSDKLibrary = loadLibrary + "NetDEVSDK";
-        System.out.printf("[Load SDKLibrary Path : %s]\n", loadSDKLibrary);
+
+        log.info("Load SDK Library: " + loadSDKLibrary);
         return loadSDKLibrary;
     }
 }
\ No newline at end of file
diff --git a/wms-webapi/src/main/resources/config/application-dev.yml b/wms-webapi/src/main/resources/config/application-dev.yml
index 00a2372..dee5ce3 100644
--- a/wms-webapi/src/main/resources/config/application-dev.yml
+++ b/wms-webapi/src/main/resources/config/application-dev.yml
@@ -54,12 +54,12 @@ spring.data:
   ## Redis 配置（单机模式）
   redis:
     # 地址
-    host: ${REDIS_HOST:192.168.2.30}
-#    host: ${REDIS_HOST:127.0.0.1}
+#    host: ${REDIS_HOST:192.168.2.30}
+    host: ${REDIS_HOST:127.0.0.1}
     # 端口（默认 6379）
     port: ${REDIS_PORT:6379}
     # 密码（未设置密码时请注释掉）
-    password: ${REDIS_PWD:redis2025}
+#    password: ${REDIS_PWD:redis2025}
     # 数据库索引
     database: ${REDIS_DB:0}
     # 连接超时时间