From 2d87ebddd81ade58295b8b123c5c7cc4a91d1d1d Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Fri, 7 Jun 2024 17:16:03 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/file/controller/SysFileController.java | 5 +++-- .../main/java/com/muyu/gen/controller/GenController.java | 4 ++-- .../src/main/resources/vm/java/controller.java.vm | 2 +- .../java/com/muyu/job/controller/SysJobController.java | 2 +- .../java/com/muyu/job/controller/SysJobLogController.java | 4 ++-- .../com/muyu/system/controller/SysConfigController.java | 8 ++++---- .../com/muyu/system/controller/SysDeptController.java | 4 ++-- .../com/muyu/system/controller/SysDictDataController.java | 6 +++--- .../com/muyu/system/controller/SysDictTypeController.java | 4 ++-- .../muyu/system/controller/SysLogininforController.java | 2 +- .../com/muyu/system/controller/SysMenuController.java | 2 +- .../com/muyu/system/controller/SysNoticeController.java | 4 ++-- .../com/muyu/system/controller/SysOperlogController.java | 2 +- .../com/muyu/system/controller/SysPostController.java | 4 ++-- .../com/muyu/system/controller/SysRoleController.java | 4 ++-- .../com/muyu/system/controller/SysUserController.java | 2 +- .../muyu/system/controller/SysUserOnlineController.java | 2 +- 17 files changed, 31 insertions(+), 30 deletions(-) diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java index 5f5ce31..ed04d11 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -26,8 +27,8 @@ public class SysFileController { /** * 文件上传请求 */ - @PostMapping("upload") - public Result upload (MultipartFile file) { + @PostMapping("/upload") + public Result upload (@RequestPart(value = "file") MultipartFile file) { try { // 上传并返回访问地址 String url = sysFileService.uploadFile(file); diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 92a2117..1dfe039 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -52,7 +52,7 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:query") @GetMapping(value = "/{tableId}") - public Result getInfo (@PathVariable Long tableId) { + public Result getInfo (@PathVariable("tableId") Long tableId) { GenTable table = genTableService.selectGenTableById(tableId); List tables = genTableService.selectGenTableAll(); List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); @@ -120,7 +120,7 @@ public class GenController extends BaseController { @RequiresPermissions("tool:gen:remove") @Log(title = "代码生成", businessType = BusinessType.DELETE) @DeleteMapping("/{tableIds}") - public Result remove (@PathVariable Long[] tableIds) { + public Result remove (@PathVariable("tableIds") Long[] tableIds) { genTableService.deleteGenTableByIds(tableIds); return success(); } diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm index 8a487d0..1df5be0 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm @@ -109,7 +109,7 @@ public class ${ClassName}Controller extends BaseController @RequiresPermissions("${permissionPrefix}:remove") @Log(title = "${functionName}", businessType = BusinessType.DELETE) @DeleteMapping("/{${pkColumn.javaField}s}") - public Result remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) + public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) { return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); } diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java index d01c4b8..2d6d2c9 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java @@ -142,7 +142,7 @@ public class SysJobController extends BaseController { @RequiresPermissions("monitor:job:remove") @Log(title = "定时任务", businessType = BusinessType.DELETE) @DeleteMapping("/{jobIds}") - public Result remove (@PathVariable Long[] jobIds) throws SchedulerException, TaskException { + public Result remove (@PathVariable("jobIds") Long[] jobIds) throws SchedulerException, TaskException { jobService.deleteJobByIds(jobIds); return success(); } diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java index f26098b..f8b46e2 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java @@ -54,7 +54,7 @@ public class SysJobLogController extends BaseController { */ @RequiresPermissions("monitor:job:query") @GetMapping(value = "/{jobLogId}") - public Result getInfo (@PathVariable Long jobLogId) { + public Result getInfo (@PathVariable("jobLogId") Long jobLogId) { return success(jobLogService.selectJobLogById(jobLogId)); } @@ -64,7 +64,7 @@ public class SysJobLogController extends BaseController { @RequiresPermissions("monitor:job:remove") @Log(title = "定时任务调度日志", businessType = BusinessType.DELETE) @DeleteMapping("/{jobLogIds}") - public Result remove (@PathVariable Long[] jobLogIds) { + public Result remove (@PathVariable("jobLogIds") Long[] jobLogIds) { return toAjax(jobLogService.deleteJobLogByIds(jobLogIds)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 2e6e905..5d97890 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -26,7 +26,7 @@ import java.util.List; @RestController @RequestMapping("/config") public class SysConfigController extends BaseController { - + @Autowired private SysConfigService configService; @@ -54,7 +54,7 @@ public class SysConfigController extends BaseController { * 根据参数编号获取详细信息 */ @GetMapping(value = "/{configId}") - public Result getInfo (@PathVariable Long configId) { + public Result getInfo (@PathVariable("configId") Long configId) { return success(configService.getById(configId)); } @@ -62,7 +62,7 @@ public class SysConfigController extends BaseController { * 根据参数键名查询参数值 */ @GetMapping(value = "/configKey/{configKey}") - public Result getConfigKey (@PathVariable String configKey) { + public Result getConfigKey (@PathVariable("configKey") String configKey) { return success(configService.selectConfigByKey(configKey)); } @@ -100,7 +100,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public Result remove (@PathVariable Long[] configIds) { + public Result remove (@PathVariable("configIds") Long[] configIds) { configService.removeBatchByIds(Arrays.asList(configIds)); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index f1ed572..37e48fc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -55,7 +55,7 @@ public class SysDeptController extends BaseController { */ @RequiresPermissions("system:dept:query") @GetMapping(value = "/{deptId}") - public Result getInfo (@PathVariable Long deptId) { + public Result getInfo (@PathVariable("deptId") Long deptId) { deptService.checkDeptDataScope(deptId); return success(deptService.selectDeptById(deptId)); } @@ -100,7 +100,7 @@ public class SysDeptController extends BaseController { @RequiresPermissions("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public Result remove (@PathVariable Long deptId) { + public Result remove (@PathVariable("deptId") Long deptId) { if (deptService.hasChildByDeptId(deptId)) { return warn("存在下级部门,不允许删除"); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 40f77c7..f9862d9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -56,7 +56,7 @@ public class SysDictDataController extends BaseController { */ @RequiresPermissions("system:dict:query") @GetMapping(value = "/{dictCode}") - public Result getInfo (@PathVariable Long dictCode) { + public Result getInfo (@PathVariable("dictCode") Long dictCode) { return success(dictDataService.selectDictDataById(dictCode)); } @@ -64,7 +64,7 @@ public class SysDictDataController extends BaseController { * 根据字典类型查询字典数据信息 */ @GetMapping(value = "/type/{dictType}") - public Result dictType (@PathVariable String dictType) { + public Result dictType (@PathVariable("dictType") String dictType) { List data = dictTypeService.selectDictDataByType(dictType); if (StringUtils.isNull(data)) { data = new ArrayList(); @@ -100,7 +100,7 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public Result remove (@PathVariable Long[] dictCodes) { + public Result remove (@PathVariable("dictCode") Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index 24038ef..c4a7b9f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -50,7 +50,7 @@ public class SysDictTypeController extends BaseController { */ @RequiresPermissions("system:dict:query") @GetMapping(value = "/{dictId}") - public Result getInfo (@PathVariable Long dictId) { + public Result getInfo (@PathVariable("dictId") Long dictId) { return success(dictTypeService.selectDictTypeById(dictId)); } @@ -88,7 +88,7 @@ public class SysDictTypeController extends BaseController { @RequiresPermissions("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictIds}") - public Result remove (@PathVariable Long[] dictIds) { + public Result remove (@PathVariable("dictIds") Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index 8de2fbc..c1e92b7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -52,7 +52,7 @@ public class SysLogininforController extends BaseController { @RequiresPermissions("system:logininfor:remove") @Log(title = "登录日志", businessType = BusinessType.DELETE) @DeleteMapping("/{infoIds}") - public Result remove (@PathVariable Long[] infoIds) { + public Result remove (@PathVariable("infoIds") Long[] infoIds) { return toAjax(logininforService.deleteLogininforByIds(infoIds)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index c22f798..e5ae348 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -44,7 +44,7 @@ public class SysMenuController extends BaseController { */ @RequiresPermissions("system:menu:query") @GetMapping(value = "/{menuId}") - public Result getInfo (@PathVariable Long menuId) { + public Result getInfo (@PathVariable("menuId") Long menuId) { return success(menuService.selectMenuById(menuId)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index 9706350..e6b9ede 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -42,7 +42,7 @@ public class SysNoticeController extends BaseController { */ @RequiresPermissions("system:notice:query") @GetMapping(value = "/{noticeId}") - public Result getInfo (@PathVariable Long noticeId) { + public Result getInfo (@PathVariable("noticeId") Long noticeId) { return success(noticeService.selectNoticeById(noticeId)); } @@ -74,7 +74,7 @@ public class SysNoticeController extends BaseController { @RequiresPermissions("system:notice:remove") @Log(title = "通知公告", businessType = BusinessType.DELETE) @DeleteMapping("/{noticeIds}") - public Result remove (@PathVariable Long[] noticeIds) { + public Result remove (@PathVariable("noticeIds") Long[] noticeIds) { return toAjax(noticeService.deleteNoticeByIds(noticeIds)); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index 35b1506..bb00d1d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -47,7 +47,7 @@ public class SysOperlogController extends BaseController { @Log(title = "操作日志", businessType = BusinessType.DELETE) @RequiresPermissions("system:operlog:remove") @DeleteMapping("/{operIds}") - public Result remove (@PathVariable Long[] operIds) { + public Result remove (@PathVariable("operIds") Long[] operIds) { return toAjax(operLogService.deleteOperLogByIds(operIds)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 230ee8d..79f3f47 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -53,7 +53,7 @@ public class SysPostController extends BaseController { */ @RequiresPermissions("system:post:query") @GetMapping(value = "/{postId}") - public Result getInfo (@PathVariable Long postId) { + public Result getInfo (@PathVariable("postId") Long postId) { return success(postService.selectPostById(postId)); } @@ -95,7 +95,7 @@ public class SysPostController extends BaseController { @RequiresPermissions("system:post:remove") @Log(title = "岗位管理", businessType = BusinessType.DELETE) @DeleteMapping("/{postIds}") - public Result remove (@PathVariable Long[] postIds) { + public Result remove (@PathVariable("postIds") Long[] postIds) { return toAjax(postService.deletePostByIds(postIds)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index b96268c..f8b05ad 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -62,7 +62,7 @@ public class SysRoleController extends BaseController { */ @RequiresPermissions("system:role:query") @GetMapping(value = "/{roleId}") - public Result getInfo (@PathVariable Long roleId) { + public Result getInfo (@PathVariable("roleId") Long roleId) { roleService.checkRoleDataScope(roleId); return success(roleService.selectRoleById(roleId)); } @@ -133,7 +133,7 @@ public class SysRoleController extends BaseController { @RequiresPermissions("system:role:remove") @Log(title = "角色管理", businessType = BusinessType.DELETE) @DeleteMapping("/{roleIds}") - public Result remove (@PathVariable Long[] roleIds) { + public Result remove (@PathVariable("roleIds") Long[] roleIds) { return toAjax(roleService.deleteRoleByIds(roleIds)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 5417a01..bc0b5fe 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -220,7 +220,7 @@ public class SysUserController extends BaseController { @RequiresPermissions("system:user:remove") @Log(title = "用户管理", businessType = BusinessType.DELETE) @DeleteMapping("/{userIds}") - public Result remove (@PathVariable Long[] userIds) { + public Result remove (@PathVariable("userIds") Long[] userIds) { if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) { return error("当前用户不能删除"); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 26f7883..5b78721 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -62,7 +62,7 @@ public class SysUserOnlineController extends BaseController { @RequiresPermissions("monitor:online:forceLogout") @Log(title = "在线用户", businessType = BusinessType.FORCE) @DeleteMapping("/{tokenId}") - public Result forceLogout (@PathVariable String tokenId) { + public Result forceLogout (@PathVariable("tokenId") String tokenId) { redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId); return success(); }