From f10f44158c8193756901fd99cfcddb784afdaf5f Mon Sep 17 00:00:00 2001 From: LM20230311 Date: Wed, 24 Sep 2025 19:01:33 +0800 Subject: [PATCH] =?UTF-8?q?upgrade:=20=E5=8D=87=E7=BA=A7knife4j=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA3=EF=BC=8C4.5.0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/handler/AllUrlHandler.java | 12 +++++++++- ruoyi-modules/ruoyi-chat/pom.xml | 4 ++-- .../controller/tripartite/FaceController.java | 8 +++---- .../controller/tripartite/LumaController.java | 6 ++--- .../tripartite/SubmitController.java | 22 +++++++++---------- .../controller/tripartite/SunoController.java | 10 ++++----- .../controller/tripartite/TaskController.java | 18 +++++++-------- .../org/ruoyi/chat/domain/DomainObject.java | 4 ++-- .../org/ruoyi/chat/domain/InsightFace.java | 9 ++++---- .../ruoyi/chat/domain/dto/BaseSubmitDTO.java | 6 ++--- .../chat/domain/dto/SubmitActionDTO.java | 4 ++-- .../ruoyi/chat/domain/dto/SubmitBlendDTO.java | 10 ++++----- .../chat/domain/dto/SubmitChangeDTO.java | 12 +++++----- .../chat/domain/dto/SubmitDescribeDTO.java | 7 +++--- .../chat/domain/dto/SubmitImagineDTO.java | 11 +++++----- .../ruoyi/chat/domain/dto/SubmitModalDTO.java | 4 ++-- .../chat/domain/dto/SubmitShortenDTO.java | 4 ++-- .../domain/dto/SubmitSimpleChangeDTO.java | 7 +++--- .../chat/domain/dto/TaskConditionDTO.java | 6 +++-- 19 files changed, 85 insertions(+), 79 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java index 0bf0d7dc..0180a4f9 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java @@ -35,7 +35,17 @@ public class AllUrlHandler implements InitializingBean { Pattern pattern = Pattern.compile("\\{(.*?)\\}"); Set handlerSet = handlerMethods.keySet().stream() - .flatMap(info -> info.getPatternsCondition().getPatterns().stream()) + .flatMap(info -> { + // Spring 5 (AntPath) 风格 + if (info.getPatternsCondition() != null && info.getPatternsCondition().getPatterns() != null) { + return info.getPatternsCondition().getPatterns().stream(); + } + // Spring 6 (PathPattern) 风格 + if (info.getPathPatternsCondition() != null && info.getPathPatternsCondition().getPatterns() != null) { + return info.getPathPatternsCondition().getPatterns().stream().map(p -> p.getPatternString()); + } + return java.util.stream.Stream.empty(); + }) .collect(Collectors.toSet()); // 获取注解上边的 path 替代 path variable 为 * diff --git a/ruoyi-modules/ruoyi-chat/pom.xml b/ruoyi-modules/ruoyi-chat/pom.xml index 2a14fb14..f59d5abe 100644 --- a/ruoyi-modules/ruoyi-chat/pom.xml +++ b/ruoyi-modules/ruoyi-chat/pom.xml @@ -19,7 +19,7 @@ 5.0.0-beta.9 1.1.2-beta0 2.0.0 - 4.1.0 + 4.5.0 1.21 4.5.14 17 @@ -72,7 +72,7 @@ com.github.xiaoymin - knife4j-openapi2-spring-boot-starter + knife4j-openapi3-spring-boot-starter ${knife4j.verison} diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/FaceController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/FaceController.java index 7cbc4b70..10101f3a 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/FaceController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/FaceController.java @@ -1,8 +1,8 @@ package org.ruoyi.chat.controller.tripartite; import cn.hutool.json.JSONUtil; -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.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * @author ageerle * @date 2025-05-03 */ -@Api(tags = "任务查询") +@Tag(name = "任务查询") @RestController @RequestMapping("/mj") @RequiredArgsConstructor @@ -32,7 +32,7 @@ public class FaceController { private final MjOkHttpUtil mjOkHttpUtil; - @ApiOperation(value = "换脸") + @Operation(summary = "换脸") @PostMapping("/insight-face/swap") public String insightFace(@RequestBody InsightFace insightFace) { // 扣除接口费用并且保存消息记录 diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/LumaController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/LumaController.java index 25a2e7c8..8a2e4d7d 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/LumaController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/LumaController.java @@ -1,7 +1,7 @@ package org.ruoyi.chat.controller.tripartite; import cn.hutool.json.JSONUtil; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; @@ -28,7 +28,7 @@ public class LumaController { private final IChatCostService chatCostService; - @ApiOperation(value = "文生视频") + @Operation(summary = "文生视频") @PostMapping("/generations/") public String generateVideo(@RequestBody GenerateLuma generateLuma) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("luma"); @@ -40,7 +40,7 @@ public class LumaController { return okHttpUtil.executeRequest(request); } - @ApiOperation(value = "文生视频任务查询") + @Operation(summary = "文生视频任务查询") @GetMapping("/generations/{taskId}") public String getGenerationTask(@PathVariable String taskId) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("luma"); diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SubmitController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SubmitController.java index 98ed00aa..c44a10d4 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SubmitController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SubmitController.java @@ -1,8 +1,8 @@ package org.ruoyi.chat.controller.tripartite; import cn.hutool.json.JSONUtil; -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.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; @@ -23,7 +23,7 @@ import java.util.Optional; * @author ageerle * @date 2025-05-03 */ -@Api(tags = "任务提交") +@Tag(name = "任务提交") @RestController @RequestMapping("/mj/submit") @RequiredArgsConstructor @@ -33,7 +33,7 @@ public class SubmitController { private final IChatCostService chatCostService; private final MjOkHttpUtil mjOkHttpUtil; - @ApiOperation(value = "绘图变化") + @Operation(summary = "绘图变化") @PostMapping("/change") public String change(@RequestBody SubmitChangeDTO changeDTO) { String jsonStr = JSONUtil.toJsonStr(changeDTO); @@ -42,7 +42,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "执行动作") + @Operation(summary = "执行动作") @PostMapping("/action") public String action(@RequestBody SubmitActionDTO changeDTO) { ActionType actionType = ActionType.fromCustomId(getAction(changeDTO.getCustomId())); @@ -69,7 +69,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "绘图变化-simple") + @Operation(summary = "绘图变化-simple") @PostMapping("/simple-change") public String simpleChange(@RequestBody SubmitSimpleChangeDTO simpleChangeDTO) { String jsonStr = JSONUtil.toJsonStr(simpleChangeDTO); @@ -78,7 +78,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "提交图生图、混图任务") + @Operation(summary = "提交图生图、混图任务") @PostMapping("/blend") public String blend(@RequestBody SubmitBlendDTO blendDTO) { chatCostService.taskDeduct("mj","blend", 0.0); @@ -88,7 +88,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "提交图生文任务") + @Operation(summary = "提交图生文任务") @PostMapping("/describe") public String describe(@RequestBody SubmitDescribeDTO describeDTO) { chatCostService.taskDeduct("mj","describe",0.0); @@ -98,7 +98,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "提交文生图任务") + @Operation(summary = "提交文生图任务") @PostMapping("/imagine") public String imagine(@RequestBody SubmitImagineDTO imagineDTO) { chatCostService.taskDeduct("mj",imagineDTO.getPrompt(), 0.0); @@ -108,7 +108,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "提交局部重绘任务") + @Operation(summary = "提交局部重绘任务") @PostMapping("/modal") public String modal(@RequestBody SubmitModalDTO submitModalDTO) { chatCostService.taskDeduct("mj","repaint ", 0.0); @@ -118,7 +118,7 @@ public class SubmitController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "提交提示词分析任务") + @Operation(summary = "提交提示词分析任务") @PostMapping("/shorten") public String shorten(@RequestBody SubmitShortenDTO submitShortenDTO) { chatCostService.taskDeduct("mj","shorten", 0.0); diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SunoController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SunoController.java index 05e179ef..9cad4f26 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SunoController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/SunoController.java @@ -1,7 +1,7 @@ package org.ruoyi.chat.controller.tripartite; import cn.hutool.json.JSONUtil; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; @@ -29,7 +29,7 @@ public class SunoController { private final OkHttpConfig okHttpConfig; private final IChatCostService chatCostService; - @ApiOperation(value = "文生歌曲") + @Operation(summary = "文生歌曲") @PostMapping("/generate") public String generate(@RequestBody GenerateSuno generateSuno) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("suno"); @@ -42,7 +42,7 @@ public class SunoController { return okHttpUtil.executeRequest(request); } - @ApiOperation(value = "生成歌词") + @Operation(summary = "生成歌词") @PostMapping("/generate/lyrics/") public String generate(@RequestBody GenerateLyric generateLyric) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("suno"); @@ -53,7 +53,7 @@ public class SunoController { } - @ApiOperation(value = "查询歌词任务") + @Operation(summary = "查询歌词任务") @GetMapping("/lyrics/{taskId}") public String lyrics(@PathVariable String taskId) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("suno"); @@ -63,7 +63,7 @@ public class SunoController { } - @ApiOperation(value = "查询歌曲任务") + @Operation(summary = "查询歌曲任务") @GetMapping("/feed/{taskId}") public String feed(@PathVariable String taskId) { OkHttpUtil okHttpUtil = okHttpConfig.getOkHttpUtil("suno"); diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/TaskController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/TaskController.java index 75954ad5..5d83bf5f 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/TaskController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/tripartite/TaskController.java @@ -1,9 +1,9 @@ package org.ruoyi.chat.controller.tripartite; import cn.hutool.json.JSONUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.Request; @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * @author ageerle * @date 2025-05-03 */ -@Api(tags = "任务查询") +@Tag(name = "任务查询") @RestController @RequestMapping("/mj/task") @RequiredArgsConstructor @@ -27,15 +27,15 @@ public class TaskController { private final MjOkHttpUtil mjOkHttpUtil; - @ApiOperation(value = "指定ID获取任务") + @Operation(summary = "指定ID获取任务") @GetMapping("/{id}/fetch") - public String fetch(@ApiParam(value = "任务ID") @PathVariable String id) { + public String fetch(@Parameter(description = "任务ID") @PathVariable String id) { String url = "mj/task/" + id + "/fetch"; Request request = mjOkHttpUtil.createGetRequest(url); return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "根据ID列表查询任务") + @Operation(summary = "根据ID列表查询任务") @PostMapping("/list-by-condition") public String listByIds(@RequestBody TaskConditionDTO conditionDTO) { String url = "mj/task/list-by-condition"; @@ -44,9 +44,9 @@ public class TaskController { return mjOkHttpUtil.executeRequest(request); } - @ApiOperation(value = "获取任务图片的seed") + @Operation(summary = "获取任务图片的seed") @GetMapping("/{id}/image-seed") - public String getSeed(@ApiParam(value = "任务ID") @PathVariable String id) { + public String getSeed(@Parameter(description = "任务ID") @PathVariable String id) { String url = "mj/task/" + id + "/image-seed"; Request request = mjOkHttpUtil.createGetRequest(url); return mjOkHttpUtil.executeRequest(request); diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/DomainObject.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/DomainObject.java index a1707b8f..f9ae62cd 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/DomainObject.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/DomainObject.java @@ -2,7 +2,7 @@ package org.ruoyi.chat.domain; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -14,7 +14,7 @@ import java.util.Map; public class DomainObject implements Serializable { @Getter @Setter - @ApiModelProperty("ID") + @Schema(description = "ID") protected String id; @Setter diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/InsightFace.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/InsightFace.java index db12502e..e5b6dd4a 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/InsightFace.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/InsightFace.java @@ -1,7 +1,6 @@ package org.ruoyi.chat.domain; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -10,13 +9,13 @@ import java.io.Serializable; * @author WangLe */ @Data -@ApiModel("Discord账号") +@Schema(name = "Discord账号") public class InsightFace implements Serializable { /**本人头像json*/ - @ApiModelProperty("本人头像json") + @Schema(description = "本人头像json") private String sourceBase64; /**明星头像json*/ - @ApiModelProperty("明星头像json") + @Schema(description = "明星头像json") private String targetBase64; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/BaseSubmitDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/BaseSubmitDTO.java index 0c2334f8..b18b9578 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/BaseSubmitDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/BaseSubmitDTO.java @@ -1,6 +1,6 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -8,9 +8,9 @@ import lombok.Setter; @Setter public abstract class BaseSubmitDTO { - @ApiModelProperty("自定义参数") + @Schema(description = "自定义参数") protected String state; - @ApiModelProperty("回调地址, 为空时使用全局notifyHook") + @Schema(description = "回调地址, 为空时使用全局notifyHook") protected String notifyHook; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitActionDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitActionDTO.java index 49da1da0..47a62c5d 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitActionDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitActionDTO.java @@ -1,11 +1,11 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @Data -@ApiModel("变化任务提交参数") +@Schema(name = "变化任务提交参数") public class SubmitActionDTO { private String customId; diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitBlendDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitBlendDTO.java index 3c3d8cc8..66253c34 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitBlendDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitBlendDTO.java @@ -1,7 +1,7 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.ruoyi.chat.enums.BlendDimensions; @@ -9,13 +9,13 @@ import org.ruoyi.chat.enums.BlendDimensions; import java.util.List; @Data -@ApiModel("Blend提交参数") +@Schema(name = "Blend提交参数") @EqualsAndHashCode(callSuper = true) public class SubmitBlendDTO extends BaseSubmitDTO { - @ApiModelProperty(value = "图片base64数组", required = true, example = "[\"data:image/png;base64,xxx1\", \"data:image/png;base64,xxx2\"]") + @ArraySchema(arraySchema = @Schema(description = "图片base64数组", requiredMode = Schema.RequiredMode.REQUIRED), schema = @Schema(example = "data:image/png;base64,xxx1")) private List base64Array; - @ApiModelProperty(value = "比例: PORTRAIT(2:3); SQUARE(1:1); LANDSCAPE(3:2)", example = "SQUARE") + @Schema(description = "比例: PORTRAIT(2:3); SQUARE(1:1); LANDSCAPE(3:2)", example = "SQUARE") private BlendDimensions dimensions = BlendDimensions.SQUARE; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitChangeDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitChangeDTO.java index 039e15f1..ce6e8019 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitChangeDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitChangeDTO.java @@ -1,25 +1,23 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.ruoyi.chat.enums.TaskAction; @Data -@ApiModel("变化任务提交参数") +@Schema(name = "变化任务提交参数") @EqualsAndHashCode(callSuper = true) public class SubmitChangeDTO extends BaseSubmitDTO { - @ApiModelProperty(value = "任务ID", required = true, example = "\"1320098173412546\"") + @Schema(description = "任务ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "\"1320098173412546\"") private String taskId; - @ApiModelProperty(value = "UPSCALE(放大); VARIATION(变换); REROLL(重新生成)", required = true, - allowableValues = "UPSCALE, VARIATION, REROLL", example = "UPSCALE") + @Schema(description = "UPSCALE(放大); VARIATION(变换); REROLL(重新生成)", requiredMode = Schema.RequiredMode.REQUIRED, allowableValues = {"UPSCALE", "VARIATION", "REROLL"}, example = "UPSCALE") private TaskAction action; - @ApiModelProperty(value = "序号(1~4), action为UPSCALE,VARIATION时必传", allowableValues = "range[1, 4]", example = "1") + @Schema(description = "序号(1~4), action为UPSCALE,VARIATION时必传", minimum = "1", maximum = "4", example = "1") private Integer index; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitDescribeDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitDescribeDTO.java index 3be051e3..3e7742f2 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitDescribeDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitDescribeDTO.java @@ -1,15 +1,14 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @Data -@ApiModel("Describe提交参数") +@Schema(name = "Describe提交参数") @EqualsAndHashCode(callSuper = true) public class SubmitDescribeDTO extends BaseSubmitDTO { - @ApiModelProperty(value = "图片base64", required = true, example = "data:image/png;base64,xxx") + @Schema(description = "图片base64", requiredMode = Schema.RequiredMode.REQUIRED, example = "data:image/png;base64,xxx") private String base64; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitImagineDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitImagineDTO.java index d65a0db1..33519c35 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitImagineDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitImagineDTO.java @@ -1,7 +1,6 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -9,17 +8,17 @@ import java.util.List; @Data -@ApiModel("Imagine提交参数") +@Schema(name = "Imagine提交参数") @EqualsAndHashCode(callSuper = true) public class SubmitImagineDTO extends BaseSubmitDTO { - @ApiModelProperty(value = "提示词", required = true, example = "Cat") + @Schema(description = "提示词", requiredMode = Schema.RequiredMode.REQUIRED, example = "Cat") private String prompt; - @ApiModelProperty(value = "垫图base64数组") + @Schema(description = "垫图base64数组") private List base64Array; - @ApiModelProperty(hidden = true) + @Schema(hidden = true) @Deprecated(since = "3.0", forRemoval = true) private String base64; diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitModalDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitModalDTO.java index 4a321e4c..731f17b6 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitModalDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitModalDTO.java @@ -1,13 +1,13 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -@ApiModel("局部重绘提交参数") +@Schema(name = "局部重绘提交参数") public class SubmitModalDTO extends BaseSubmitDTO{ private String maskBase64; diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitShortenDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitShortenDTO.java index f8f7ed37..fa6274b3 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitShortenDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitShortenDTO.java @@ -1,13 +1,13 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -@ApiModel("prompt分析提交参数") +@Schema(name = "prompt分析提交参数") public class SubmitShortenDTO extends BaseSubmitDTO{ private String botType; diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitSimpleChangeDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitSimpleChangeDTO.java index b4e09a08..db3297e6 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitSimpleChangeDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/SubmitSimpleChangeDTO.java @@ -1,17 +1,16 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @Data -@ApiModel("变化任务提交参数-simple") +@Schema(name = "变化任务提交参数-simple") @EqualsAndHashCode(callSuper = true) public class SubmitSimpleChangeDTO extends BaseSubmitDTO { - @ApiModelProperty(value = "变化描述: ID $action$index", required = true, example = "1320098173412546 U2") + @Schema(description = "变化描述: ID $action$index", requiredMode = Schema.RequiredMode.REQUIRED, example = "1320098173412546 U2") private String content; } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/TaskConditionDTO.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/TaskConditionDTO.java index 46864ce9..ac7bf4cb 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/TaskConditionDTO.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/domain/dto/TaskConditionDTO.java @@ -1,14 +1,16 @@ package org.ruoyi.chat.domain.dto; -import io.swagger.annotations.ApiModel; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; @Data -@ApiModel("任务查询参数") +@Schema(name = "任务查询参数") public class TaskConditionDTO { + @ArraySchema(arraySchema = @Schema(description = "任务ID列表"), schema = @Schema(example = "1320098173412546")) private List ids; }