Merge pull request 'li' (#10) from li into master

chenhj

8 天以前 e15e3b2c4a7d3d8c29b89bbdba6607eab3d1ed85

 ruoyi-admin/pom.xml

@@ -36,6 +36,32 @@
            <artifactId>mysql-connector-j</artifactId>
        </dependency>

        <!--  flyway 数据库迁移工具 -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-core</artifactId>
            <version>10.11.0</version> <!-- 或更高版本，如 10.11.0 -->
        </dependency>

        <!--  mysql迁移  -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-mysql</artifactId>
        </dependency>

        <!--  pgsql迁移  -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-database-postgresql</artifactId>
        </dependency>


        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-maven-plugin</artifactId>
            <version>10.11.0</version>
        </dependency>

        <!-- 核心模块-->
        <dependency>
            <groupId>com.ruoyi</groupId>
@@ -60,10 +86,17 @@
            <artifactId>postgresql</artifactId>
        </dependency>

        <!--  flyway 数据库迁移工具 -->
        <!-- FreeMarker 模板引擎 -->
        <dependency>
            <groupId>org.flywaydb</groupId>
            <artifactId>flyway-core</artifactId>
            <groupId>org.freemarker</groupId>
            <artifactId>freemarker</artifactId>
            <version>2.3.31</version> <!-- 可根据需要调整版本 -->
        </dependency>

        <dependency>
            <groupId>org.apache.velocity</groupId>
            <artifactId>velocity-engine-core</artifactId>
            <version>2.3</version>
        </dependency>

    </dependencies>
@@ -93,7 +126,7 @@
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
                </configuration>   
           </plugin>   
           </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>