diff --git a/pom.xml b/pom.xml
index 9d5389d..64dc8a9 100644
--- a/pom.xml
+++ b/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">
4.0.0
-
+
com.ruoyi
ruoyi
3.8.6
@@ -11,7 +11,7 @@
ruoyi
http://www.ruoyi.vip
若依管理系统
-
+
3.8.6
UTF-8
@@ -30,6 +30,8 @@
4.1.2
2.3
0.9.1
+ 4.3.0
+ 8.0.33
@@ -40,11 +42,25 @@
org.springframework.boot
spring-boot-dependencies
- 2.5.15
+ 2.7.15
pom
import
+
+
+ com.github.xiaoymin
+ knife4j-openapi2-spring-boot-starter
+ ${knife4j.version}
+
+
+
+
+ mysql
+ mysql-connector-java
+ ${mysql.version}
+
+
com.alibaba
@@ -74,16 +90,15 @@
+
+ io.springfox
+ springfox-swagger2
+ ${swagger.version}
+
io.springfox
springfox-boot-starter
${swagger.version}
-
-
- io.swagger
- swagger-models
-
-
@@ -223,4 +238,4 @@
-
\ No newline at end of file
+
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 10434fb..20294a4 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -17,16 +17,19 @@
+
+ io.springfox
+ springfox-swagger2
+
io.springfox
springfox-boot-starter
-
+
- io.swagger
- swagger-models
- 1.6.2
+ com.github.xiaoymin
+ knife4j-openapi2-spring-boot-starter
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 4d873e7..0ff64ff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/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的基本信息,展示在文档的页面中(自定义展示的信息)
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index c9c3a7f..da05220 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/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();
- }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
index b23768e..f7dceb7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/book/service/impl/BookInfoServiceImpl.java
+++ b/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
public List list(BookInfo bookInfo) {
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
-
if (ObjUtils.notNull(bookInfo.getName())){
queryWrapper = queryWrapper.like(BookInfo::getName, bookInfo.getName());
}