From 5535dc98da6ec8b33faf99d4a6a35a12b711f8f5 Mon Sep 17 00:00:00 2001 From: Odboy Date: Thu, 10 Apr 2025 18:58:06 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BC=96=E7=A0=81=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cutejava-ui/src/api/data.js | 8 ++++ cutejava-ui/src/api/quartzjob/timing.js | 10 ++--- cutejava-ui/src/api/system/code.js | 4 +- cutejava-ui/src/api/system/dept.js | 14 +++---- cutejava-ui/src/api/system/dict.js | 18 ++++---- cutejava-ui/src/api/system/dictDetail.js | 35 ++++++++-------- cutejava-ui/src/api/system/job.js | 6 +-- cutejava-ui/src/api/system/menu.js | 20 ++++----- cutejava-ui/src/api/system/role.js | 19 +++++---- cutejava-ui/src/api/system/user.js | 16 +++---- cutejava-ui/src/api/tools/email.js | 8 ++-- cutejava-ui/src/api/tools/localStorage.js | 10 ++--- cutejava-ui/src/api/tools/qiniu.js | 15 ++++--- cutejava-ui/src/store/modules/api.js | 6 +-- .../components/business/CuteDeptTree.vue | 4 +- .../src/views/monitor/server/index.vue | 6 +-- cutejava-ui/src/views/system/dept/index.vue | 8 ++-- cutejava-ui/src/views/system/menu/index.vue | 2 +- cutejava-ui/src/views/system/role/index.vue | 14 +++---- cutejava-ui/src/views/system/timing/index.vue | 4 +- cutejava-ui/src/views/system/timing/log.vue | 8 ++-- cutejava-ui/src/views/system/user/index.vue | 12 +++--- cutejava-ui/src/views/tools/email/config.vue | 6 +-- .../src/views/tools/storage/qiniu/form.vue | 6 +-- .../src/views/tools/storage/qiniu/index.vue | 2 +- .../job/rest/QuartzJobController.java | 12 +++--- .../job/service/QuartzJobService.java | 2 +- .../service/impl/QuartzJobServiceImpl.java | 8 +++- .../application/core/rest/AuthController.java | 5 +++ .../core/service/UserCacheService.java | 2 +- .../service/impl/UserCacheServiceImpl.java | 2 +- .../service/impl/UserDetailsServiceImpl.java | 2 +- .../system/rest/CaptchaController.java | 8 ++-- .../system/rest/DeptController.java | 22 +++++----- .../system/rest/DictController.java | 16 +++---- .../system/rest/DictDetailController.java | 19 ++++----- .../system/rest/JobController.java | 16 +++---- .../system/rest/MenuController.java | 28 ++++++------- .../system/rest/MonitorController.java | 6 +-- .../system/rest/RoleController.java | 37 ++++++++-------- .../system/rest/UserController.java | 42 +++++++++---------- .../system/service/DeptService.java | 4 +- .../system/service/DictDetailService.java | 2 +- .../system/service/DictService.java | 4 +- .../system/service/JobService.java | 4 +- .../system/service/MenuService.java | 4 +- .../system/service/RoleService.java | 4 +- .../system/service/UserService.java | 4 +- .../system/service/impl/DeptServiceImpl.java | 4 +- .../service/impl/DictDetailServiceImpl.java | 2 +- .../system/service/impl/DictServiceImpl.java | 4 +- .../system/service/impl/JobServiceImpl.java | 4 +- .../system/service/impl/MenuServiceImpl.java | 4 +- .../system/service/impl/RoleServiceImpl.java | 4 +- .../system/service/impl/UserServiceImpl.java | 4 +- .../tools/rest/EmailController.java | 8 ++-- .../tools/rest/LocalStorageController.java | 18 ++++---- .../tools/rest/QiniuController.java | 16 +++---- .../tools/service/EmailService.java | 8 ---- .../tools/service/LocalStorageService.java | 2 +- .../tools/service/QiniuContentService.java | 4 +- .../tools/service/impl/EmailServiceImpl.java | 6 --- .../service/impl/LocalStorageServiceImpl.java | 2 +- .../service/impl/QiniuContentServiceImpl.java | 6 +-- 64 files changed, 305 insertions(+), 305 deletions(-) diff --git a/cutejava-ui/src/api/data.js b/cutejava-ui/src/api/data.js index d975d754..374bfeae 100644 --- a/cutejava-ui/src/api/data.js +++ b/cutejava-ui/src/api/data.js @@ -8,6 +8,14 @@ export function initData(url, params) { }) } +export function initDataByPost(url, params) { + return request({ + url: url, + method: 'post', + data: params + }) +} + export function download(url, params) { return request({ url: url + '?' + qs.stringify(params, { indices: false }), diff --git a/cutejava-ui/src/api/quartzjob/timing.js b/cutejava-ui/src/api/quartzjob/timing.js index 63138442..0a4c24c2 100644 --- a/cutejava-ui/src/api/quartzjob/timing.js +++ b/cutejava-ui/src/api/quartzjob/timing.js @@ -24,18 +24,18 @@ export function edit(data) { }) } -export function switchJobPauseStatus(id) { +export function switchQuartzJobStatus(id) { return request({ - url: 'api/jobs/switchJobPauseStatus/' + id, + url: 'api/jobs/switchQuartzJobStatus/' + id, method: 'post' }) } -export function executionQuartzJob(id) { +export function startQuartzJob(id) { return request({ - url: 'api/jobs/executionQuartzJob/' + id, + url: 'api/jobs/startQuartzJob/' + id, method: 'post' }) } -export default { add, edit, del, switchJobPauseStatus, executionQuartzJob } +export default { add, edit, del, switchQuartzJobStatus, startQuartzJob } diff --git a/cutejava-ui/src/api/system/code.js b/cutejava-ui/src/api/system/code.js index 0e88e01d..d13d8b6d 100644 --- a/cutejava-ui/src/api/system/code.js +++ b/cutejava-ui/src/api/system/code.js @@ -14,9 +14,9 @@ export function sendResetPasswordCaptcha(data) { }) } -export function validatedCaptcha(email, code, codeBi) { +export function checkCodeAvailable(email, code, codeBi) { return request({ - url: `api/code/validatedCaptcha?email=${email}&code=${code}&codeBi=${codeBi}`, + url: `api/code/checkCodeAvailable?email=${email}&code=${code}&codeBi=${codeBi}`, method: 'post' }) } diff --git a/cutejava-ui/src/api/system/dept.js b/cutejava-ui/src/api/system/dept.js index 4f441574..0373deed 100644 --- a/cutejava-ui/src/api/system/dept.js +++ b/cutejava-ui/src/api/system/dept.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -export function getDepts(params) { +export function describeDeptList(params) { return request({ url: 'api/dept', method: 'get', @@ -8,11 +8,11 @@ export function getDepts(params) { }) } -export function getDeptSuperior(ids, exclude) { +export function describeDeptSuperiorTree(ids, exclude) { exclude = exclude !== undefined ? exclude : false const data = Array.isArray(ids) ? ids : [ids] return request({ - url: 'api/dept/getDeptSuperior?exclude=' + exclude, + url: 'api/dept/describeDeptSuperiorTree?exclude=' + exclude, method: 'post', data }) @@ -20,7 +20,7 @@ export function getDeptSuperior(ids, exclude) { export function add(data) { return request({ - url: 'api/dept/createDept', + url: 'api/dept/saveDept', method: 'post', data }) @@ -28,7 +28,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dept/deleteDept', + url: 'api/dept/removeDeptByIds', method: 'post', data: ids }) @@ -36,10 +36,10 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/dept/updateDept', + url: 'api/dept/modifyDept', method: 'post', data }) } -export default { add, edit, del, getDepts, getDeptSuperior } +export default { add, edit, del, describeDeptList, describeDeptSuperiorTree } diff --git a/cutejava-ui/src/api/system/dict.js b/cutejava-ui/src/api/system/dict.js index d2d1a050..070cf1d4 100644 --- a/cutejava-ui/src/api/system/dict.js +++ b/cutejava-ui/src/api/system/dict.js @@ -1,15 +1,15 @@ import request from '@/utils/request' -export function getDicts() { - return request({ - url: 'api/dict/queryAllDict', - method: 'post' - }) -} +// export function getDicts() { +// return request({ +// url: 'api/dict/queryAllDict', +// method: 'post' +// }) +// } export function add(data) { return request({ - url: 'api/dict/createDict', + url: 'api/dict/saveDict', method: 'post', data }) @@ -17,7 +17,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dict/deleteDict', + url: 'api/dict/removeDictByIds', method: 'post', data: ids }) @@ -25,7 +25,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/dict/updateDict', + url: 'api/dict/modifyDictById', method: 'post', data }) diff --git a/cutejava-ui/src/api/system/dictDetail.js b/cutejava-ui/src/api/system/dictDetail.js index 0600850e..a6fee7f7 100644 --- a/cutejava-ui/src/api/system/dictDetail.js +++ b/cutejava-ui/src/api/system/dictDetail.js @@ -13,22 +13,22 @@ export function get(dictName) { }) } -export function getDictMap(dictName) { - const params = { - dictName, - page: 0, - size: 9999 - } - return request({ - url: 'api/dictDetail/getDictDetailMaps', - method: 'get', - params - }) -} +// export function getDictMap(dictName) { +// const params = { +// dictName, +// page: 0, +// size: 9999 +// } +// return request({ +// url: 'api/dictDetail/getDictDetailMaps', +// method: 'get', +// params +// }) +// } export function add(data) { return request({ - url: 'api/dictDetail', + url: 'api/dictDetail/saveDictDetail', method: 'post', data }) @@ -36,15 +36,16 @@ export function add(data) { export function del(id) { return request({ - url: 'api/dictDetail/' + id, - method: 'delete' + url: 'api/dictDetail/removeDictDetailById', + method: 'post', + data: { id: id } }) } export function edit(data) { return request({ - url: 'api/dictDetail', - method: 'put', + url: 'api/dictDetail/modifyDictDetailById', + method: 'post', data }) } diff --git a/cutejava-ui/src/api/system/job.js b/cutejava-ui/src/api/system/job.js index 06e85779..6f6606f6 100644 --- a/cutejava-ui/src/api/system/job.js +++ b/cutejava-ui/src/api/system/job.js @@ -15,7 +15,7 @@ export function getAllJob() { export function add(data) { return request({ - url: 'api/job/createJob', + url: 'api/job/saveJob', method: 'post', data }) @@ -23,7 +23,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/job/deleteJob', + url: 'api/job/removeJobByIds', method: 'post', data: ids }) @@ -31,7 +31,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/job/updateJob', + url: 'api/job/modifyJobById', method: 'post', data }) diff --git a/cutejava-ui/src/api/system/menu.js b/cutejava-ui/src/api/system/menu.js index da58d773..b33057c2 100644 --- a/cutejava-ui/src/api/system/menu.js +++ b/cutejava-ui/src/api/system/menu.js @@ -1,8 +1,8 @@ import request from '@/utils/request' -export function getMenusTree(pid) { +export function describeMenuListByPid(pid) { return request({ - url: 'api/menus/queryAllMenu?pid=' + pid, + url: 'api/menus/describeMenuListByPid?pid=' + pid, method: 'post' }) } @@ -15,18 +15,18 @@ export function getMenus(params) { }) } -export function getMenuSuperior(ids) { +export function describeMenuSuperior(ids) { const data = Array.isArray(ids) ? ids : [ids] return request({ - url: 'api/menus/queryMenuSuperior', + url: 'api/menus/describeMenuSuperior', method: 'post', data }) } -export function getChild(id) { +export function describeChildMenuSet(id) { return request({ - url: 'api/menus/queryChildMenu?id=' + id, + url: 'api/menus/describeChildMenuSet?id=' + id, method: 'post' }) } @@ -40,7 +40,7 @@ export function buildMenus() { export function add(data) { return request({ - url: 'api/menus/createMenu', + url: 'api/menus/saveMenu', method: 'post', data }) @@ -48,7 +48,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/menus/deleteMenu', + url: 'api/menus/removeMenuByIds', method: 'post', data: ids }) @@ -56,10 +56,10 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/menus/updateMenu', + url: 'api/menus/modifyMenuById', method: 'post', data }) } -export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus, getChild } +export default { add, edit, del, describeMenuListByPid, describeMenuSuperior, getMenus, describeChildMenuSet } diff --git a/cutejava-ui/src/api/system/role.js b/cutejava-ui/src/api/system/role.js index 706c711c..65fcfe76 100644 --- a/cutejava-ui/src/api/system/role.js +++ b/cutejava-ui/src/api/system/role.js @@ -1,16 +1,16 @@ import request from '@/utils/request' // 获取所有的Role -export function getAll() { +export function describeRoleList() { return request({ - url: 'api/roles/queryAllRole', + url: 'api/roles/describeRoleList', method: 'post' }) } export function add(data) { return request({ - url: 'api/roles/createRole', + url: 'api/roles/saveRole', method: 'post', data }) @@ -18,21 +18,22 @@ export function add(data) { export function get(id) { return request({ - url: 'api/roles/getRoleById/' + id, - method: 'post' + url: 'api/roles/describeRoleById', + method: 'post', + data: { id: id } }) } export function getLevel() { return request({ - url: 'api/roles/getRoleLevel', + url: 'api/roles/describeRoleLevel', method: 'post' }) } export function del(ids) { return request({ - url: 'api/roles/deleteRole', + url: 'api/roles/removeRoleByIds', method: 'post', data: ids }) @@ -40,7 +41,7 @@ export function del(ids) { export function edit(data) { return request({ - url: 'api/roles/updateRole', + url: 'api/roles/modifyRoleById', method: 'post', data }) @@ -48,7 +49,7 @@ export function edit(data) { export function editMenu(data) { return request({ - url: 'api/roles/updateRoleMenu', + url: 'api/roles/modifyBindMenuById', method: 'post', data }) diff --git a/cutejava-ui/src/api/system/user.js b/cutejava-ui/src/api/system/user.js index fc259ab9..40ee9c77 100644 --- a/cutejava-ui/src/api/system/user.js +++ b/cutejava-ui/src/api/system/user.js @@ -3,7 +3,7 @@ import { encrypt } from '@/utils/rsaEncrypt' export function add(data) { return request({ - url: 'api/users/createUser', + url: 'api/users/saveUser', method: 'post', data }) @@ -11,7 +11,7 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/users/deleteUser', + url: 'api/users/removeUserByIds', method: 'post', data: ids }) @@ -19,7 +19,7 @@ export function del(ids) { export function resetPwd(ids) { return request({ - url: 'api/users/resetPwd', + url: 'api/users/resetUserPasswordByIds', method: 'post', data: ids }) @@ -27,7 +27,7 @@ export function resetPwd(ids) { export function edit(data) { return request({ - url: 'api/users/updateUser', + url: 'api/users/modifyUserById', method: 'post', data }) @@ -35,7 +35,7 @@ export function edit(data) { export function editUser(data) { return request({ - url: 'api/users/updateCenterInfo', + url: 'api/users/modifyUserCenterInfoById', method: 'post', data }) @@ -47,7 +47,7 @@ export function updatePass(user) { newPass: encrypt(user.newPass) } return request({ - url: 'api/users/updatePassword/', + url: 'api/users/modifyUserPasswordByUsername', method: 'post', data }) @@ -59,7 +59,7 @@ export function updateEmail(form) { email: form.email } return request({ - url: 'api/users/updateEmail/' + form.code, + url: 'api/users/modifyUserEmailByUsername/' + form.code, method: 'post', data }) @@ -67,7 +67,7 @@ export function updateEmail(form) { export function queryUserMetaPage(query) { return request({ - url: 'api/users/queryUserMetaPage', + url: 'api/users/describeUserMetadataOptions', method: 'post', data: { page: 1, diff --git a/cutejava-ui/src/api/tools/email.js b/cutejava-ui/src/api/tools/email.js index cfb1ceda..dde0f6bd 100644 --- a/cutejava-ui/src/api/tools/email.js +++ b/cutejava-ui/src/api/tools/email.js @@ -1,15 +1,15 @@ import request from '@/utils/request' -export function queryEmailConfig() { +export function describeEmailConfig() { return request({ - url: 'api/email/queryEmailConfig', + url: 'api/email/describeEmailConfig', method: 'post' }) } -export function updateEmailConfig(data) { +export function modifyEmailConfig(data) { return request({ - url: 'api/email/updateEmailConfig', + url: 'api/email/modifyEmailConfig', method: 'post', data }) diff --git a/cutejava-ui/src/api/tools/localStorage.js b/cutejava-ui/src/api/tools/localStorage.js index 63ebe2b2..48342277 100644 --- a/cutejava-ui/src/api/tools/localStorage.js +++ b/cutejava-ui/src/api/tools/localStorage.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function add(data) { return request({ - url: 'api/localStorage', + url: 'api/localStorage/uploadFile', method: 'post', data }) @@ -10,16 +10,16 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/localStorage/', - method: 'delete', + url: 'api/localStorage/removeFileByIds', + method: 'post', data: ids }) } export function edit(data) { return request({ - url: 'api/localStorage', - method: 'put', + url: 'api/localStorage/modifyLocalStorageById', + method: 'post', data }) } diff --git a/cutejava-ui/src/api/tools/qiniu.js b/cutejava-ui/src/api/tools/qiniu.js index 266efe99..75dc8d27 100644 --- a/cutejava-ui/src/api/tools/qiniu.js +++ b/cutejava-ui/src/api/tools/qiniu.js @@ -1,23 +1,23 @@ import request from '@/utils/request' -export function queryQiNiuConfig() { +export function describeQiniuConfig() { return request({ - url: 'api/qiNiuContent/queryQiNiuConfig', + url: 'api/qiNiuContent/describeQiniuConfig', method: 'post' }) } -export function update(data) { +export function modifyQiniuConfig(data) { return request({ - url: 'api/qiNiuContent/updateQiNiuConfig', + url: 'api/qiNiuContent/modifyQiniuConfig', method: 'post', data }) } -export function download(id) { +export function createFilePreviewUrl(id) { return request({ - url: 'api/qiNiuContent/download/' + id, + url: 'api/qiNiuContent/createFilePreviewUrl/' + id, method: 'get' }) } @@ -36,5 +36,4 @@ export function del(ids) { data: ids }) } - -export default { del, download, sync } +export default { del, createFilePreviewUrl, sync } diff --git a/cutejava-ui/src/store/modules/api.js b/cutejava-ui/src/store/modules/api.js index aa898f2f..92416925 100644 --- a/cutejava-ui/src/store/modules/api.js +++ b/cutejava-ui/src/store/modules/api.js @@ -3,9 +3,9 @@ const baseUrl = process.env.VUE_APP_BASE_API === '/' ? '' : process.env.VUE_APP_ const api = { state: { // 图片上传 - imagesUploadApi: baseUrl + '/api/localStorage/pictures', + imagesUploadApi: baseUrl + '/api/localStorage/uploadPicture', // 修改头像 - updateAvatarApi: baseUrl + '/api/users/updateAvatar', + updateAvatarApi: baseUrl + '/api/users/modifyUserAvatar', // 上传文件到七牛云 qiNiuUploadApi: baseUrl + '/api/qiNiuContent', // Sql 监控 @@ -15,7 +15,7 @@ const api = { // swagger swaggerApi: baseUrl + '/doc.html', // 文件上传 - fileUploadApi: baseUrl + '/api/localStorage', + fileUploadApi: baseUrl + '/api/localStorage/uploadFile', // baseUrl, baseApi: baseUrl } diff --git a/cutejava-ui/src/views/components/business/CuteDeptTree.vue b/cutejava-ui/src/views/components/business/CuteDeptTree.vue index 988e5d3f..56db9166 100644 --- a/cutejava-ui/src/views/components/business/CuteDeptTree.vue +++ b/cutejava-ui/src/views/components/business/CuteDeptTree.vue @@ -24,7 +24,7 @@