From a7c1582c1f5735676c6420ecb29768cc050f49de Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 06 九月 2024 11:18:29 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/pom.xml | 109 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 44 deletions(-)
diff --git a/ycl-platform/pom.xml b/ycl-platform/pom.xml
index a573f41..0461887 100644
--- a/ycl-platform/pom.xml
+++ b/ycl-platform/pom.xml
@@ -30,12 +30,12 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.ycl</groupId>-->
-<!-- <artifactId>ycl-generator</artifactId>-->
-<!-- <version>1.0.0</version>-->
-<!-- <scope>compile</scope>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.ycl</groupId>-->
+ <!-- <artifactId>ycl-generator</artifactId>-->
+ <!-- <version>1.0.0</version>-->
+ <!-- <scope>compile</scope>-->
+ <!-- </dependency>-->
<dependency>
<groupId>com.alibaba.xxpt</groupId>
<artifactId>zwdd</artifactId>
@@ -50,17 +50,33 @@
<scope>system</scope>
<systemPath>${project.basedir}/src/main/resources/libs/artemis-http-client-1.1.8.jar</systemPath>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5.14</version>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.14</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.4.0</version>
+ </dependency>
</dependencies>
-<!-- <build>-->
-<!-- <finalName>ycl-platform</finalName>-->
-<!-- <plugins>-->
-<!-- <plugin>-->
-<!-- <groupId>org.springframework.boot</groupId>-->
-<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!-- </plugin>-->
-<!-- </plugins>-->
-<!-- </build>-->
+ <!-- <build>-->
+ <!-- <finalName>ycl-platform</finalName>-->
+ <!-- <plugins>-->
+ <!-- <plugin>-->
+ <!-- <groupId>org.springframework.boot</groupId>-->
+ <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
+ <!-- </plugin>-->
+ <!-- </plugins>-->
+ <!-- </build>-->
<build>
<plugins>
@@ -80,16 +96,16 @@
</execution>
</executions>
<!-- 濡傛灉瑕佹妸渚濊禆涓�璧锋墦鍖�,娉ㄩ噴涓嬮潰configuration -->
-<!-- <configuration>-->
-<!-- <layout>ZIP</layout>-->
-<!-- <includes>-->
-<!-- <!–灏嗕緷璧栧墧闄�,鍙紪璇戞墦鍖呮湰椤圭洰–>-->
-<!-- <include>-->
-<!-- <groupId>nothing</groupId>-->
-<!-- <artifactId>nothing</artifactId>-->
-<!-- </include>-->
-<!-- </includes>-->
-<!-- </configuration>-->
+ <!-- <configuration>-->
+ <!-- <layout>ZIP</layout>-->
+ <!-- <includes>-->
+ <!-- <!–灏嗕緷璧栧墧闄�,鍙紪璇戞墦鍖呮湰椤圭洰–>-->
+ <!-- <include>-->
+ <!-- <groupId>nothing</groupId>-->
+ <!-- <artifactId>nothing</artifactId>-->
+ <!-- </include>-->
+ <!-- </includes>-->
+ <!-- </configuration>-->
</plugin>
@@ -102,22 +118,21 @@
</configuration>
</plugin>
-<!-- <plugin>-->
-<!-- <artifactId>maven-dependency-plugin</artifactId>-->
-<!-- <configuration>-->
-<!-- <outputDirectory>${project.build.directory}/lib</outputDirectory>-->
-<!-- </configuration>-->
-<!-- <!–鎵цpackage鏃惰嚜鍔ㄥ皢渚濊禆澶嶅埗鍑烘潵鍒�/lib涓�–>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <phase>package</phase>-->
-<!-- <goals>-->
-<!-- <goal>copy-dependencies</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-
+ <!-- <plugin>-->
+ <!-- <artifactId>maven-dependency-plugin</artifactId>-->
+ <!-- <configuration>-->
+ <!-- <outputDirectory>${project.build.directory}/lib</outputDirectory>-->
+ <!-- </configuration>-->
+ <!-- <!–鎵цpackage鏃惰嚜鍔ㄥ皢渚濊禆澶嶅埗鍑烘潵鍒�/lib涓�–>-->
+ <!-- <executions>-->
+ <!-- <execution>-->
+ <!-- <phase>package</phase>-->
+ <!-- <goals>-->
+ <!-- <goal>copy-dependencies</goal>-->
+ <!-- </goals>-->
+ <!-- </execution>-->
+ <!-- </executions>-->
+ <!-- </plugin>-->
<plugin>
@@ -128,7 +143,7 @@
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.20</version>
+ <version>1.18.22</version>
</path>
</annotationProcessorPaths>
@@ -152,7 +167,7 @@
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
-<!-- <mainClass>your.class</mainClass>-->
+ <!-- <mainClass>your.class</mainClass>-->
</manifest>
</archive>
</configuration>
@@ -171,9 +186,15 @@
<resource>
<directory>src/main/resources</directory>
</resource>
+ <resource>
+ <directory>libs</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.dll</include>
+ </includes>
+ </resource>
</resources>
</build>
-
</project>
--
Gitblit v1.8.0