Merge pull request 'chen' (#8) from chen into master

chenhj

7 天以前 aa2b64bd7fd77b065b08fee39521d772c0b39fa4

 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>
@@ -53,6 +79,13 @@
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

        <!-- postgresql驱动包 -->
        <dependency>
            <groupId>org.postgresql</groupId>
            <artifactId>postgresql</artifactId>
        </dependency>


    </dependencies>

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