From 8f04b9e5b81cf9fbc7a90ff1bfdbb8a59037aca4 Mon Sep 17 00:00:00 2001 From: Dftre <3066417822@qq.com> Date: Thu, 30 May 2024 03:58:07 +0800 Subject: [PATCH] rename --- pom.xml | 2 +- .../ruoyi/web/core/config/SwaggerConfig.java | 85 ++++++++++++------- .../pay/sqb/controller/SQBController.java | 2 - 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 0c35382..297e43b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ ruoyi http://www.ruoyi.vip - 若依管理系统 + 若依Geek管理系统 3.8.7.3.4 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 0fa5075..f4fce2a 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 @@ -4,10 +4,18 @@ import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.ruoyi.common.constant.HttpStatus; +import com.ruoyi.common.core.domain.AjaxResult; + +import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.media.IntegerSchema; +import io.swagger.v3.oas.models.media.ObjectSchema; +import io.swagger.v3.oas.models.media.Schema; +import io.swagger.v3.oas.models.media.StringSchema; /** * 验证码操作处理 @@ -17,40 +25,53 @@ import io.swagger.v3.oas.models.info.License; @Configuration public class SwaggerConfig { - @Bean - public OpenAPI springShopOpenAPI() { - return new OpenAPI() - .info(new Info().title("RuoYi Geek") - .description("RuoYi Geek API文档") - .version("v1") - .license(new License().name("Apache 2.0").url("http://springdoc.org"))) - .externalDocs(new ExternalDocumentation() - .description("外部文档") - .url("/doc.html")); - } + @Bean + public OpenAPI springShopOpenAPI() { + Schema codeSchema = new IntegerSchema().example(HttpStatus.SUCCESS); // 示例状态码 + Schema msgSchema = new StringSchema().example("操作成功"); // 示例消息 + ObjectSchema dataSchema = new ObjectSchema(); // 数据可以是任意类型,这里简单定义为ObjectSchema - @Bean - public GroupedOpenApi sysApi() { - return GroupedOpenApi.builder() - .group("sys系统模块") - .packagesToScan("com.ruoyi.web.controller.system") - .build(); - } + // 定义AjaxResult的Schema + ObjectSchema ajaxResultSchema = new ObjectSchema(); + ajaxResultSchema.addProperty(AjaxResult.CODE_TAG, codeSchema); + ajaxResultSchema.addProperty(AjaxResult.MSG_TAG, msgSchema); + ajaxResultSchema.addProperty(AjaxResult.DATA_TAG, dataSchema); + Components components = new Components(); + components.addSchemas("AjaxResult", ajaxResultSchema); - @Bean - public GroupedOpenApi commonApi() { - return GroupedOpenApi.builder() - .group("基础模块") - .packagesToScan("com.ruoyi.web.controller.common") - .build(); - } + return new OpenAPI() + .components(components) + .info(new Info().title("RuoYi Geek") + .description("RuoYi Geek API文档") + .version("v1") + .license(new License().name("Apache 2.0").url("http://springdoc.org"))) + .externalDocs(new ExternalDocumentation() + .description("外部文档") + .url("/doc.html")); + } - @Bean - public GroupedOpenApi payApi() { - return GroupedOpenApi.builder() - .group("支付模块") - .pathsToMatch("/pay/**") - .build(); - } + @Bean + public GroupedOpenApi sysApi() { + return GroupedOpenApi.builder() + .group("sys系统模块") + .packagesToScan("com.ruoyi.web.controller.system") + .build(); + } + + @Bean + public GroupedOpenApi commonApi() { + return GroupedOpenApi.builder() + .group("基础模块") + .packagesToScan("com.ruoyi.web.controller.common") + .build(); + } + + @Bean + public GroupedOpenApi payApi() { + return GroupedOpenApi.builder() + .group("支付模块") + .pathsToMatch("/pay/**") + .build(); + } } diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java index 47a6221..cda15e3 100644 --- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/controller/SQBController.java @@ -47,14 +47,12 @@ public class SQBController extends BaseController { @Parameter(name = "orderNumber", description = "订单号", required = true) }) @PostMapping("/query") - @Anonymous public AjaxResult query(@RequestParam("orderNumber") String orderNumber) throws Exception { PayOrder payOrder = payOrderServicer.selectPayOrderByOrderNumber(orderNumber); return success(sqbServiceImpl.query(payOrder)); } @PostMapping("/refund") - @Anonymous public AjaxResult refund(@RequestBody PayOrder payOrder) { String refund = sqbServiceImpl.refund(payOrder); if (refund == null) {