diff --git a/Backend/pom.xml b/Backend/pom.xml index 7511c06..fb1bdf8 100644 --- a/Backend/pom.xml +++ b/Backend/pom.xml @@ -19,6 +19,18 @@ 21 + + + + com.baomidou + mybatis-plus-bom + 3.5.14 + pom + import + + + + @@ -48,17 +60,17 @@ org.springframework.boot spring-boot-starter-aop - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 3.0.3 - - + com.baomidou - mybatis-plus-boot-starter - 3.5.2 + mybatis-plus-spring-boot3-starter + + + com.baomidou + mybatis-plus-jsqlparser + + org.springframework.boot @@ -68,13 +80,14 @@ org.springframework.session spring-session-data-redis - + com.github.xiaoymin - knife4j-spring-boot-starter - 3.0.3 + knife4j-openapi3-jakarta-spring-boot-starter + 4.4.0 + org.apache.commons diff --git a/Backend/src/main/java/com/wonder/bi/config/Knife4jConfig.java b/Backend/src/main/java/com/wonder/bi/config/Knife4jConfig.java deleted file mode 100644 index b326f4b..0000000 --- a/Backend/src/main/java/com/wonder/bi/config/Knife4jConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.wonder.bi.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * Knife4j 接口文档配置 - * https://doc.xiaominfo.com/knife4j/documentation/get_start.html - * - */ -@Configuration -@EnableSwagger2 -@Profile({"dev", "test"}) -public class Knife4jConfig { - - @Bean - public Docket defaultApi2() { - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(new ApiInfoBuilder() - .title("Interface Documentation") - .description("bi-backend") - .version("1.1") - .build()) - .select() - .apis(RequestHandlerSelectors.basePackage("com.wonder.bi.controller")) - .paths(PathSelectors.any()) - .build(); - } -} \ No newline at end of file diff --git a/Backend/src/main/java/com/wonder/bi/config/ThreadPoolExecutorConfig.java b/Backend/src/main/java/com/wonder/bi/config/ThreadPoolExecutorConfig.java index e288576..d3f2cda 100644 --- a/Backend/src/main/java/com/wonder/bi/config/ThreadPoolExecutorConfig.java +++ b/Backend/src/main/java/com/wonder/bi/config/ThreadPoolExecutorConfig.java @@ -1,7 +1,7 @@ package com.wonder.bi.config; -import org.apache.poi.ss.formula.functions.T; -import org.jetbrains.annotations.NotNull; + +import jakarta.validation.constraints.NotNull; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/Backend/src/main/java/com/wonder/bi/utils/SpringContextUtils.java b/Backend/src/main/java/com/wonder/bi/utils/SpringContextUtils.java index b3e7c85..4890281 100644 --- a/Backend/src/main/java/com/wonder/bi/utils/SpringContextUtils.java +++ b/Backend/src/main/java/com/wonder/bi/utils/SpringContextUtils.java @@ -1,6 +1,6 @@ package com.wonder.bi.utils; -import org.jetbrains.annotations.NotNull; +import jakarta.validation.constraints.NotNull; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/Backend/src/main/resources/application.yml b/Backend/src/main/resources/application.yml index ecaaad5..bd96ed0 100644 --- a/Backend/src/main/resources/application.yml +++ b/Backend/src/main/resources/application.yml @@ -1,3 +1,21 @@ +# springdoc-openapi项目配置 +springdoc: + swagger-ui: + path: /swagger-ui.html + tags-sorter: alpha + operations-sorter: alpha + api-docs: + path: /v3/api-docs + group-configs: + - group: 'default' + paths-to-match: '/**' + packages-to-scan: com.wonder.bi.controller +# knife4j的增强配置,不需要增强可以不配 +knife4j: + enable: true + setting: + language: zh_cn + spring: application: name: bi-backend