From 4fafee90e483bb10e092186a9b07b8cc356dbdb2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-admin/pom.xml | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/ard-admin/pom.xml b/ard-admin/pom.xml
index 2e41cea..6e065ff 100644
--- a/ard-admin/pom.xml
+++ b/ard-admin/pom.xml
@@ -75,18 +75,38 @@
<artifactId>ard-route</artifactId>
</dependency>
+ <!-- 巡检模块-->
+ <dependency>
+ <groupId>com.ard</groupId>
+ <artifactId>ard-inspection</artifactId>
+ </dependency>
+
<!-- SpringBootAdmin管控台 -->
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
- <dependency>
- <groupId>com.ard</groupId>
- <artifactId>ard-inspection</artifactId>
- <version>3.8.8</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <properties>
+ <spring.profiles.active>dev,dev-druid</spring.profiles.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>prod</id>
+ <properties>
+ <spring.profiles.active>prod,prod-druid</spring.profiles.active>
+ </properties>
+ </profile>
+ <profile>
+ <id>daqing</id>
+ <properties>
+ <spring.profiles.active>daqing,daqing-druid</spring.profiles.active>
+ </properties>
+ </profile>
+ </profiles>
<build>
<plugins>
@@ -116,6 +136,12 @@
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</project>
\ No newline at end of file
--
Gitblit v1.9.3