Merge remote-tracking branch 'origin/main'

ageerle

2025-03-04 d1b6a13a58afa4e03f4d6cb0a62cd759ccf306f4

 pom.xml

@@ -59,6 +59,7 @@
        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
        <weixin-java-miniapp.version>4.5.0</weixin-java-miniapp.version>
        <weixin-java-pay.version>4.6.0</weixin-java-pay.version>
        <weixin-java-cp.version>4.6.0</weixin-java-cp.version>
    </properties>

    <profiles>
@@ -243,16 +244,16 @@
                <version>${tencent.sms.version}</version>
            </dependency>

<!--            <dependency>-->
<!--                <groupId>de.codecentric</groupId>-->
<!--                <artifactId>spring-boot-admin-starter-server</artifactId>-->
<!--                <version>${spring-boot-admin.version}</version>-->
<!--            </dependency>-->
<!--            <dependency>-->
<!--                <groupId>de.codecentric</groupId>-->
<!--                <artifactId>spring-boot-admin-starter-client</artifactId>-->
<!--                <version>${spring-boot-admin.version}</version>-->
<!--            </dependency>-->
            <!--            <dependency>-->
            <!--                <groupId>de.codecentric</groupId>-->
            <!--                <artifactId>spring-boot-admin-starter-server</artifactId>-->
            <!--                <version>${spring-boot-admin.version}</version>-->
            <!--            </dependency>-->
            <!--            <dependency>-->
            <!--                <groupId>de.codecentric</groupId>-->
            <!--                <artifactId>spring-boot-admin-starter-client</artifactId>-->
            <!--                <version>${spring-boot-admin.version}</version>-->
            <!--            </dependency>-->

            <!--redisson-->
            <dependency>
@@ -323,6 +324,12 @@

            <dependency>
                <groupId>org.ruoyi</groupId>
                <artifactId>ruoyi-knowledge</artifactId>
                <version>${revision}</version>
            </dependency>

            <dependency>
                <groupId>org.ruoyi</groupId>
                <artifactId>ruoyi-demo</artifactId>
                <version>${revision}</version>
            </dependency>