From fe4585554ee6ca6194f71381e69cbfdca4984bdb Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 04 十一月 2024 16:24:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 162 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 143 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index aace8f0..8b1c7d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,28 +111,46 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.68</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ruim.ifsp</groupId>
+ <artifactId>signature</artifactId>
+ <version>1.1.0.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>1.6.14</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.led</groupId>-->
+<!-- <artifactId>show</artifactId>-->
+<!-- <version>0.0.0.1</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>net.sf</groupId>-->
+<!-- <artifactId>jni4net</artifactId>-->
+<!-- <version>0.8.8.0</version>-->
+<!-- </dependency>-->
+
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- </plugin>
- <!--涓婄嚎閮ㄧ讲 JAR鍚姩鍒嗙渚濊禆lib鍜岄厤缃�-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -193,8 +211,9 @@
<directory>src/main/resources</directory>
<!-- 鎸囧畾鍙備笌鏋勫缓鐨剅esoures-->
<includes>
- <include>*.**</include>
+ <include>**/*</include>
</includes>
+ <filtering>true</filtering>
</resource>
</resources>
<outputDirectory>1-running/config</outputDirectory>
@@ -203,6 +222,111 @@
</executions>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>libs</directory>
+ <targetPath>BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
</build>
+<!-- <build>-->
+<!-- <plugins>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-jar-plugin</artifactId>-->
+<!-- <configuration>-->
+<!-- <!–涓嶆墦鍖呰祫婧愭枃浠�–>-->
+<!-- <excludes>-->
+<!-- <exclude>*.**</exclude>-->
+<!-- </excludes>-->
+<!-- <archive>-->
+<!-- <manifest>-->
+<!-- <addClasspath>true</addClasspath>-->
+<!-- <classpathPrefix>lib/</classpathPrefix>-->
+<!-- <!–jar鍖呬笉鍖呭惈鍞竴鐗堟湰鏍囪瘑–>-->
+<!-- <useUniqueVersions>false</useUniqueVersions>-->
+<!-- <!–绋嬪簭鍚姩绫籥pplication.java鐨勮矾寰�–>-->
+<!-- <mainClass>com.boying.Application</mainClass>-->
+<!-- </manifest>-->
+<!-- <!– 鎸囧畾閰嶇疆鏂囦欢鐩綍锛岃繖鏍穓ar杩愯鏃朵細鍘绘壘鍒板悓鐩綍涓嬬殑config鏂囦欢澶逛笅鏌ユ壘 –>-->
+<!-- <manifestEntries>-->
+<!-- <Class-Path>config/</Class-Path>-->
+<!-- </manifestEntries>-->
+<!-- </archive>-->
+<!-- <outputDirectory>1-running/</outputDirectory>-->
+<!-- </configuration>-->
+<!-- </plugin>-->
+<!-- <!–鎷疯礉渚濊禆 copy-dependencies–>-->
+<!-- <plugin>-->
+<!-- <groupId>org.apache.maven.plugins</groupId>-->
+<!-- <artifactId>maven-dependency-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>copy-dependencies</id>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>copy-dependencies</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <outputDirectory>-->
+<!-- 1-running/lib/-->
+<!-- </outputDirectory>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- <!–鎷疯礉璧勬簮鏂囦欢 copy-resources–>-->
+<!-- <plugin>-->
+<!-- <artifactId>maven-resources-plugin</artifactId>-->
+<!-- <executions>-->
+<!-- <execution>-->
+<!-- <id>copy-resources</id>-->
+<!-- <phase>package</phase>-->
+<!-- <goals>-->
+<!-- <goal>copy-resources</goal>-->
+<!-- </goals>-->
+<!-- <configuration>-->
+<!-- <resources>-->
+<!-- <resource>-->
+<!-- <directory>src/main/resources</directory>-->
+<!-- <!– 鎸囧畾鍙備笌鏋勫缓鐨剅esoures–>-->
+<!-- <includes>-->
+<!-- <include>**/*</include>-->
+<!-- </includes>-->
+<!-- <filtering>true</filtering>-->
+<!-- </resource>-->
+<!-- </resources>-->
+<!-- <outputDirectory>1-running/config</outputDirectory>-->
+<!-- </configuration>-->
+<!-- </execution>-->
+<!-- </executions>-->
+<!-- </plugin>-->
+<!-- </plugins>-->
+<!-- <resources>-->
+<!-- <resource>-->
+<!-- <!– directory 琛ㄧず鍙栬鐩綍涓嬬殑鏂囦欢 –>-->
+<!-- <directory>libs</directory>-->
+<!-- <!–targetPath 鎸囧畾鎵撳寘鍒板摢涓洰褰曚笅 榛樿鏄斁鍒癱lass鐩綍涓�–>-->
+<!-- <targetPath>/BOOT-INF/lib/</targetPath>-->
+<!-- <!– 鍙栫鍚堟牸寮忕殑鎵�鏈夋枃浠� *浠ｈ〃鍏ㄩ儴 –>-->
+<!-- <includes>-->
+<!-- <include>**/*.jar</include>-->
+<!-- </includes>-->
+<!-- </resource>-->
+<!-- <!– 鎵撳寘jar鏃惰В寮�涓嬫柟鐨勬敞閲婏紝濡傛灉鏄紪璇戝櫒杩愯椤圭洰鏃舵敞閲婃帀涓嬫柟閰嶇疆锛�-->
+<!-- 銆�銆�銆�銆�銆�銆�鍥犱负缂栬瘧鍣ㄨ繍琛岄」鐩椂锛岄」鐩細璇诲彇澶栭儴渚濊禆鍖呯殑閰嶇疆鏂囦欢锛�-->
+<!-- 銆�銆�銆�銆�銆�銆�椤圭洰鏈韩鐨勯厤缃枃浠惰涓嶅埌 –>-->
+<!-- <!–<resource>-->
+<!-- 鎶妔rc/main/resources涓嬬殑鎵�鏈夐厤缃枃浠跺姞杞藉埌鎵撳寘鍚庣殑BOOT-INF/classes鏂囦欢涓�-->
+<!-- <directory>src/main/resources</directory>-->
+<!-- <targetPath>BOOT-INF/classes</targetPath>-->
+<!-- </resource>–>-->
+<!-- </resources>-->
+<!-- </build>-->
+
+
</project>
--
Gitblit v1.9.1