Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-03-09 5494ec36e514fe53334ff175782c2a512b4cbb87

 pom.xml

@@ -6,14 +6,14 @@
   

    <groupId>com.ruoyi</groupId>

    <artifactId>ruoyi</artifactId>

    <version>3.3.0</version>

    <version>3.4.0</version>



    <name>ruoyi</name>

    <url>http://www.ruoyi.vip</url>

    <description>若依管理系统</description>

    

    <properties>

        <ruoyi.version>3.3.0</ruoyi.version>

        <ruoyi.version>3.4.0</ruoyi.version>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

        <java.version>1.8</java.version>

@@ -24,13 +24,17 @@
      <kaptcha.version>2.3.2</kaptcha.version>

        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>

        <fastjson.version>1.2.75</fastjson.version>

        <oshi.version>5.3.6</oshi.version>

        <jna.version>5.6.0</jna.version>

        <oshi.version>5.6.0</oshi.version>

        <jna.version>5.7.0</jna.version>

        <commons.io.version>2.5</commons.io.version>

        <commons.fileupload.version>1.3.3</commons.fileupload.version>

        <poi.version>4.1.2</poi.version>

        <velocity.version>1.7</velocity.version>

        <jwt.version>0.9.1</jwt.version>

        <mybatis-plus.version>3.4.2</mybatis-plus.version>

        <hutool.version>5.4.0</hutool.version>

        <feign.version>2.2.6.RELEASE</feign.version>

        <feign-okhttp.version>11.0</feign-okhttp.version>

    </properties>

   

    <!-- 依赖声明 -->

@@ -65,6 +69,12 @@
                <groupId>com.github.pagehelper</groupId>

                <artifactId>pagehelper-spring-boot-starter</artifactId>

                <version>${pagehelper.boot.version}</version>

                <exclusions>

                    <exclusion>

                        <groupId>org.mybatis</groupId>

                        <artifactId>mybatis</artifactId>

                    </exclusion>

                </exclusions>

            </dependency>

         

            <!-- 获取系统信息 -->

@@ -151,14 +161,42 @@
                <artifactId>jjwt</artifactId>

                <version>${jwt.version}</version>

            </dependency>

			


            <!--验证码 -->

            <dependency>

                <groupId>com.github.penggle</groupId>

                <artifactId>kaptcha</artifactId>

                <version>${kaptcha.version}</version>

            </dependency>

            


            <dependency>

                <groupId>com.baomidou</groupId>

                <artifactId>mybatis-plus-boot-starter</artifactId>

                <version>${mybatis-plus.version}</version>

            </dependency>

            <dependency>

                <groupId>com.baomidou</groupId>

                <artifactId>mybatis-plus-extension</artifactId>

                <version>${mybatis-plus.version}</version>

            </dependency>

            <dependency>

                <groupId>cn.hutool</groupId>

                <artifactId>hutool-all</artifactId>

                <version>${hutool.version}</version>

            </dependency>



            <dependency>

                <groupId>org.springframework.cloud</groupId>

                <artifactId>spring-cloud-starter-openfeign</artifactId>

                <version>${feign.version}</version>

            </dependency>



            <dependency>

                <groupId>io.github.openfeign</groupId>

                <artifactId>feign-okhttp</artifactId>

                <version>${feign-okhttp.version}</version>

            </dependency>



            <!-- 定时任务-->

            <dependency>

                <groupId>com.ruoyi</groupId>

@@ -194,6 +232,13 @@
                <version>${ruoyi.version}</version>

            </dependency>



            <!-- demo模块 -->

            <dependency>

                <groupId>com.ruoyi</groupId>

                <artifactId>ruoyi-demo</artifactId>

                <version>${ruoyi.version}</version>

            </dependency>



        </dependencies>

    </dependencyManagement>



@@ -204,6 +249,7 @@
        <module>ruoyi-quartz</module>

        <module>ruoyi-generator</module>

        <module>ruoyi-common</module>

        <module>ruoyi-demo</module>

    </modules>

    <packaging>pom</packaging>



@@ -225,6 +271,14 @@
                </configuration>

            </plugin>

        </plugins>

        <resources>

            <resource>

                <!--打包该目录下的 application.yml -->

                <directory>src/main/resources</directory>

                <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->

                <filtering>true</filtering>

            </resource>

        </resources>

    </build>



    <repositories>

@@ -252,4 +306,26 @@
        </pluginRepository>

    </pluginRepositories>



    <profiles>

        <profile>

            <id>dev</id>

            <properties>

                <!-- 环境标识，需要与配置文件的名称相对应 -->

                <profiles.active>dev</profiles.active>

                <logging.level>debug</logging.level>

            </properties>

            <activation>

                <!-- 默认环境 -->

                <activeByDefault>true</activeByDefault>

            </activation>

        </profile>

        <profile>

            <id>prod</id>

            <properties>

                <profiles.active>prod</profiles.active>

                <logging.level>warn</logging.level>

            </properties>

        </profile>

    </profiles>



</project>