From 5350029f7efb4989785825b95c33483475be38c0 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Wed, 25 Jun 2025 20:25:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构了多个控制器的查询接口，统一命名规范
- 新增参数校验，提高接口健壮性
- 更新了前端 API调用，以适应后端接口变更
- 优化了部分前端组件的错误提示文案
---
 cutejava-front/src/api/system/dict.js          |  7 -------
 cutejava-front/src/api/system/dictDetail.js    |  2 +-
 cutejava-front/src/api/system/email.js         |  4 ++--
 cutejava-front/src/api/system/job.js           |  4 ++--
 cutejava-front/src/api/system/menu.js          |  6 +++---
 cutejava-front/src/api/system/qiniu.js         |  4 ++--
 cutejava-front/src/api/system/quartzJob.js     |  4 ++--
 .../src/views/system/email/config.vue          |  4 ++--
 cutejava-front/src/views/system/menu/index.vue |  6 +++---
 .../src/views/system/storage/local/index.vue   |  2 +-
 cutejava-front/src/views/system/user/index.vue |  4 ++--
 .../controller/SystemCaptchaController.java    | 13 ++++++-------
 .../controller/SystemDictDetailController.java |  6 ++++++
 .../core/controller/SystemEmailController.java |  4 ++--
 .../core/controller/SystemJobController.java   |  9 ++++++++-
 .../core/controller/SystemMenuController.java  |  7 +++++++
 .../core/controller/SystemQiniuController.java |  4 ++--
 .../controller/SystemQuartzJobController.java  |  2 +-
 .../dal/model/SystemCheckEmailCaptchaArgs.java | 18 ++++++++++++++++++
 19 files changed, 70 insertions(+), 40 deletions(-)
 create mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java

diff --git a/cutejava-front/src/api/system/dict.js b/cutejava-front/src/api/system/dict.js
index 74eb7b5b..1d6ff114 100644
--- a/cutejava-front/src/api/system/dict.js
+++ b/cutejava-front/src/api/system/dict.js
@@ -1,12 +1,5 @@
 import request from '@/utils/request'
 
