From aa77eaf1b6d7761020d18ca8458378da8a794824 Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:11:05 +0800 Subject: [PATCH 01/29] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0=20axios?= =?UTF-8?q?=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 axios 从 1.8.2 版本更新到 1.12.0 版本 - 修复潜在的安全漏洞和 bug - 提升 HTTP 请求处理的稳定性 --- cutejava-front/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cutejava-front/package.json b/cutejava-front/package.json index 706b3bee..aa56c3cc 100644 --- a/cutejava-front/package.json +++ b/cutejava-front/package.json @@ -38,7 +38,7 @@ "@riophae/vue-treeselect": "^0.4.0", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^1.0.2", - "axios": "1.8.2", + "axios": "1.12.0", "clipboard": "2.0.4", "codemirror": "^5.49.2", "core-js": "^2.6.12", From 4a4b3f169005b51b26bf68754451f9eaee2db2e8 Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:15:16 +0800 Subject: [PATCH 02/29] =?UTF-8?q?refactor(api):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=B3=BB=E7=BB=9FAPI=E6=A8=A1=E5=9D=97=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=92=8C=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-front/src/api/system/dept.js | 39 +++++++------- cutejava-front/src/api/system/dict.js | 4 +- cutejava-front/src/api/system/dictDetail.js | 4 +- cutejava-front/src/api/system/job.js | 33 ++++++------ cutejava-front/src/api/system/localStorage.js | 4 +- cutejava-front/src/api/system/menu.js | 51 ++++++++++--------- cutejava-front/src/api/system/ossStorage.js | 4 +- cutejava-front/src/api/system/quartzJob.js | 4 +- cutejava-front/src/api/system/role.js | 34 +++++++------ cutejava-front/src/api/system/user.js | 19 ++++--- 10 files changed, 109 insertions(+), 87 deletions(-) diff --git a/cutejava-front/src/api/system/dept.js b/cutejava-front/src/api/system/dept.js index 278ff12b..9cf64327 100644 --- a/cutejava-front/src/api/system/dept.js +++ b/cutejava-front/src/api/system/dept.js @@ -1,23 +1,8 @@ import request from '@/utils/request' -export function queryDeptList(params) { - return request({ - url: 'api/dept', - method: 'post', - data: params - }) -} - -export function queryDeptSuperiorTree(ids, exclude) { - exclude = exclude !== undefined ? exclude : false - const data = Array.isArray(ids) ? ids : [ids] - return request({ - url: 'api/dept/queryDeptSuperiorTree?exclude=' + exclude, - method: 'post', - data: data - }) -} - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/dept/saveDept', @@ -42,4 +27,22 @@ export function edit(data) { }) } +export function queryDeptList(params) { + return request({ + url: 'api/dept', + method: 'post', + data: params + }) +} + +export function queryDeptSuperiorTree(ids, exclude) { + exclude = exclude !== undefined ? exclude : false + const data = Array.isArray(ids) ? ids : [ids] + return request({ + url: 'api/dept/queryDeptSuperiorTree?exclude=' + exclude, + method: 'post', + data: data + }) +} + export default { add, edit, del, queryDeptList, queryDeptSuperiorTree } diff --git a/cutejava-front/src/api/system/dict.js b/cutejava-front/src/api/system/dict.js index 5dc359b0..899298f0 100644 --- a/cutejava-front/src/api/system/dict.js +++ b/cutejava-front/src/api/system/dict.js @@ -1,5 +1,7 @@ import request from '@/utils/request' - +/** + * 默认入口：add、del、edit、get + */ 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 6b77d5f7..11cb1c31 100644 --- a/cutejava-front/src/api/system/dictDetail.js +++ b/cutejava-front/src/api/system/dictDetail.js @@ -1,5 +1,7 @@ import request from '@/utils/request' - +/** + * 默认入口：add、del、edit、get + */ export function get(dictName) { const params = { page: 1, diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js index 4fc34241..557d9b3c 100644 --- a/cutejava-front/src/api/system/job.js +++ b/cutejava-front/src/api/system/job.js @@ -1,20 +1,7 @@ import request from '@/utils/request' - -export function queryAllEnableJob() { - const params = { - page: 1, - size: 9999999, - args: { - enabled: true - } - } - return request({ - url: 'api/job/queryAllEnableJob', - method: 'post', - data: params - }) -} - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/job/saveJob', @@ -38,5 +25,19 @@ export function edit(data) { data: data }) } +export function queryAllEnableJob() { + const params = { + page: 1, + size: 9999999, + args: { + enabled: true + } + } + return request({ + url: 'api/job/queryAllEnableJob', + method: 'post', + data: params + }) +} export default { add, edit, del } diff --git a/cutejava-front/src/api/system/localStorage.js b/cutejava-front/src/api/system/localStorage.js index e64c9440..f2f28257 100644 --- a/cutejava-front/src/api/system/localStorage.js +++ b/cutejava-front/src/api/system/localStorage.js @@ -1,5 +1,7 @@ import request from '@/utils/request' - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/localStorage/uploadFile', diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js index f7b5bdd3..70b7655e 100644 --- a/cutejava-front/src/api/system/menu.js +++ b/cutejava-front/src/api/system/menu.js @@ -1,5 +1,32 @@ import request from '@/utils/request' +/** + * 默认入口：add、del、edit、get + */ +export function add(data) { + return request({ + url: 'api/menu/saveMenu', + method: 'post', + data: data + }) +} + +export function del(ids) { + return request({ + url: 'api/menu/removeMenuByIds', + method: 'post', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/menu/modifyMenuById', + method: 'post', + data: data + }) +} + export function queryMenuListByPid(pid) { return request({ url: 'api/menu/queryMenuListByPid?pid=' + pid, @@ -38,28 +65,4 @@ export function buildMenus() { }) } -export function add(data) { - return request({ - url: 'api/menu/saveMenu', - method: 'post', - data: data - }) -} - -export function del(ids) { - return request({ - url: 'api/menu/removeMenuByIds', - method: 'post', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/menu/modifyMenuById', - method: 'post', - data: data - }) -} - export default { add, edit, del, queryMenuListByPid, queryMenuSuperior, queryMenuByArgs, queryChildMenuSet } diff --git a/cutejava-front/src/api/system/ossStorage.js b/cutejava-front/src/api/system/ossStorage.js index 9ebb1754..d50212f0 100644 --- a/cutejava-front/src/api/system/ossStorage.js +++ b/cutejava-front/src/api/system/ossStorage.js @@ -1,5 +1,7 @@ import request from '@/utils/request' - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/ossStorage/uploadFile', diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js index 073e62ef..1c03720b 100644 --- a/cutejava-front/src/api/system/quartzJob.js +++ b/cutejava-front/src/api/system/quartzJob.js @@ -1,5 +1,7 @@ import request from '@/utils/request' - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/quartzJob/createQuartzJob', diff --git a/cutejava-front/src/api/system/role.js b/cutejava-front/src/api/system/role.js index 6320c14b..69a13f7a 100644 --- a/cutejava-front/src/api/system/role.js +++ b/cutejava-front/src/api/system/role.js @@ -1,13 +1,7 @@ import request from '@/utils/request' - -// 获取所有的Role -export function queryRoleList() { - return request({ - url: 'api/role/queryRoleList', - method: 'post' - }) -} - +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/role/saveRole', @@ -24,13 +18,6 @@ export function get(id) { }) } -export function getLevel() { - return request({ - url: 'api/role/queryRoleLevel', - method: 'post' - }) -} - export function del(ids) { return request({ url: 'api/role/removeRoleByIds', @@ -47,6 +34,21 @@ export function edit(data) { }) } +// 获取所有的Role +export function queryRoleList() { + return request({ + url: 'api/role/queryRoleList', + method: 'post' + }) +} + +export function getLevel() { + return request({ + url: 'api/role/getCurrentUserRoleLevel', + method: 'post' + }) +} + export function editMenu(data) { return request({ url: 'api/role/modifyBindMenuById', diff --git a/cutejava-front/src/api/system/user.js b/cutejava-front/src/api/system/user.js index 3364d7df..edde6a08 100644 --- a/cutejava-front/src/api/system/user.js +++ b/cutejava-front/src/api/system/user.js @@ -1,6 +1,9 @@ import request from '@/utils/request' import { encrypt } from '@/utils/CsRsaUtil' +/** + * 默认入口：add、del、edit、get + */ export function add(data) { return request({ url: 'api/user/saveUser', @@ -17,14 +20,6 @@ export function del(ids) { }) } -export function resetPwd(ids) { - return request({ - url: 'api/user/resetUserPasswordByIds', - method: 'post', - data: ids - }) -} - export function edit(data) { return request({ url: 'api/user/modifyUserById', @@ -33,6 +28,14 @@ export function edit(data) { }) } +export function resetPwd(ids) { + return request({ + url: 'api/user/resetUserPasswordByIds', + method: 'post', + data: ids + }) +} + export function editUser(data) { return request({ url: 'api/user/modifyUserCenterInfoById', From 5248d75a6ed9bdd58ab3f6c82a82cc67a6a72001 Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:18:16 +0800 Subject: [PATCH 03/29] =?UTF-8?q?fix(upload):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E7=94=9F=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复了在MAC系统下上传路径中用户名前缺少斜杠的问题 - 确保上传路径格式的一致性 --- .../server/core/KitFileLocalUploadHelper.java | 2 +- .../openapi/SystemCaptchaOpenController.java | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java diff --git a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java index 720ffa44..d9b20580 100644 --- a/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java +++ b/cutejava/cutejava-framework/src/main/java/cn/odboy/framework/server/core/KitFileLocalUploadHelper.java @@ -53,7 +53,7 @@ public class KitFileLocalUploadHelper { if (StrUtil.isBlank(currentUserName)) { return PATH_MAC.replace("${appName}", appName).replace("${username}", ""); } - return PATH_MAC.replace("${appName}", appName).replace("${username}", currentUserName); + return PATH_MAC.replace("${appName}", appName).replace("${username}", "/" + currentUserName); } return PATH_LINUX.replace("${appName}", appName); } diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java new file mode 100644 index 00000000..16493fdb --- /dev/null +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java @@ -0,0 +1,42 @@ +/* + * Copyright 2021-2025 Odboy + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.odboy.system.openapi; + +import cn.odboy.annotation.AnonymousPostMapping; +import cn.odboy.system.service.SystemAuthService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/auth") +@Api(tags = "系统：验证码管理") +public class SystemCaptchaOpenController { + + @Autowired + private SystemAuthService systemAuthService; + + @ApiOperation("获取验证码") + @AnonymousPostMapping(value = "/captcha/getImage") + public ResponseEntity> getCode() { + Map imgResult = systemAuthService.getCaptchaInfo(); + return ResponseEntity.ok(imgResult); + } +} From 48e6e9298a901211ba1ddf1df4711d87bcb22aff Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:34:02 +0800 Subject: [PATCH 04/29] =?UTF-8?q?refactor(api):=20=E9=87=8D=E6=9E=84API?= =?UTF-8?q?=E7=AB=AF=E7=82=B9=E5=92=8C=E5=89=8D=E7=AB=AFCRUD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-front/src/api/system/dept.js | 2 +- cutejava-front/src/api/system/dictDetail.js | 2 +- cutejava-front/src/api/system/job.js | 2 +- cutejava-front/src/api/system/menu.js | 2 +- cutejava-front/src/api/system/quartzJob.js | 4 ++-- cutejava-front/src/components/Crud/crud.js | 6 ++++-- cutejava-front/src/views/system/dept/index.vue | 2 +- cutejava-front/src/views/system/dict/dictDetail.vue | 2 +- cutejava-front/src/views/system/dict/index.vue | 2 +- cutejava-front/src/views/system/job/index.vue | 1 + cutejava-front/src/views/system/menu/index.vue | 2 +- cutejava-front/src/views/system/online/index.vue | 2 +- cutejava-front/src/views/system/quartzJob/index.vue | 2 +- cutejava-front/src/views/system/quartzJob/log.vue | 2 +- cutejava-front/src/views/system/role/index.vue | 2 +- .../src/views/system/storage/local/index.vue | 2 +- .../src/views/system/storage/oss/index.vue | 2 +- cutejava-front/src/views/system/user/index.vue | 2 +- .../system/controller/SystemAuthController.java | 7 ------- .../system/controller/SystemDeptController.java | 2 +- .../system/controller/SystemDictController.java | 9 +++------ .../controller/SystemDictDetailController.java | 9 +-------- .../odboy/system/controller/SystemJobController.java | 12 ++---------- .../controller/SystemLocalStorageController.java | 2 +- .../system/controller/SystemMenuController.java | 10 +--------- .../system/controller/SystemOnlineController.java | 4 ++-- .../controller/SystemOssStorageController.java | 2 +- .../system/controller/SystemQuartzJobController.java | 6 +++--- .../system/controller/SystemRoleController.java | 8 ++++---- .../system/controller/SystemUserController.java | 2 +- .../system/dal/redis/SystemUserOnlineInfoDAO.java | 2 +- .../cn/odboy/system/service/SystemRoleService.java | 2 +- 32 files changed, 44 insertions(+), 74 deletions(-) diff --git a/cutejava-front/src/api/system/dept.js b/cutejava-front/src/api/system/dept.js index 9cf64327..b9752721 100644 --- a/cutejava-front/src/api/system/dept.js +++ b/cutejava-front/src/api/system/dept.js @@ -29,7 +29,7 @@ export function edit(data) { export function queryDeptList(params) { return request({ - url: 'api/dept', + url: 'api/dept/queryAllDeptByArgs', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js index 11cb1c31..3cb21158 100644 --- a/cutejava-front/src/api/system/dictDetail.js +++ b/cutejava-front/src/api/system/dictDetail.js @@ -11,7 +11,7 @@ export function get(dictName) { } } return request({ - url: 'api/dictDetail/queryDictDetailByArgs', + url: 'api/dictDetail/searchDictDetail', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js index 557d9b3c..befb6a42 100644 --- a/cutejava-front/src/api/system/job.js +++ b/cutejava-front/src/api/system/job.js @@ -34,7 +34,7 @@ export function queryAllEnableJob() { } } return request({ - url: 'api/job/queryAllEnableJob', + url: 'api/job/searchJob', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js index 70b7655e..f76421c0 100644 --- a/cutejava-front/src/api/system/menu.js +++ b/cutejava-front/src/api/system/menu.js @@ -36,7 +36,7 @@ export function queryMenuListByPid(pid) { export function queryMenuByArgs(params) { return request({ - url: 'api/menu/queryMenuByArgs', + url: 'api/menu/queryAllMenu', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js index 1c03720b..4b15259d 100644 --- a/cutejava-front/src/api/system/quartzJob.js +++ b/cutejava-front/src/api/system/quartzJob.js @@ -20,8 +20,8 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/quartzJob', - method: 'put', + url: 'api/quartzJob/updateQuartzJobResumeCron', + method: 'post', data: data }) } diff --git a/cutejava-front/src/components/Crud/crud.js b/cutejava-front/src/components/Crud/crud.js index 5350fd85..1c482dc6 100644 --- a/cutejava-front/src/components/Crud/crud.js +++ b/cutejava-front/src/components/Crud/crud.js @@ -17,8 +17,10 @@ function CRUD(options) { idField: 'id', // 标题 title: '', - // 请求数据的url + // 请求数据的url, @Controller注解的路径 url: '', + // 分页查询路由，@PostMapping注解的路径 + searchRouter: '', // 表格数据 data: [], // 选择项 @@ -134,7 +136,7 @@ function CRUD(options) { return new Promise((resolve, reject) => { crud.loading = true // 请求数据 - initData(crud.url, crud.getQueryParams()).then(data => { + initData(crud.url + crud.searchRouter, crud.getQueryParams()).then(data => { const table = crud.getTable() if (table && table.lazy) { // 懒加载子节点数据，清掉已加载的数据 table.store.states.treeData = {} diff --git a/cutejava-front/src/views/system/dept/index.vue b/cutejava-front/src/views/system/dept/index.vue index 5a29edb5..3ad7e9ee 100644 --- a/cutejava-front/src/views/system/dept/index.vue +++ b/cutejava-front/src/views/system/dept/index.vue @@ -140,7 +140,7 @@ export default { name: 'Dept', components: { Treeselect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }}) + return CRUD({ title: '部门', url: 'api/dept', searchRouter: '/queryAllDeptByArgs', crudMethod: { ...crudDept }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 设置数据字典 diff --git a/cutejava-front/src/views/system/dict/dictDetail.vue b/cutejava-front/src/views/system/dict/dictDetail.vue index c9681a12..1085cf28 100644 --- a/cutejava-front/src/views/system/dict/dictDetail.vue +++ b/cutejava-front/src/views/system/dict/dictDetail.vue @@ -84,7 +84,7 @@ export default { cruds() { return [ CRUD({ - title: '字典详情', url: 'api/dictDetail', query: { dictName: '' }, + title: '字典详情', url: 'api/dictDetail', searchRouter: '/searchDictDetail', query: { dictName: '' }, crudMethod: { ...crudDictDetail }, optShow: { add: true, diff --git a/cutejava-front/src/views/system/dict/index.vue b/cutejava-front/src/views/system/dict/index.vue index a1f5a129..7750f37b 100644 --- a/cutejava-front/src/views/system/dict/index.vue +++ b/cutejava-front/src/views/system/dict/index.vue @@ -114,7 +114,7 @@ export default { components: { crudOperation, pagination, rrOperation, udOperation, dictDetail }, cruds() { return [ - CRUD({ title: '字典', url: 'api/dict', crudMethod: { ...crudDict }}) + CRUD({ title: '字典', url: 'api/dict', searchRouter: '/searchDict', crudMethod: { ...crudDict }}) ] }, mixins: [presenter(), header(), form(defaultForm)], diff --git a/cutejava-front/src/views/system/job/index.vue b/cutejava-front/src/views/system/job/index.vue index 74fcc7ba..55be1980 100644 --- a/cutejava-front/src/views/system/job/index.vue +++ b/cutejava-front/src/views/system/job/index.vue @@ -70,6 +70,7 @@ export default { return CRUD({ title: '岗位', url: 'api/job', + searchRouter: '/searchJob', crudMethod: { ...crudJob } }) }, diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue index 75900be1..30e14192 100644 --- a/cutejava-front/src/views/system/menu/index.vue +++ b/cutejava-front/src/views/system/menu/index.vue @@ -239,7 +239,7 @@ export default { name: 'Menu', components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '菜单', url: 'api/menu', crudMethod: { ...crudMenu }}) + return CRUD({ title: '菜单', url: 'api/menu', searchRouter: '/queryAllMenu', crudMethod: { ...crudMenu }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/online/index.vue b/cutejava-front/src/views/system/online/index.vue index 16146dce..05db9e31 100644 --- a/cutejava-front/src/views/system/online/index.vue +++ b/cutejava-front/src/views/system/online/index.vue @@ -85,7 +85,7 @@ export default { name: 'OnlineUser', components: { pagination, crudOperation, rrOperation }, cruds() { - return CRUD({ url: 'api/user/online', title: '在线用户' }) + return CRUD({ url: 'api/user/online', searchRouter: '/searchOnlineUser', title: '在线用户' }) }, mixins: [presenter(), header(), crud()], data() { diff --git a/cutejava-front/src/views/system/quartzJob/index.vue b/cutejava-front/src/views/system/quartzJob/index.vue index 4726e6e8..5881f689 100644 --- a/cutejava-front/src/views/system/quartzJob/index.vue +++ b/cutejava-front/src/views/system/quartzJob/index.vue @@ -192,7 +192,7 @@ export default { name: 'QuartzJob', components: { Log, pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '定时任务', url: 'api/quartzJob', crudMethod: { ...crudJob }}) + return CRUD({ title: '定时任务', url: 'api/quartzJob', searchRouter: '/searchQuartzJob', crudMethod: { ...crudJob }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/quartzJob/log.vue b/cutejava-front/src/views/system/quartzJob/log.vue index 7a93d57a..e4f9c6c2 100644 --- a/cutejava-front/src/views/system/quartzJob/log.vue +++ b/cutejava-front/src/views/system/quartzJob/log.vue @@ -109,7 +109,7 @@ export default { }, // 获取数据前设置好接口地址 beforeInit() { - this.url = 'api/quartzJob/logs' + this.url = 'api/quartzJob/searchQuartzLog' this.size = 6 return true }, diff --git a/cutejava-front/src/views/system/role/index.vue b/cutejava-front/src/views/system/role/index.vue index 13fc7c0b..55de5eae 100644 --- a/cutejava-front/src/views/system/role/index.vue +++ b/cutejava-front/src/views/system/role/index.vue @@ -168,7 +168,7 @@ export default { name: 'Role', components: { Treeselect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, cruds() { - return CRUD({ title: '角色', url: 'api/role', crudMethod: { ...crudRoles }}) + return CRUD({ title: '角色', url: 'api/role', searchRouter: '/searchRole', crudMethod: { ...crudRoles }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/storage/local/index.vue b/cutejava-front/src/views/system/storage/local/index.vue index 71313729..720b87d4 100644 --- a/cutejava-front/src/views/system/storage/local/index.vue +++ b/cutejava-front/src/views/system/storage/local/index.vue @@ -136,7 +136,7 @@ const defaultForm = { id: null, name: '' } export default { components: { pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '文件', url: 'api/localStorage', crudMethod: { ...crudFile }}) + return CRUD({ title: '文件', url: 'api/localStorage', searchRouter: '/searchLocalStorage', crudMethod: { ...crudFile }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/storage/oss/index.vue b/cutejava-front/src/views/system/storage/oss/index.vue index 47a23524..f23aec87 100644 --- a/cutejava-front/src/views/system/storage/oss/index.vue +++ b/cutejava-front/src/views/system/storage/oss/index.vue @@ -107,7 +107,7 @@ const defaultForm = { id: null } export default { components: { pagination, crudOperation, rrOperation, DateRangePicker }, cruds() { - return CRUD({ title: '文件', url: 'api/ossStorage', crudMethod: { ...crudFile }}) + return CRUD({ title: '文件', url: 'api/ossStorage', searchRouter: '/searchOssStorage', crudMethod: { ...crudFile }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], data() { diff --git a/cutejava-front/src/views/system/user/index.vue b/cutejava-front/src/views/system/user/index.vue index 272bbd4a..615ba25e 100644 --- a/cutejava-front/src/views/system/user/index.vue +++ b/cutejava-front/src/views/system/user/index.vue @@ -228,7 +228,7 @@ export default { name: 'User', components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker }, cruds() { - return CRUD({ title: '用户', url: 'api/user', crudMethod: { ...crudUser }}) + return CRUD({ title: '用户', url: 'api/user', searchRouter: '/aggregationSearchUserByArgs', crudMethod: { ...crudUser }}) }, mixins: [presenter(), header(), form(defaultForm), crud()], // 数据字典 diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java index afb31f2a..bdd29478 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java @@ -59,13 +59,6 @@ public class SystemAuthController { return ResponseEntity.ok(userInfoVo); } - @ApiOperation("获取验证码") - @AnonymousPostMapping(value = "/captcha/getImage") - public ResponseEntity> getCode() { - Map imgResult = systemAuthService.getCaptchaInfo(); - return ResponseEntity.ok(imgResult); - } - @ApiOperation("退出登录") @AnonymousPostMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java index 580252f7..e233d481 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java @@ -54,7 +54,7 @@ public class SystemDeptController { } @ApiOperation("查询部门") - @PostMapping + @PostMapping(value = "/queryAllDeptByArgs") @PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity> queryDept( @Validated @RequestBody KitPageArgs pageArgs) throws Exception { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java index 9d184b96..2c4ff3e8 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java @@ -20,7 +20,6 @@ import cn.odboy.base.KitPageResult; import cn.odboy.system.dal.dataobject.SystemDictTb; import cn.odboy.system.dal.model.SystemCreateDictArgs; import cn.odboy.system.dal.model.SystemQueryDictArgs; -import cn.odboy.system.service.SystemDictDetailService; import cn.odboy.system.service.SystemDictService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; @@ -46,8 +45,6 @@ public class SystemDictController { @Autowired private SystemDictService systemDictService; - @Autowired - private SystemDictDetailService systemDictDetailService; @ApiOperation("导出字典数据") @GetMapping(value = "/download") @@ -56,15 +53,15 @@ public class SystemDictController { systemDictService.exportDictXlsx(response, args); } - @ApiOperation("查询字典") + @ApiOperation("查询所有字典") @PostMapping(value = "/queryAllDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryAllDict() { return ResponseEntity.ok(systemDictService.queryDictByArgs(new SystemQueryDictArgs())); } - @ApiOperation("查询字典") - @PostMapping + @ApiOperation("分页查询字典") + @PostMapping(value = "/searchDict") @PreAuthorize("@el.check('dict:list')") public ResponseEntity> queryDictByArgs( @Validated @RequestBody KitPageArgs pageArgs) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java index eea619d6..678e61dd 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java @@ -47,14 +47,7 @@ public class SystemDictDetailController { private SystemDictDetailService systemDictDetailService; @ApiOperation("查询字典详情") - @PostMapping - public ResponseEntity> queryDictDetailByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryDictDetailByArgs(args); - } - - @ApiOperation("查询字典详情") - @PostMapping(value = "/queryDictDetailByArgs") + @PostMapping(value = "/searchDictDetail") public ResponseEntity> queryDictDetailByArgs( @Validated @RequestBody KitPageArgs pageArgs) { Page page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java index 8995aae7..263fb15b 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java @@ -52,8 +52,8 @@ public class SystemJobController { systemJobService.exportJobXlsx(response, args); } - @ApiOperation("查询岗位") - @PostMapping(value = "/queryAllEnableJob") + @ApiOperation("分页查询岗位") + @PostMapping(value = "/searchJob") @PreAuthorize("@el.check('job:list','user:list')") public ResponseEntity> queryJobByArgs( @Validated @RequestBody KitPageArgs pageArgs) { @@ -61,14 +61,6 @@ public class SystemJobController { return ResponseEntity.ok(systemJobService.searchJobByArgs(pageArgs.getArgs(), page)); } - @ApiOperation("查询岗位") - @PostMapping - @PreAuthorize("@el.check('job:list','user:list')") - public ResponseEntity> queryJobByCrud( - @Validated @RequestBody KitPageArgs args) { - return queryJobByArgs(args); - } - @ApiOperation("新增岗位") @PostMapping(value = "/saveJob") @PreAuthorize("@el.check('job:add')") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java index 172a5d6e..72112558 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java @@ -46,7 +46,7 @@ public class SystemLocalStorageController { private SystemLocalStorageService localStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchLocalStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryLocalStorage( @Validated @RequestBody KitPageArgs pageArgs) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java index 1dea13cb..7dd61513 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java @@ -77,15 +77,7 @@ public class SystemMenuController { return ResponseEntity.ok(ids); } - @PostMapping - @ApiOperation("查询菜单") - @PreAuthorize("@el.check('menu:list')") - public ResponseEntity> queryAllMenuByCrud( - @Validated @RequestBody KitPageArgs args) throws Exception { - return queryAllMenu(args); - } - - @PostMapping(value = "/queryMenuByArgs") + @PostMapping(value = "/queryAllMenu") @ApiOperation("查询菜单") @PreAuthorize("@el.check('menu:list')") public ResponseEntity> queryAllMenu( diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java index 0421ac23..50509048 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOnlineController.java @@ -44,12 +44,12 @@ public class SystemOnlineController { private SystemUserOnlineInfoDAO systemUserOnlineInfoDAO; @ApiOperation("查询在线用户") - @PostMapping + @PostMapping(value = "/searchOnlineUser") @PreAuthorize("@el.check()") public ResponseEntity> queryOnlineUser( @Validated @RequestBody KitPageArgs pageArgs) { IPage page = new Page<>(pageArgs.getPage(), pageArgs.getSize()); - return ResponseEntity.ok(systemUserOnlineInfoDAO.queryUserOnlineModelPage(pageArgs.getArgs(), page)); + return ResponseEntity.ok(systemUserOnlineInfoDAO.searchOnlineUser(pageArgs.getArgs(), page)); } @ApiOperation("导出数据") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java index e08e4fb7..594f6d06 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java @@ -49,7 +49,7 @@ public class SystemOssStorageController { private SystemOssStorageService systemOssStorageService; @ApiOperation("查询文件") - @PostMapping + @PostMapping(value = "/searchOssStorage") @PreAuthorize("@el.check('storage:list')") public ResponseEntity> queryOssStorage( @Validated @RequestBody KitPageArgs pageArgs) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java index 31a1f1e2..ecfac555 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java @@ -50,7 +50,7 @@ public class SystemQuartzJobController { private SystemQuartzJobService systemQuartzJobService; @ApiOperation("查询定时任务") - @PostMapping + @PostMapping(value = "/searchQuartzJob") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobByCrud( @Validated @RequestBody KitPageArgs pageArgs) { @@ -73,7 +73,7 @@ public class SystemQuartzJobController { } @ApiOperation("查询任务执行日志") - @PostMapping(value = "/logs") + @PostMapping(value = "/searchQuartzLog") @PreAuthorize("@el.check('quartzJob:list')") public ResponseEntity> queryQuartzJobLog(SystemQueryQuartzJobArgs args) { Page page = new Page<>(args.getPage(), args.getSize()); @@ -89,7 +89,7 @@ public class SystemQuartzJobController { } @ApiOperation("修改定时任务") - @PutMapping + @PostMapping(value = "/updateQuartzJobResumeCron") @PreAuthorize("@el.check('quartzJob:edit')") public ResponseEntity updateQuartzJob( @Validated(SystemQuartzJobTb.Update.class) @RequestBody SystemUpdateQuartzJobArgs args) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java index cc74b34e..e714c57a 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java @@ -70,7 +70,7 @@ public class SystemRoleController { } @ApiOperation("查询角色") - @PostMapping + @PostMapping(value = "/searchRole") @PreAuthorize("@el.check('roles:list')") public ResponseEntity> queryRoleByArgs( @Validated @RequestBody KitPageArgs pageArgs) { @@ -79,9 +79,9 @@ public class SystemRoleController { } @ApiOperation("获取用户级别") - @PostMapping(value = "/queryRoleLevel") - public ResponseEntity queryRoleLevel() { - return ResponseEntity.ok(systemRoleService.getRoleLevel()); + @PostMapping(value = "/getCurrentUserRoleLevel") + public ResponseEntity getCurrentUserRoleLevel() { + return ResponseEntity.ok(systemRoleService.getCurrentUserRoleLevel()); } @ApiOperation("新增角色") diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java index 677b1d4c..09b4f8b0 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java @@ -60,7 +60,7 @@ public class SystemUserController { } @ApiOperation("查询用户") - @PostMapping + @PostMapping(value = "/aggregationSearchUserByArgs") @PreAuthorize("@el.check('user:list')") public ResponseEntity> queryUserByArgs(@Validated @RequestBody KitPageArgs pageArgs) { String currentUsername = KitSecurityHelper.getCurrentUsername(); diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java index 9a1749d9..fe3347f5 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/dal/redis/SystemUserOnlineInfoDAO.java @@ -121,7 +121,7 @@ public class SystemUserOnlineInfoDAO { * @param pageable / * @return / */ - public KitPageResult queryUserOnlineModelPage(SystemUserOnlineVo onlineVo, + public KitPageResult searchOnlineUser(SystemUserOnlineVo onlineVo, IPage pageable) { String username = null; if (onlineVo != null) { diff --git a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java index 83b1a73a..a4443b21 100644 --- a/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java +++ b/cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemRoleService.java @@ -255,7 +255,7 @@ public class SystemRoleService { return systemUserRoleService.convertToRoleVo(roleTb); } - public Dict getRoleLevel() { + public Dict getCurrentUserRoleLevel() { return Dict.create().set("level", checkRoleLevels(null)); } From 373a23159d91bb4124c3738d619edc474c10a858 Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 30 Dec 2025 21:45:14 +0800 Subject: [PATCH 05/29] =?UTF-8?q?refactor(api):=20=E7=BB=9F=E4=B8=80API?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-front/src/api/login.js | 4 +- cutejava-front/src/api/system/code.js | 12 +++--- cutejava-front/src/api/system/component.js | 8 ++-- cutejava-front/src/api/system/dept.js | 12 +++--- cutejava-front/src/api/system/dict.js | 4 +- cutejava-front/src/api/system/dictDetail.js | 4 +- cutejava-front/src/api/system/email.js | 4 +- cutejava-front/src/api/system/job.js | 4 +- cutejava-front/src/api/system/localStorage.js | 4 +- cutejava-front/src/api/system/menu.js | 10 ++--- cutejava-front/src/api/system/ossStorage.js | 2 +- cutejava-front/src/api/system/quartzJob.js | 2 +- cutejava-front/src/api/system/role.js | 10 ++--- cutejava-front/src/api/system/user.js | 10 ++--- cutejava-front/src/store/modules/api.js | 2 +- .../components/business/CuteDeptTree.vue | 4 +- .../business/CuteProductLineSelect.vue | 4 +- .../business/CuteProductLineSelectPro.vue | 4 +- .../src/views/system/dept/index.vue | 8 ++-- .../src/views/system/menu/index.vue | 2 +- .../src/views/system/role/index.vue | 6 +-- .../src/views/system/server/index.vue | 2 +- .../views/system/user/center/updateEmail.vue | 8 ++-- .../src/views/system/user/index.vue | 8 ++-- .../controller/SystemAuthController.java | 7 ---- .../controller/SystemCaptchaController.java | 12 +++--- .../controller/SystemComponentController.java | 12 +++--- .../controller/SystemDeptController.java | 14 +++---- .../controller/SystemDictController.java | 9 +++-- .../SystemDictDetailController.java | 8 ++-- .../controller/SystemEmailController.java | 8 ++-- .../controller/SystemJobController.java | 8 ++-- .../SystemLocalStorageController.java | 6 +-- .../controller/SystemMenuController.java | 18 ++++----- .../controller/SystemMonitorController.java | 4 +- .../SystemOssStorageController.java | 4 +- .../controller/SystemQuartzJobController.java | 4 +- .../controller/SystemRoleController.java | 20 +++++----- .../controller/SystemUserController.java | 39 ++++++++++++------- .../openapi/SystemCaptchaOpenController.java | 4 +- .../system/service/SystemDeptService.java | 6 +-- .../system/service/SystemUserService.java | 2 +- 42 files changed, 164 insertions(+), 159 deletions(-) diff --git a/cutejava-front/src/api/login.js b/cutejava-front/src/api/login.js index d8309e9e..3a612948 100644 --- a/cutejava-front/src/api/login.js +++ b/cutejava-front/src/api/login.js @@ -15,14 +15,14 @@ export function login(username, password, code, uuid) { export function getInfo() { return request({ - url: 'auth/info', + url: 'api/user/getCurrentUserInfo', method: 'post' }) } export function getCodeImg() { return request({ - url: 'auth/captcha/getImage', + url: 'captcha/getCode', method: 'post' }) } diff --git a/cutejava-front/src/api/system/code.js b/cutejava-front/src/api/system/code.js index d122c406..a5b5b3cd 100644 --- a/cutejava-front/src/api/system/code.js +++ b/cutejava-front/src/api/system/code.js @@ -1,27 +1,27 @@ import request from '@/utils/request' -export function sendResetEmailCaptcha(email) { +export function sendResetEmailCode(email) { return request({ - url: 'api/captcha/sendResetEmailCaptcha?email=' + email, + url: 'api/captcha/sendResetEmailCode?email=' + email, method: 'post' }) } -export function sendResetPasswordCaptcha(email) { +export function sendResetPasswordCode(email) { return request({ - url: 'api/captcha/sendResetPasswordCaptcha?email=' + email, + url: 'api/captcha/sendResetPasswordCode?email=' + email, method: 'post' }) } -export function checkEmailCaptcha(email, code, bizCode) { +export function verifyCode(email, code, bizCode) { const params = { email: email, code: code, bizCode: bizCode } return request({ - url: 'api/captcha/checkEmailCaptcha', + url: 'api/captcha/verifyCode', method: 'post', data: params }) diff --git a/cutejava-front/src/api/system/component.js b/cutejava-front/src/api/system/component.js index a17661f2..c48b7a91 100644 --- a/cutejava-front/src/api/system/component.js +++ b/cutejava-front/src/api/system/component.js @@ -1,15 +1,15 @@ import request from '@/utils/request' -export function queryDeptSelectDataSource() { +export function listDeptSelectDataSource() { return request({ - url: 'api/component/queryDeptSelectDataSource', + url: 'api/component/listDeptSelectDataSource', method: 'post' }) } -export function queryDeptSelectProDataSource() { +export function listDeptSelectProDataSource() { return request({ - url: 'api/component/queryDeptSelectProDataSource', + url: 'api/component/listDeptSelectProDataSource', method: 'post' }) } diff --git a/cutejava-front/src/api/system/dept.js b/cutejava-front/src/api/system/dept.js index b9752721..ad94a34e 100644 --- a/cutejava-front/src/api/system/dept.js +++ b/cutejava-front/src/api/system/dept.js @@ -13,7 +13,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dept/removeDeptByIds', + url: 'api/dept/deleteDeptByIds', method: 'post', data: ids }) @@ -21,15 +21,15 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/dept/modifyDept', + url: 'api/dept/updateDeptById', method: 'post', data: data }) } -export function queryDeptList(params) { +export function searchDept(params) { return request({ - url: 'api/dept/queryAllDeptByArgs', + url: 'api/dept/searchDept', method: 'post', data: params }) @@ -39,10 +39,10 @@ export function queryDeptSuperiorTree(ids, exclude) { exclude = exclude !== undefined ? exclude : false const data = Array.isArray(ids) ? ids : [ids] return request({ - url: 'api/dept/queryDeptSuperiorTree?exclude=' + exclude, + url: 'api/dept/searchDeptTree?exclude=' + exclude, method: 'post', data: data }) } -export default { add, edit, del, queryDeptList, queryDeptSuperiorTree } +export default { add, edit, del, searchDept, queryDeptSuperiorTree } diff --git a/cutejava-front/src/api/system/dict.js b/cutejava-front/src/api/system/dict.js index 899298f0..550bd183 100644 --- a/cutejava-front/src/api/system/dict.js +++ b/cutejava-front/src/api/system/dict.js @@ -12,7 +12,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dict/removeDictByIds', + url: 'api/dict/deleteDictByIds', method: 'post', data: ids }) @@ -20,7 +20,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/dict/modifyDictById', + url: 'api/dict/updateDictById', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/dictDetail.js b/cutejava-front/src/api/system/dictDetail.js index 3cb21158..de08ad19 100644 --- a/cutejava-front/src/api/system/dictDetail.js +++ b/cutejava-front/src/api/system/dictDetail.js @@ -27,7 +27,7 @@ export function add(data) { export function del(id) { return request({ - url: 'api/dictDetail/removeDictDetailById', + url: 'api/dictDetail/deleteDictDetailById', method: 'post', data: { id: id } }) @@ -35,7 +35,7 @@ export function del(id) { export function edit(data) { return request({ - url: 'api/dictDetail/modifyDictDetailById', + url: 'api/dictDetail/updateDictDetailById', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/email.js b/cutejava-front/src/api/system/email.js index fb193340..d91cde68 100644 --- a/cutejava-front/src/api/system/email.js +++ b/cutejava-front/src/api/system/email.js @@ -9,7 +9,7 @@ export function getLastEmailConfig() { export function modifyEmailConfig(data) { return request({ - url: 'api/email/modifyEmailConfig', + url: 'api/email/updateEmailConfigById', method: 'post', data: data }) @@ -17,7 +17,7 @@ export function modifyEmailConfig(data) { export function sendEmail(data) { return request({ - url: 'api/email/sendEmail', + url: 'api/email/send', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/job.js b/cutejava-front/src/api/system/job.js index befb6a42..8f63528c 100644 --- a/cutejava-front/src/api/system/job.js +++ b/cutejava-front/src/api/system/job.js @@ -12,7 +12,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/job/removeJobByIds', + url: 'api/job/deleteJobByIds', method: 'post', data: ids }) @@ -20,7 +20,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/job/modifyJobById', + url: 'api/job/updateJobById', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/localStorage.js b/cutejava-front/src/api/system/localStorage.js index f2f28257..0fe39f44 100644 --- a/cutejava-front/src/api/system/localStorage.js +++ b/cutejava-front/src/api/system/localStorage.js @@ -12,7 +12,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/localStorage/removeFileByIds', + url: 'api/localStorage/deleteFileByIds', method: 'post', data: ids }) @@ -20,7 +20,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/localStorage/modifyLocalStorageById', + url: 'api/localStorage/updateLocalStorageById', method: 'post', data: data }) diff --git a/cutejava-front/src/api/system/menu.js b/cutejava-front/src/api/system/menu.js index f76421c0..56b9cc09 100644 --- a/cutejava-front/src/api/system/menu.js +++ b/cutejava-front/src/api/system/menu.js @@ -13,7 +13,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/menu/removeMenuByIds', + url: 'api/menu/deleteMenuByIds', method: 'post', data: ids }) @@ -21,7 +21,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/menu/modifyMenuById', + url: 'api/menu/updateMenuById', method: 'post', data: data }) @@ -29,14 +29,14 @@ export function edit(data) { export function queryMenuListByPid(pid) { return request({ - url: 'api/menu/queryMenuListByPid?pid=' + pid, + url: 'api/menu/listMenuByPid?pid=' + pid, method: 'post' }) } export function queryMenuByArgs(params) { return request({ - url: 'api/menu/queryAllMenu', + url: 'api/menu/searchMenu', method: 'post', data: params }) @@ -53,7 +53,7 @@ export function queryMenuSuperior(ids) { export function queryChildMenuSet(id) { return request({ - url: 'api/menu/queryChildMenuSet?id=' + id, + url: 'api/menu/listChildMenuSetByMenuId?id=' + id, method: 'post' }) } diff --git a/cutejava-front/src/api/system/ossStorage.js b/cutejava-front/src/api/system/ossStorage.js index d50212f0..3fa3bd72 100644 --- a/cutejava-front/src/api/system/ossStorage.js +++ b/cutejava-front/src/api/system/ossStorage.js @@ -12,7 +12,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/ossStorage/removeFileByIds', + url: 'api/ossStorage/deleteFileByIds', method: 'post', data: ids }) diff --git a/cutejava-front/src/api/system/quartzJob.js b/cutejava-front/src/api/system/quartzJob.js index 4b15259d..62b3cafb 100644 --- a/cutejava-front/src/api/system/quartzJob.js +++ b/cutejava-front/src/api/system/quartzJob.js @@ -12,7 +12,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/quartzJob/removeJobByIds', + url: 'api/quartzJob/deleteJobByIds', method: 'post', data: ids }) diff --git a/cutejava-front/src/api/system/role.js b/cutejava-front/src/api/system/role.js index 69a13f7a..acbbce30 100644 --- a/cutejava-front/src/api/system/role.js +++ b/cutejava-front/src/api/system/role.js @@ -12,7 +12,7 @@ export function add(data) { export function get(id) { return request({ - url: 'api/role/queryRoleById', + url: 'api/role/getRoleById', method: 'post', data: { id: id } }) @@ -20,7 +20,7 @@ export function get(id) { export function del(ids) { return request({ - url: 'api/role/removeRoleByIds', + url: 'api/role/deleteRoleByIds', method: 'post', data: ids }) @@ -28,7 +28,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/role/modifyRoleById', + url: 'api/role/updateRoleById', method: 'post', data: data }) @@ -37,7 +37,7 @@ export function edit(data) { // 获取所有的Role export function queryRoleList() { return request({ - url: 'api/role/queryRoleList', + url: 'api/role/listAllRole', method: 'post' }) } @@ -51,7 +51,7 @@ export function getLevel() { export function editMenu(data) { return request({ - url: 'api/role/modifyBindMenuById', + url: 'api/role/updateBindMenuById', method: 'post', data }) diff --git a/cutejava-front/src/api/system/user.js b/cutejava-front/src/api/system/user.js index edde6a08..328f9e3c 100644 --- a/cutejava-front/src/api/system/user.js +++ b/cutejava-front/src/api/system/user.js @@ -14,7 +14,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/user/removeUserByIds', + url: 'api/user/deleteUserByIds', method: 'post', data: ids }) @@ -22,7 +22,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/user/modifyUserById', + url: 'api/user/updateUserById', method: 'post', data: data }) @@ -38,7 +38,7 @@ export function resetPwd(ids) { export function editUser(data) { return request({ - url: 'api/user/modifyUserCenterInfoById', + url: 'api/user/updateUserCenterInfoById', method: 'post', data: data }) @@ -50,7 +50,7 @@ export function updatePass(user) { newPass: encrypt(user.newPass) } return request({ - url: 'api/user/modifyUserPasswordByUsername', + url: 'api/user/updateUserPasswordByUsername', method: 'post', data: data }) @@ -62,7 +62,7 @@ export function updateEmail(form) { email: form.email } return request({ - url: 'api/user/modifyUserEmailByUsername/' + form.code, + url: 'api/user/updateUserEmailByUsername/' + form.code, method: 'post', data: data }) diff --git a/cutejava-front/src/store/modules/api.js b/cutejava-front/src/store/modules/api.js index c447056d..8e981d6a 100644 --- a/cutejava-front/src/store/modules/api.js +++ b/cutejava-front/src/store/modules/api.js @@ -5,7 +5,7 @@ const api = { // 图片上传 imagesUploadApi: baseUrl + '/api/localStorage/uploadPicture', // 修改头像 - updateAvatarApi: baseUrl + '/api/user/modifyUserAvatar', + updateAvatarApi: baseUrl + '/api/user/updateUserAvatar', // Sql 监控 druidSqlApi: baseUrl + '/druid/index.html', // websocket diff --git a/cutejava-front/src/views/components/business/CuteDeptTree.vue b/cutejava-front/src/views/components/business/CuteDeptTree.vue index 8486bc60..7cc461cb 100644 --- a/cutejava-front/src/views/components/business/CuteDeptTree.vue +++ b/cutejava-front/src/views/components/business/CuteDeptTree.vue @@ -30,7 +30,7 @@