Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-man...

liyong

5 天以前 ba4af275c3b8d073f863be7b12e43974b3ef14a2

 pom.xml

@@ -32,11 +32,13 @@
        <jwt.version>0.9.1</jwt.version>

        <kaptcha.version>2.3.3</kaptcha.version>

        <swagger.version>3.0.0</swagger.version>

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

        <poi.version>5.2.3</poi.version>

        <oshi.version>6.6.5</oshi.version>

        <velocity.version>2.3</velocity.version>

        <!-- override dependency version -->

        <tomcat.version>9.0.102</tomcat.version>

        <minio.version>8.4.3</minio.version>

        <okhttp.version>4.9.0</okhttp.version>

        <logback.version>1.2.13</logback.version>

        <spring-security.version>5.7.12</spring-security.version>

        <spring-framework.version>5.3.39</spring-framework.version>

@@ -252,6 +254,28 @@
            <artifactId>lombok</artifactId>

        </dependency>







        <!-- minio -->

        <dependency>

            <groupId>io.minio</groupId>

            <artifactId>minio</artifactId>

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

            <exclusions>

                <exclusion>

                    <groupId>com.squareup.okhttp3</groupId>

                    <artifactId>okhttp</artifactId>

                </exclusion>

            </exclusions>

        </dependency>



        <!-- minio依赖okhttp 不然报错 -->

        <dependency>

            <groupId>com.squareup.okhttp3</groupId>

            <artifactId>okhttp</artifactId>

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

        </dependency>



    </dependencies>



   <build>

@@ -264,7 +288,7 @@
                   <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->

               </configuration>

           </plugin>

       </plugins>

        </plugins>

   </build>



   <repositories>