Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

4 天以前 7791d7493f1d9c484bdfa471d76424a8750da08d

 pom.xml

@@ -16,7 +16,7 @@
        <groupId>org.springframework.boot</groupId>

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

        <version>2.5.15</version>

        <relativePath />

        <relativePath/>

    </parent>



    <properties>

@@ -43,9 +43,16 @@
        <spring-security.version>5.7.12</spring-security.version>

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

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

        <getui-sdk.version>1.0.7.0</getui-sdk.version>

    </properties>



    <dependencies>

        <!-- ruoyi-springboot2 / swagger knife4j 配置 -->

        <dependency>

            <groupId>com.github.xiaoymin</groupId>

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

            <version>3.0.3</version>

        </dependency>



        <!-- SpringBoot 核心包 -->

        <dependency>

@@ -102,6 +109,13 @@
            <groupId>mysql</groupId>

            <artifactId>mysql-connector-java</artifactId>

            <scope>runtime</scope>

        </dependency>



        <!-- FreeMarker 模板引擎：处理变量占位符 -->

        <dependency>

            <groupId>org.freemarker</groupId>

            <artifactId>freemarker</artifactId>

            <version>2.3.32</version>

        </dependency>



        <!-- pagehelper 分页插件 -->

@@ -218,6 +232,7 @@
            <version>${poi.version}</version>

        </dependency>





        <!-- velocity代码生成使用模板 -->

        <dependency>

            <groupId>org.apache.velocity</groupId>

@@ -255,7 +270,6 @@
        </dependency>







        <!-- minio -->

        <dependency>

            <groupId>io.minio</groupId>

@@ -276,44 +290,69 @@
            <version>${okhttp.version}</version>

        </dependency>



        <dependency>

            <groupId>com.deepoove</groupId>

            <artifactId>poi-tl</artifactId>

            <version>1.12.2</version>

        </dependency>



        <dependency>

            <groupId>com.alibaba</groupId>

            <artifactId>easyexcel</artifactId>

            <version>4.0.3</version>

        </dependency>



        <dependency>

            <groupId>com.google.zxing</groupId>

            <artifactId>core</artifactId>

            <version>3.3.3</version>

        </dependency>



        <dependency>

            <groupId>com.getui.push</groupId>

            <artifactId>restful-sdk</artifactId>

            <version>${getui-sdk.version}</version>

            <scope>compile</scope>

        </dependency>



    </dependencies>



   <build>

       <finalName>${project.artifactId}</finalName>

       <plugins>

           <plugin>

               <groupId>org.springframework.boot</groupId>

               <artifactId>spring-boot-maven-plugin</artifactId>

               <configuration>

                   <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->

               </configuration>

           </plugin>

    <build>

        <finalName>${project.artifactId}</finalName>

        <plugins>

            <plugin>

                <groupId>org.springframework.boot</groupId>

                <artifactId>spring-boot-maven-plugin</artifactId>

                <configuration>

                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->

                </configuration>

            </plugin>

        </plugins>

   </build>

    </build>



   <repositories>

       <repository>

           <id>public</id>

           <name>aliyun nexus</name>

           <url>https://maven.aliyun.com/repository/public</url>

           <releases>

               <enabled>true</enabled>

           </releases>

       </repository>

   </repositories>

    <repositories>

        <repository>

            <id>public</id>

            <name>aliyun nexus</name>

            <url>https://maven.aliyun.com/repository/public</url>

            <releases>

                <enabled>true</enabled>

            </releases>

        </repository>

    </repositories>



   <pluginRepositories>

       <pluginRepository>

           <id>public</id>

           <name>aliyun nexus</name>

           <url>https://maven.aliyun.com/repository/public</url>

           <releases>

               <enabled>true</enabled>

           </releases>

           <snapshots>

               <enabled>false</enabled>

           </snapshots>

       </pluginRepository>

   </pluginRepositories>

    <pluginRepositories>

        <pluginRepository>

            <id>public</id>

            <name>aliyun nexus</name>

            <url>https://maven.aliyun.com/repository/public</url>

            <releases>

                <enabled>true</enabled>

            </releases>

            <snapshots>

                <enabled>false</enabled>

            </snapshots>

        </pluginRepository>

    </pluginRepositories>



</project>
</project>