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

This commit is contained in:
guoshengxiong 2025-06-21 11:59:50 +08:00
commit e8fa663b22
4 changed files with 23 additions and 23 deletions

46
pom.xml
View File

@ -58,11 +58,11 @@
</repositories> </repositories>
<dependencies> <dependencies>
<!-- <dependency> <!-- <dependency>
<groupId>org.bytedeco</groupId> <groupId>org.bytedeco</groupId>
<artifactId>javacv-platform</artifactId> <artifactId>javacv-platform</artifactId>
<version>1.5.9</version> <version>1.5.9</version>
</dependency>--> </dependency>-->
<!-- 以spring-boot-starter的方式引用 --> <!-- 以spring-boot-starter的方式引用 -->
<!--验证码--> <!--验证码-->
@ -793,14 +793,14 @@
<artifactId>cloudt-rest-client</artifactId> <artifactId>cloudt-rest-client</artifactId>
<version>2.8.0</version> <version>2.8.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/src/main/resources/jar/cloudt-rest-client-2.8.0-SNAPSHOT.jar</systemPath> <systemPath>${project.basedir}/src/main/resources/lib/cloudt-rest-client-2.8.0-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.glodon.gys.rest.client</groupId> <groupId>com.glodon.gys.rest.client</groupId>
<artifactId>gys-rest-client</artifactId> <artifactId>gys-rest-client</artifactId>
<version>5.0.3</version> <version>5.0.3</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/src/main/resources/jar/gys-rest-client-5.0.3-SNAPSHOT.jar</systemPath> <systemPath>${project.basedir}/src/main/resources/lib/gys-rest-client-5.0.3-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
@ -810,7 +810,7 @@
<artifactId>arcsoft</artifactId> <artifactId>arcsoft</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/src/main/resources/jar/arcsoft-sdk-face-3.0.0.0.jar</systemPath> <systemPath>${project.basedir}/src/main/resources/lib/arcsoft-sdk-face-3.0.0.0.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.zxing</groupId> <groupId>com.google.zxing</groupId>
@ -839,7 +839,7 @@
<artifactId>wflow-server</artifactId> <artifactId>wflow-server</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar</systemPath> <systemPath>${project.basedir}/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
@ -911,7 +911,7 @@
<configuration> <configuration>
<includeSystemScope>true</includeSystemScope> <includeSystemScope>true</includeSystemScope>
</configuration> </configuration>
<!--<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>repackage</goal> <goal>repackage</goal>
@ -920,7 +920,7 @@
<mainClass>com.WisdomSiteApplication</mainClass> <mainClass>com.WisdomSiteApplication</mainClass>
</configuration> </configuration>
</execution> </execution>
</executions>--> </executions>
</plugin> </plugin>
<!--处理与依赖相关的--> <!--处理与依赖相关的-->
<plugin> <plugin>
@ -951,18 +951,18 @@
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<!-- 正确设置编译器参数 --> <!-- &lt;!&ndash; 正确设置编译器参数 &ndash;&gt;-->
<compilerArgs> <!-- <compilerArgs>-->
<!-- extdirs需要拆分成两个参数 --> <!-- &lt;!&ndash; extdirs需要拆分成两个参数 &ndash;&gt;-->
<arg>-extdirs</arg> <!-- <arg>-extdirs</arg>-->
<arg>${project.basedir}/src/main/resources/lib</arg> <!-- <arg>${project.basedir}/src/main/resources/lib</arg>-->
<!-- 其他合法的javac参数 --> <!-- &lt;!&ndash; 其他合法的javac参数 &ndash;&gt;-->
</compilerArgs> <!-- </compilerArgs>-->
<!-- 必须设置fork=true才能使用内存参数 --> <!-- &lt;!&ndash; 必须设置fork=true才能使用内存参数 &ndash;&gt;-->
<fork>true</fork> <!-- <fork>true</fork>-->
<!-- 这里是设置编译器JVM的内存参数 --> <!-- &lt;!&ndash; 这里是设置编译器JVM的内存参数 &ndash;&gt;-->
<meminitial>1024m</meminitial> <!-- <meminitial>1024m</meminitial>-->
<maxmem>2048m</maxmem> <!-- <maxmem>2048m</maxmem>-->
</configuration> </configuration>
</plugin> </plugin>
<!-- 打包跳过测试 --> <!-- 打包跳过测试 -->