Merge remote-tracking branch 'origin/master'

pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>3.8.6</version>
@@ -11,7 +11,7 @@
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
-    
+
     <properties>
         <ruoyi.version>3.8.6</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -30,6 +30,8 @@
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <knife4j.version>4.3.0</knife4j.version>
+        <mysql.version>8.0.33</mysql.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -40,11 +42,25 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.5.15</version>
+                <version>2.7.15</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+            <!-- knife4j 依赖 -->
+            <dependency>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
+                <version>${knife4j.version}</version>
+            </dependency>
+
+            <!-- Mysql驱动包 -->
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.version}</version>
+            </dependency>
+
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -74,16 +90,15 @@
             </dependency>
 
             <!-- Swagger3依赖 -->
+            <dependency>
+                <groupId>io.springfox</groupId>
+                <artifactId>springfox-swagger2</artifactId>
+                <version>${swagger.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.springfox</groupId>
                 <artifactId>springfox-boot-starter</artifactId>
                 <version>${swagger.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-models</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <!-- io常用工具类 -->
@@ -223,4 +238,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>

ruoyi-admin/pom.xml

@@ -17,16 +17,19 @@
 
     <dependencies>
         <!-- swagger3-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-boot-starter</artifactId>
         </dependency>
 
-        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+
         <dependency>
-            <groupId>io.swagger</groupId>
+            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-models</artifactId>
+            <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
-            <version>1.6.2</version>
         </dependency>
 
         <!-- Mysql驱动包 -->

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -48,7 +48,7 @@ public class SwaggerConfig {
      */
     @Bean
     public Docket createRestApi () {
-        return new Docket(DocumentationType.OAS_30)
+        return new Docket(DocumentationType.SWAGGER_2)
                 // 是否启用Swagger
                 .enable(enabled)
                 // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -65,21 +65,4 @@ public class ${ClassName} extends ${Entity} {
 
 #end
 #end
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-#if($table.sub)
-            .append("${subclassName}List", get${subClassName}List())
-#end
-            .toString();
-    }
 }

ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java

@@ -1,10 +1,8 @@
 package com.ruoyi.book.service.impl;
 
 import java.util.List;
-import java.util.function.Function;
 
 import com.ruoyi.common.utils.ObjUtils;
-import com.ruoyi.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.ruoyi.book.mapper.BookInfoMapper;
 import com.ruoyi.book.domain.BookInfo;
@@ -31,7 +29,6 @@ public class BookInfoServiceImpl extends ServiceImpl<BookInfoMapper, BookInfo>
     public List<BookInfo> list(BookInfo bookInfo) {
         LambdaQueryWrapper<BookInfo> queryWrapper = new LambdaQueryWrapper<>();
 
-
         if (ObjUtils.notNull(bookInfo.getName())){
             queryWrapper = queryWrapper.like(BookInfo::getName, bookInfo.getName());
         }