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

疯狂的狮子li

2021-02-18 66899c4c960965029fc9e2f02f8998276d03cc34

 pom.xml

@@ -23,7 +23,7 @@
        <swagger.version>2.9.2</swagger.version>

      <kaptcha.version>2.3.2</kaptcha.version>

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

        <fastjson.version>1.2.74</fastjson.version>

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

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

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

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

@@ -31,8 +31,10 @@
        <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.1</mybatis-plus.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>

   

    <!-- 依赖声明 -->

@@ -183,6 +185,18 @@
                <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>