Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

liusuyi

2026-06-11 4fafee90e483bb10e092186a9b07b8cc356dbdb2

 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>