-// export function getDicts() {
-//   return request({
-//     url: 'api/dict/queryAllDict',
-//     method: 'post'
-//   })
-// }
-
 export function add(data) {
   return request({
     url: 'api/dict/saveDict',
diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js
index 4f1c8bbc..cf7aede8 100644
--- a/cutejava-front/src/api/system/dictDetail.js
+++ b/cutejava-front/src/api/system/dictDetail.js
@@ -9,7 +9,7 @@ export function get(dictName) {
     }
   }
   return request({
-    url: 'api/dictDetail',
+    url: 'api/dictDetail/queryDictDetailByArgs',
     method: 'post',
     data: params
   })
diff --git a/cutejava-front/src/api/system/email.js b/cutejava-front/src/api/system/email.js
index bb1a692c..fa84a0f7 100644
--- a/cutejava-front/src/api/system/email.js
+++ b/cutejava-front/src/api/system/email.js
@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function queryEmailConfig() {
+export function getLastEmailConfig() {
   return request({
-    url: 'api/email/queryEmailConfig',
+    url: 'api/email/getLastEmailConfig',
     method: 'post'
   })
 }
diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js
index afd5f97e..dc4ed860 100644
--- a/cutejava-front/src/api/system/job.js
+++ b/cutejava-front/src/api/system/job.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function getAllJob() {
+export function queryAllEnableJob() {
   const params = {
     page: 1,
     size: 999999,
@@ -9,7 +9,7 @@ export function getAllJob() {
     }
   }
   return request({
-    url: 'api/job',
+    url: 'api/job/queryAllEnableJob',
     method: 'post',
     data: params
   })
diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js
index 2ffe9279..edc0308c 100644
--- a/cutejava-front/src/api/system/menu.js
+++ b/cutejava-front/src/api/system/menu.js
@@ -7,9 +7,9 @@ export function queryMenuListByPid(pid) {
   })
 }
 
-export function getMenus(params) {
+export function queryMenuByArgs(params) {
   return request({
-    url: 'api/menus',
+    url: 'api/menus/queryMenuByArgs',
     method: 'post',
     data: params
   })
@@ -62,4 +62,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, queryMenuListByPid, queryMenuSuperior, getMenus, queryChildMenuSet }
+export default { add, edit, del, queryMenuListByPid, queryMenuSuperior, queryMenuByArgs, queryChildMenuSet }
diff --git a/cutejava-front/src/api/system/qiniu.js b/cutejava-front/src/api/system/qiniu.js
index 1b8fd2a7..2c4f6935 100644
--- a/cutejava-front/src/api/system/qiniu.js
+++ b/cutejava-front/src/api/system/qiniu.js
@@ -31,8 +31,8 @@ export function sync() {
 
 export function del(ids) {
   return request({
-    url: 'api/qiNiuContent',
-    method: 'delete',
+    url: 'api/qiNiuContent/removeFileByIds',
+    method: 'post',
     data: ids
   })
 }
diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js
index c8f6b9d0..41722e39 100644
--- a/cutejava-front/src/api/system/quartzJob.js
+++ b/cutejava-front/src/api/system/quartzJob.js
@@ -10,8 +10,8 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/quartzJob',
-    method: 'delete',
+    url: 'api/quartzJob/removeJobByIds',
+    method: 'post',
     data: ids
   })
 }
diff --git a/cutejava-front/src/views/system/email/config.vue b/cutejava-front/src/views/system/email/config.vue
index 1a7e598f..ea35444c 100644
--- a/cutejava-front/src/views/system/email/config.vue
+++ b/cutejava-front/src/views/system/email/config.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { queryEmailConfig, modifyEmailConfig } from '@/api/system/email'
+import { getLastEmailConfig, modifyEmailConfig } from '@/api/system/email'
 export default {
   name: 'Config',
   data() {
@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     init() {
-      queryEmailConfig().then(res => {
+      getLastEmailConfig().then(res => {
         this.form = res
       })
     },
diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue
index 34eabcc0..bffbc1ac 100644
--- a/cutejava-front/src/views/system/menu/index.vue
+++ b/cutejava-front/src/views/system/menu/index.vue
@@ -93,7 +93,7 @@
       ref="table"
       v-loading="crud.loading"
       lazy
-      :load="getMenus"
+      :load="queryMenuByArgs"
       :data="crud.data"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       row-key="id"
@@ -199,14 +199,14 @@ export default {
         this.menus.push({ id: 0, label: '顶级类目', children: null })
       }
     },
-    getMenus(tree, treeNode, resolve) {
+    queryMenuByArgs(tree, treeNode, resolve) {
       const params = {
         page: 1,
         size: 999999,
         args: { pid: tree.id }
       }
       setTimeout(() => {
-        crudMenu.getMenus(params).then(res => {
+        crudMenu.queryMenuByArgs(params).then(res => {
           resolve(res.content)
         })
       }, 100)
diff --git a/cutejava-front/src/views/system/storage/local/index.vue b/cutejava-front/src/views/system/storage/local/index.vue
index 3753ae6e..fd85e777 100644
--- a/cutejava-front/src/views/system/storage/local/index.vue
+++ b/cutejava-front/src/views/system/storage/local/index.vue
@@ -148,7 +148,7 @@ export default {
       isLt2M = file.size / 1024 / 1024 < 100
       if (!isLt2M) {
         this.loading = false
-        this.$message.error('上传文件大小不能超过 100MB!')
+        this.$message.error('上传文件大小不能超过 100MB')
       }
       this.form.name = file.name
       return isLt2M
diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue
index d93f2d0e..ceb68c77 100644
--- a/cutejava-front/src/views/system/user/index.vue
+++ b/cutejava-front/src/views/system/user/index.vue
@@ -185,7 +185,7 @@ import crudUser from '@/api/system/user'
 import { isvalidPhone } from '@/utils/validate'
 import { queryDeptList, queryDeptSuperiorTree } from '@/api/system/dept'
 import { queryRoleList, getLevel } from '@/api/system/role'
-import { getAllJob } from '@/api/system/job'
+import { queryAllEnableJob } from '@/api/system/job'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -450,7 +450,7 @@ export default {
     },
     // 获取弹窗内岗位数据
     getJobs() {
-      getAllJob().then(res => {
+      queryAllEnableJob().then(res => {
         this.jobs = res.content
       }).catch(() => { })
     },
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java
index 583acaa3..3abc774b 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemCaptchaController.java
@@ -1,16 +1,15 @@
 package cn.odboy.core.controller;
 
 import cn.odboy.core.constant.SystemCaptchaBizEnum;
+import cn.odboy.core.dal.model.SystemCheckEmailCaptchaArgs;
 import cn.odboy.core.service.SystemEmailService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequiredArgsConstructor
@@ -35,9 +34,9 @@ public class SystemCaptchaController {
 
     @ApiOperation("验证码验证")
     @PostMapping(value = "/checkEmailCaptcha")
-    public ResponseEntity<Void> checkEmailCaptcha(@RequestParam String email, @RequestParam String code, @RequestParam String codeBi) {
-        SystemCaptchaBizEnum biEnum = SystemCaptchaBizEnum.getByBizCode(codeBi);
-        systemEmailService.checkEmailCaptcha(biEnum, email, code);
+    public ResponseEntity<Void> checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
+        SystemCaptchaBizEnum biEnum = SystemCaptchaBizEnum.getByBizCode(args.getBizCode());
+        systemEmailService.checkEmailCaptcha(biEnum, args.getEmail(), args.getCode());
         return new ResponseEntity<>(HttpStatus.OK);
     }
 }
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java
index 156cf0e8..949fd547 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemDictDetailController.java
@@ -29,6 +29,12 @@ public class SystemDictDetailController {
 
     @ApiOperation("查询字典详情")
     @PostMapping
+    public ResponseEntity<CsResultVo<List<SystemDictDetailTb>>> queryDictDetailByCrud(@Validated @RequestBody CsPageArgs<QuerySystemDictDetailArgs> args) {
+        return queryDictDetailByArgs(args);
+    }
+
+    @ApiOperation("查询字典详情")
+    @PostMapping(value = "/queryDictDetailByArgs")
     public ResponseEntity<CsResultVo<List<SystemDictDetailTb>>> queryDictDetailByArgs(@Validated @RequestBody CsPageArgs<QuerySystemDictDetailArgs> args) {
         QuerySystemDictDetailArgs criteria = args.getArgs();
         Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java
index 96472479..39819643 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemEmailController.java
@@ -25,8 +25,8 @@ public class SystemEmailController {
     private final SystemEmailService systemEmailService;
 
     @ApiOperation("查询配置")
-    @PostMapping(value = "/queryEmailConfig")
-    public ResponseEntity<SystemEmailConfigTb> queryEmailConfig() {
+    @PostMapping(value = "/getLastEmailConfig")
+    public ResponseEntity<SystemEmailConfigTb> getLastEmailConfig() {
         return new ResponseEntity<>(systemEmailService.getLastEmailConfig(), HttpStatus.OK);
     }
 
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java
index a88aaef3..34ce2bde 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemJobController.java
@@ -37,7 +37,7 @@ public class SystemJobController {
     }
 
     @ApiOperation("查询岗位")
-    @PostMapping
+    @PostMapping(value = "/queryAllEnableJob")
     @PreAuthorize("@el.check('job:list','user:list')")
     public ResponseEntity<CsResultVo<List<SystemJobTb>>> queryJobByArgs(@Validated @RequestBody CsPageArgs<QuerySystemJobArgs> args) {
         QuerySystemJobArgs criteria = args.getArgs();
@@ -45,6 +45,13 @@ public class SystemJobController {
         return new ResponseEntity<>(systemJobService.queryJobByArgs(criteria, page), HttpStatus.OK);
     }
 
+    @ApiOperation("查询岗位")
+    @PostMapping
+    @PreAuthorize("@el.check('job:list','user:list')")
+    public ResponseEntity<CsResultVo<List<SystemJobTb>>> queryJobByCrud(@Validated @RequestBody CsPageArgs<QuerySystemJobArgs> args) {
+        return queryJobByArgs(args);
+    }
+
     @ApiOperation("新增岗位")
     @PostMapping(value = "/saveJob")
     @PreAuthorize("@el.check('job:add')")
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java
index aab95ded..b17935f9 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemMenuController.java
@@ -68,6 +68,13 @@ public class SystemMenuController {
     @PostMapping
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
+    public ResponseEntity<CsResultVo<List<SystemMenuTb>>> queryAllMenuByCrud(@Validated @RequestBody CsPageArgs<QuerySystemMenuArgs> args) throws Exception {
+        return queryAllMenu(args);
+    }
+
+    @PostMapping(value = "/queryMenuByArgs")
+    @ApiOperation("查询菜单")
+    @PreAuthorize("@el.check('menu:list')")
     public ResponseEntity<CsResultVo<List<SystemMenuTb>>> queryAllMenu(@Validated @RequestBody CsPageArgs<QuerySystemMenuArgs> args) throws Exception {
         QuerySystemMenuArgs criteria = args.getArgs();
         List<SystemMenuTb> menuList = systemMenuService.queryAllMenu(criteria, true);
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java
index 03b2e59a..1c0d2711 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQiniuController.java
@@ -98,8 +98,8 @@ public class SystemQiniuController {
     }
 
     @ApiOperation("删除多张图片")
-    @DeleteMapping
-    public ResponseEntity<Void> deleteAllQiNiu(@RequestBody Long[] ids) {
+    @PostMapping(value = "/removeFileByIds")
+    public ResponseEntity<Void> removeFileByIds(@RequestBody Long[] ids) {
         qiniuContentService.removeFileByIds(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java
index 86f7c64d..0a15694d 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/controller/SystemQuartzJobController.java
@@ -105,7 +105,7 @@ public class SystemQuartzJobController {
     }
 
     @ApiOperation("删除定时任务")
-    @DeleteMapping
+    @PostMapping(value = "/removeJobByIds")
     @PreAuthorize("@el.check('quartzJob:del')")
     public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
         systemQuartzJobService.removeJobByIds(ids);
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java
new file mode 100644
index 00000000..ada5cdb3
--- /dev/null
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/dal/model/SystemCheckEmailCaptchaArgs.java
@@ -0,0 +1,18 @@
+package cn.odboy.core.dal.model;
+
+import cn.odboy.base.CsSerializeObject;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class SystemCheckEmailCaptchaArgs extends CsSerializeObject {
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+    @NotBlank(message = "验证码不能为空")
+    private String code;
+    @NotBlank(message = "验证码业务标识不能为空")
+    private String bizCode;
+}