From 214ebdf7db3f56fce7826abe0f286326246125f6 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 15:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/pom.xml | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 1b1a772..5279ea4 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -21,11 +21,6 @@
<version>1.10</version>
</dependency>
-
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
- </dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
@@ -40,11 +35,15 @@
<groupId>net.java.jna</groupId>
<artifactId>jna</artifactId>
<version>1.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
</dependency>
<dependency>
<groupId>net.java.examples</groupId>
<artifactId>examples</artifactId>
<version>1.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/examples.jar</systemPath>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -65,12 +64,6 @@
<artifactId>minio</artifactId>
<version>8.3.5</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>io.swagger</groupId>-->
-<!-- <artifactId>swagger-annotations</artifactId>-->
-<!-- <version>1.6.2</version>-->
-<!-- <scope>compile</scope>-->
-<!-- </dependency>-->
<!--mqtt-->
<dependency>
<groupId>org.springframework.integration</groupId>
@@ -87,16 +80,16 @@
<!-- <version>3.0.0</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring</artifactId>
- <version>2.0.9</version>
- </dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.xiaoymin</groupId>-->
-<!-- <artifactId>knife4j-annotations</artifactId>-->
+<!-- <artifactId>knife4j-spring</artifactId>-->
<!-- <version>2.0.9</version>-->
<!-- </dependency>-->
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-annotations</artifactId>
+ <version>2.0.9</version>
+ </dependency>
<!--寮犲缓鎻愪緵寮曞渚濊禆-->
<dependency>
<groupId>org.gavaghan</groupId>
@@ -114,6 +107,33 @@
<artifactId>forest-spring-boot-starter</artifactId>
<version>1.5.28</version>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common</artifactId>
+ </dependency>
+ <!--mybatis-plus渚濊禆-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.4.2</version>
+ </dependency>
+ <!--lombok渚濊禆-->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <includeSystemScope>true</includeSystemScope>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
--
Gitblit v1.9.3