diff --git a/pom.xml b/pom.xml index f2bc898..4493263 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.6 + 3.5.5 com.yolo @@ -16,12 +16,50 @@ keyboard-backend 17 + 1.0.0 + 1.0.0.2 + 3.5.5 + + + + + + com.alibaba.cloud.ai + spring-ai-alibaba-bom + ${spring-ai-alibaba.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + org.springframework.ai + spring-ai-bom + ${spring-ai.version} + pom + import + + + + + + org.springframework.boot spring-boot-starter-web + + com.alibaba.cloud.ai + spring-ai-alibaba-starter-dashscope + 1.0.0.4 + org.springframework.boot spring-boot-starter-aop @@ -58,26 +96,40 @@ - com.github.xiaoymin - knife4j-spring-boot-starter - 3.0.3 + com.github.xingfudeshi + knife4j-openapi3-jakarta-spring-boot-starter + 4.6.0 cn.hutool hutool-all 5.8.41 + + + org.postgresql + postgresql + 42.7.7 + + + + cn.dev33 + sa-token-spring-boot3-starter + 1.44.0 + + + + + org.hibernate.validator + hibernate-validator + org.springframework.boot spring-boot-devtools runtime true - - org.postgresql - postgresql - 42.7.7 - + org.springframework.boot spring-boot-configuration-processor @@ -94,12 +146,7 @@ spring-boot-starter-test test - - - cn.dev33 - sa-token-spring-boot-starter - 1.44.0 - + junit diff --git a/src/main/java/com/yolo/keyborad/aop/LogInterceptor.java b/src/main/java/com/yolo/keyborad/aop/LogInterceptor.java index d19bdec..5b96a9f 100644 --- a/src/main/java/com/yolo/keyborad/aop/LogInterceptor.java +++ b/src/main/java/com/yolo/keyborad/aop/LogInterceptor.java @@ -1,5 +1,6 @@ package com.yolo.keyborad.aop; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -10,8 +11,6 @@ import org.springframework.util.StopWatch; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; import java.util.UUID; /** diff --git a/src/main/java/com/yolo/keyborad/config/Knife4jConfig.java b/src/main/java/com/yolo/keyborad/config/Knife4jConfig.java index 5aca33f..a268ebb 100644 --- a/src/main/java/com/yolo/keyborad/config/Knife4jConfig.java +++ b/src/main/java/com/yolo/keyborad/config/Knife4jConfig.java @@ -1,14 +1,11 @@ package com.yolo.keyborad.config; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; 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 接口文档配置 @@ -17,22 +14,18 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; * @author yupi */ @Configuration -@EnableSwagger2 @Profile("dev") public class Knife4jConfig { - @Bean - public Docket defaultApi2() { - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(new ApiInfoBuilder() - .title("keyborad-backend") - .description("keyborad-backend") - .version("1.0") - .build()) - .select() - // 指定 Controller 扫描包路径 - .apis(RequestHandlerSelectors.basePackage("com.yolo.keyborad.controller")) - .paths(PathSelectors.any()) - .build(); + public OpenAPI springShopOpenApi() { + return new OpenAPI() + // 接口文档标题 + .info(new Info().title("恋爱键盘后端服务") + // 接口文档简介 + .description("这是基于Knife4j OpenApi3的恋爱键盘后端服务接口文档") + // 接口文档版本 + .version("1.0版本")); + } + } \ No newline at end of file diff --git a/src/main/java/com/yolo/keyborad/config/SaTokenConfigure.java b/src/main/java/com/yolo/keyborad/config/SaTokenConfigure.java index 82f2086..5157edf 100644 --- a/src/main/java/com/yolo/keyborad/config/SaTokenConfigure.java +++ b/src/main/java/com/yolo/keyborad/config/SaTokenConfigure.java @@ -33,7 +33,8 @@ public class SaTokenConfigure implements WebMvcConfigurer { "/swagger-ui/**", "/favicon.ico", // 你的其他放行路径,例如登录接口 - "/demo/test" + "/demo/test", + "/error" }; } @Bean diff --git a/src/main/java/com/yolo/keyborad/controller/DemoController.java b/src/main/java/com/yolo/keyborad/controller/DemoController.java index cdac54c..09e9e86 100644 --- a/src/main/java/com/yolo/keyborad/controller/DemoController.java +++ b/src/main/java/com/yolo/keyborad/controller/DemoController.java @@ -2,8 +2,7 @@ package com.yolo.keyborad.controller; import com.yolo.keyborad.common.BaseResponse; import com.yolo.keyborad.common.ResultUtils; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; @@ -20,11 +19,11 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/demo") @Slf4j @CrossOrigin -@Api(tags = "测试控制器") +@Tag(name = "测试控制器", description = "测试控制器") public class DemoController { @GetMapping("/test") - @ApiOperation("测试接口") + @Operation(summary = "测试接口", description = "测试接口") public BaseResponse testDemo(){ return ResultUtils.success("hello world"); }