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 @@
${project.basedir}/Library/MvCameraControlWrapper.jar
-
+
com.sun.jna
jna
@@ -118,11 +118,6 @@
system
${project.basedir}/src/main/resources/lib/jna.jar
-
- net.java.dev.jna
- jna
- 5.13.0
-
@@ -160,7 +155,7 @@
- ../${config-path}
+ ../${config-path} ../${config-path}lib/jna.jar ../${lib-path}jna.jar
${project.build.directory}/app/${bin-path}
@@ -179,6 +174,18 @@
${project.build.directory}/app/${lib-path}
+ runtime
+
+
+
+ copy-system-dependencies
+ package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/app/${lib-path}
+ system
@@ -207,11 +214,23 @@
logback-spring.xml
+
+ ${project.build.directory}/app/${config-path}
+
+
+
+ copy-lib-resources
+ package
+
+ copy-resources
+
+
+
src/main/resources/lib
- ${project.build.directory}/app/${config-path}
+ ${project.build.directory}/app/${config-path}lib
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}
# 连接超时时间