From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 13 一月 2023 23:04:09 +0800 Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 36 ++++++++++++++---------------------- 1 files changed, 14 insertions(+), 22 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java index bb27c84..f833780 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java @@ -14,26 +14,22 @@ import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; import com.ruoyi.system.service.ISysOssConfigService; -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 org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.Arrays; /** - * 瀵硅薄瀛樺偍閰嶇疆Controller + * 瀵硅薄瀛樺偍閰嶇疆 * * @author Lion Li * @author 瀛よ垷鐑熼洦 * @date 2021-08-13 */ @Validated -@Tag(name ="瀵硅薄瀛樺偍閰嶇疆鎺у埗鍣�", description = "瀵硅薄瀛樺偍閰嶇疆绠$悊") @RequiredArgsConstructor @RestController @RequestMapping("/system/oss/config") @@ -44,7 +40,6 @@ /** * 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃 */ - @Operation(summary = "鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃") @SaCheckPermission("system:oss:list") @GetMapping("/list") public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { @@ -53,57 +48,54 @@ /** * 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅 + * + * @param ossConfigId OSS閰嶇疆ID */ - @Operation(summary = "鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅") @SaCheckPermission("system:oss:query") @GetMapping("/{ossConfigId}") - public R<SysOssConfigVo> getInfo(@Parameter(name = "OSS閰嶇疆ID") - @NotNull(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable("ossConfigId") Long ossConfigId) { + public R<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable Long ossConfigId) { return R.ok(iSysOssConfigService.queryById(ossConfigId)); } /** * 鏂板瀵硅薄瀛樺偍閰嶇疆 */ - @Operation(summary = "鏂板瀵硅薄瀛樺偍閰嶇疆") @SaCheckPermission("system:oss:add") @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0); + return toAjax(iSysOssConfigService.insertByBo(bo)); } /** * 淇敼瀵硅薄瀛樺偍閰嶇疆 */ - @Operation(summary = "淇敼瀵硅薄瀛樺偍閰嶇疆") @SaCheckPermission("system:oss:edit") @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) { - return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0); + return toAjax(iSysOssConfigService.updateByBo(bo)); } /** * 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆 + * + * @param ossConfigIds OSS閰嶇疆ID涓� */ - @Operation(summary = "鍒犻櫎瀵硅薄瀛樺偍閰嶇疆") @SaCheckPermission("system:oss:remove") @Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE) @DeleteMapping("/{ossConfigIds}") - public R<Void> remove(@Parameter(name = "OSS閰嶇疆ID涓�") - @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") - @PathVariable Long[] ossConfigIds) { - return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0); + public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖") + @PathVariable Long[] ossConfigIds) { + return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true)); } /** * 鐘舵�佷慨鏀� */ - @Operation(summary = "鐘舵�佷慨鏀�") @SaCheckPermission("system:oss:edit") @Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE) @PutMapping("/changeStatus") -- Gitblit v1.9.3