Merge remote-tracking branch 'origin/1.0' into 1.0

This commit is contained in:
余文财 2025-05-20 10:40:55 +08:00
commit 5bc087860f
7 changed files with 41 additions and 12 deletions

6
doc/lib/command.bat Normal file
View File

@ -0,0 +1,6 @@
echo off
:: 添加jar包到本地仓库
cmd /k "mvn install:install-file -Dfile=jacob-1.21.jar -DgroupId=com.jacob -DartifactId=jacob -Dversion=1.21 -Dpackaging=jar"
pause

BIN
doc/lib/jacob-1.21-x64.dll Normal file

Binary file not shown.

BIN
doc/lib/jacob-1.21-x86.dll Normal file

Binary file not shown.

BIN
doc/lib/jacob-1.21.jar Normal file

Binary file not shown.

View File

@ -1,8 +1,25 @@
<service> <service>
<id>dpkj-express</id> <!-- 环境变量 文件名称 -->
<name>dpkj-express</name> <env name="NAME" value="yinyitong-dll-hang"/>
<description>快递寄递DLL调用服务</description>
<!-- 服务ID -->
<id>dpkj-%NAME%</id>
<!-- 服务名称 -->
<name>%BASE%</name>
<!-- 服务描述 -->
<description>银医壁挂机中间服务调用程序</description>
<!-- 启动命令 -->
<executable>java</executable> <executable>java</executable>
<arguments>-jar %BASE%\yinyitong-dll-hang.jar</arguments> <!-- 启动参数 -->
<arguments>-jar %BASE%\%NAME%.jar</arguments>
<!-- 日志-->
<logpath>%BASE%\logs\winws</logpath>
<!-- 按大小和时间滚动模式 -->
<log mode="roll-by-size-time">
<sizeThreshold>10240</sizeThreshold>
<pattern>yyyyMMdd</pattern>
<autoRollAtTime>00:00:00</autoRollAtTime>
</log>
</service> </service>

20
pom.xml
View File

@ -18,11 +18,10 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<hutool.version>5.8.25</hutool.version> <hutool.version>5.8.36</hutool.version>
<jna.version>5.14.0</jna.version>
<pdfbox.version>3.0.2</pdfbox.version> <pdfbox.version>3.0.2</pdfbox.version>
<fastjson.version>1.2.83</fastjson.version> <fastjson.version>1.2.83</fastjson.version>
<jna.version>5.17.0</jna.version>
</properties> </properties>
<dependencies> <dependencies>
@ -55,21 +54,29 @@
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId> <artifactId>hutool-all</artifactId>
<version>${hutool.version}</version> <version>${hutool.version}</version>
</dependency> </dependency>
<!-- 调用DLL --> <!-- 调用DLL -->
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId> <artifactId>jna-jpms</artifactId>
<version>${jna.version}</version> <version>${jna.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jna</groupId> <groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId> <artifactId>jna-platform-jpms</artifactId>
<version>${jna.version}</version> <version>${jna.version}</version>
</dependency> </dependency>
<!-- 调用DLL - COM库 -->
<dependency>
<groupId>com.jacob</groupId>
<artifactId>jacob</artifactId>
<version>1.21</version>
</dependency>
<!--PDF转换工具--> <!--PDF转换工具-->
<dependency> <dependency>
<groupId>org.apache.pdfbox</groupId> <groupId>org.apache.pdfbox</groupId>
@ -128,7 +135,6 @@
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>2.0.1.Final</version> <version>2.0.1.Final</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false"> <configuration debug="false">
<!--定义日志文件的存储地址 --> <!--定义日志文件的存储地址 -->
<property name="LOG_HOME" value="./logs/java"/> <property name="LOG_HOME" value="./logs/server"/>
<!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />--> <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
<!-- 控制台输出 --> <!-- 控制台输出 -->