refactor(api): 统一API接口命名规范

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'
   })
 }

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
   })

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'
   })
 }

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 }

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
   })

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
   })

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
   })

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
   })

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
   })

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'
   })
 }

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
   })

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
   })

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
   })

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
   })

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

cutejava-front/src/views/components/business/CuteDeptTree.vue

@@ -30,7 +30,7 @@
 
 <script>
 
-import { queryDeptList } from '@/api/system/dept'
+import { searchDept } from '@/api/system/dept'
 
 export default {
   name: 'CuteDeptTree',
@@ -61,7 +61,7 @@ export default {
         params['pid'] = node.data.id
       }
       setTimeout(() => {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: params

cutejava-front/src/views/components/business/CuteProductLineSelect.vue

@@ -25,7 +25,7 @@
 
 <script>
 
-import { queryDeptSelectDataSource } from '@/api/system/component'
+import { listDeptSelectDataSource } from '@/api/system/component'
 import CsMessage from '@/utils/elementui/CsMessage'
 
 export default {
@@ -56,7 +56,7 @@ export default {
   },
   methods: {
     fetchDeptData() {
-      queryDeptSelectDataSource().then(data => {
+      listDeptSelectDataSource().then(data => {
         this.deptOptions = data
       }).catch(error => {
         console.error('获取部门数据失败:', error)

cutejava-front/src/views/components/business/CuteProductLineSelectPro.vue

@@ -17,7 +17,7 @@
 
 <script>
 
-import { queryDeptSelectProDataSource } from '@/api/system/component'
+import { listDeptSelectProDataSource } from '@/api/system/component'
 import CsMessage from '@/utils/elementui/CsMessage'
 
 export default {
@@ -62,7 +62,7 @@ export default {
       })
     },
     fetchDeptData() {
-      queryDeptSelectProDataSource().then(data => {
+      listDeptSelectProDataSource().then(data => {
         this.deptOptions = this.cleanEmptyChildren(data)
         // console.error('deptOptions', this.deptOptions)
       }).catch(error => {

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', searchRouter: '/queryAllDeptByArgs', crudMethod: { ...crudDept }})
+    return CRUD({ title: '部门', url: 'api/dept', searchRouter: '/searchDept', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典
@@ -175,7 +175,7 @@ export default {
         args: { pid: tree.id }
       }
       setTimeout(() => {
-        crudDept.queryDeptList(params).then(res => {
+        crudDept.searchDept(params).then(res => {
           resolve(res.content)
         })
       }, 100)
@@ -212,7 +212,7 @@ export default {
       })
     },
     getDepts() {
-      crudDept.queryDeptList({
+      crudDept.searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -228,7 +228,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        crudDept.queryDeptList({
+        crudDept.searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }

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', searchRouter: '/queryAllMenu', crudMethod: { ...crudMenu }})
+    return CRUD({ title: '菜单', url: 'api/menu', searchRouter: '/searchMenu', crudMethod: { ...crudMenu }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {

cutejava-front/src/views/system/role/index.vue

@@ -152,7 +152,7 @@
 
 <script>
 import crudRoles from '@/api/system/role'
-import { queryDeptList, queryDeptSuperiorTree } from '@/api/system/dept'
+import { searchDept, queryDeptSuperiorTree } from '@/api/system/dept'
 import { queryChildMenuSet, queryMenuListByPid } from '@/api/system/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -313,7 +313,7 @@ export default {
     },
     // 获取部门数据
     getDepts() {
-      queryDeptList({
+      searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -350,7 +350,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }

cutejava-front/src/views/system/server/index.vue

@@ -154,7 +154,7 @@ export default {
     return {
       show: false,
       monitor: null,
-      url: 'api/monitor/queryServerMonitorInfo',
+      url: 'api/monitor/getServerMonitorInfo',
       data: {},
       cpuInfo: {
         tooltip: {

cutejava-front/src/views/system/user/center/updateEmail.vue

@@ -34,9 +34,9 @@
 
 <script>
 import store from '@/store'
-import { validEmail } from '@/utils/CsValidateUtil'
+import { IsValidEmail } from '@/utils/CsValidateUtil'
 import { updateEmail } from '@/api/system/user'
-import { sendResetEmailCaptcha } from '@/api/system/code'
+import { sendResetEmailCode } from '@/api/system/code'
 
 export default {
   props: {
@@ -51,7 +51,7 @@ export default {
         callback(new Error('新邮箱不能为空'))
       } else if (value === this.email) {
         callback(new Error('新邮箱不能与旧邮箱相同'))
-      } else if (validEmail(value)) {
+      } else if (IsValidEmail(value)) {
         callback()
       } else {
         callback(new Error('邮箱格式错误'))
@@ -83,7 +83,7 @@ export default {
         this.codeLoading = true
         this.buttonName = '验证码发送中'
         const _this = this
-        sendResetEmailCaptcha(this.form.email).then(res => {
+        sendResetEmailCode(this.form.email).then(res => {
           this.$message({
             showClose: true,
             message: '发送成功，验证码有效期5分钟',

cutejava-front/src/views/system/user/index.vue

@@ -196,7 +196,7 @@
 <script>
 import crudUser from '@/api/system/user'
 import { IsValidPhone } from '@/utils/CsValidateUtil'
-import { queryDeptList, queryDeptSuperiorTree } from '@/api/system/dept'
+import { searchDept, queryDeptSuperiorTree } from '@/api/system/dept'
 import { getLevel, queryRoleList } from '@/api/system/role'
 import { queryAllEnableJob } from '@/api/system/job'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -228,7 +228,7 @@ export default {
   name: 'User',
   components: { CuteDeptTree, Treeselect, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
   cruds() {
-    return CRUD({ title: '用户', url: 'api/user', searchRouter: '/aggregationSearchUserByArgs', crudMethod: { ...crudUser }})
+    return CRUD({ title: '用户', url: 'api/user', searchRouter: '/aggregationSearchUser', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
@@ -401,7 +401,7 @@ export default {
       this.crud.toQuery()
     },
     getDepts() {
-      queryDeptList({
+      searchDept({
         page: 1,
         size: 9999999,
         args: { enabled: true }
@@ -434,7 +434,7 @@ export default {
     // 获取弹窗内部门数据
     loadDepts({ action, parentNode, callback }) {
       if (action === LOAD_CHILDREN_OPTIONS) {
-        queryDeptList({
+        searchDept({
           page: 1,
           size: 9999999,
           args: { enabled: true, pid: parentNode.id }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemAuthController.java

@@ -52,13 +52,6 @@ public class SystemAuthController {
     return ResponseEntity.ok(loginInfo);
   }
 
-  @ApiOperation("获取用户信息")
-  @PostMapping(value = "/info")
-  public ResponseEntity<SystemUserInfoVo> getUserInfo() {
-    SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo();
-    return ResponseEntity.ok(userInfoVo);
-  }
-
   @ApiOperation("退出登录")
   @AnonymousPostMapping(value = "/logout")
   public ResponseEntity<Void> logout(HttpServletRequest request) {

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemCaptchaController.java

@@ -38,22 +38,22 @@ public class SystemCaptchaController {
   private SystemEmailService systemEmailService;
 
   @ApiOperation("重置邮箱, 发送验证码")
-  @PostMapping(value = "/sendResetEmailCaptcha")
+  @PostMapping(value = "/sendResetEmailCode")
-  public ResponseEntity<Void> sendResetEmailCaptcha(@RequestParam String email) {
+  public ResponseEntity<Void> sendResetEmailCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_EMAIL_CODE, email);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("重置密码，发送验证码")
-  @PostMapping(value = "/sendResetPasswordCaptcha")
+  @PostMapping(value = "/sendResetPasswordCode")
-  public ResponseEntity<Void> sendResetPasswordCaptcha(@RequestParam String email) {
+  public ResponseEntity<Void> sendResetPasswordCode(@RequestParam String email) {
     systemEmailService.sendCaptcha(SystemCaptchaBizEnum.EMAIL_RESET_PWD_CODE, email);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("验证码验证")
-  @PostMapping(value = "/checkEmailCaptcha")
+  @PostMapping(value = "/verifyCode")
-  public ResponseEntity<Void> checkEmailCaptcha(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
+  public ResponseEntity<Void> verifyCode(@Validated @RequestBody SystemCheckEmailCaptchaArgs args) {
     systemEmailService.checkEmailCaptcha(args);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemComponentController.java

@@ -34,16 +34,16 @@ public class SystemComponentController {
   private SystemDeptService systemDeptService;
 
   @ApiOperation("查询部门下拉选择数据源")
-  @PostMapping(value = "/queryDeptSelectDataSource")
+  @PostMapping(value = "/listDeptSelectDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectDataSource() {
+  public ResponseEntity<?> listDeptSelectDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectDataSource());
+    return ResponseEntity.ok(systemDeptService.listDeptSelectDataSource());
   }
 
   @ApiOperation("查询部门下拉选择Pro数据源")
-  @PostMapping(value = "/queryDeptSelectProDataSource")
+  @PostMapping(value = "/listDeptSelectProDataSource")
   @PreAuthorize("@el.check()")
-  public ResponseEntity<?> queryDeptSelectProDataSource() {
+  public ResponseEntity<?> listDeptSelectProDataSource() {
-    return ResponseEntity.ok(systemDeptService.queryDeptSelectProDataSource());
+    return ResponseEntity.ok(systemDeptService.listDeptSelectProDataSource());
   }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDeptController.java

@@ -54,7 +54,7 @@ public class SystemDeptController {
   }
 
   @ApiOperation("查询部门")
-  @PostMapping(value = "/queryAllDeptByArgs")
+  @PostMapping(value = "/searchDept")
   @PreAuthorize("@el.check('user:list','dept:list')")
   public ResponseEntity<KitPageResult<SystemDeptTb>> queryDept(
       @Validated @RequestBody KitPageArgs<SystemQueryDeptArgs> pageArgs) throws Exception {
@@ -63,7 +63,7 @@ public class SystemDeptController {
   }
 
   @ApiOperation("查询部门:根据ID获取同级与上级数据")
-  @PostMapping("/queryDeptSuperiorTree")
+  @PostMapping("/searchDeptTree")
   @PreAuthorize("@el.check('user:list','dept:list')")
   public ResponseEntity<KitPageResult<SystemDeptTb>> queryDeptSuperiorTree(@RequestBody List<Long> ids,
       @RequestParam(defaultValue = "false") Boolean exclude) {
@@ -79,17 +79,17 @@ public class SystemDeptController {
   }
 
   @ApiOperation("修改部门")
-  @PostMapping(value = "/modifyDept")
+  @PostMapping(value = "/updateDeptById")
   @PreAuthorize("@el.check('dept:edit')")
-  public ResponseEntity<Void> modifyDept(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
+  public ResponseEntity<Void> updateDeptById(@Validated(SystemDeptTb.Update.class) @RequestBody SystemDeptTb args) {
-    systemDeptService.updateDept(args);
+    systemDeptService.updateDeptById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除部门")
-  @PostMapping(value = "/removeDeptByIds")
+  @PostMapping(value = "/deleteDeptByIds")
   @PreAuthorize("@el.check('dept:del')")
-  public ResponseEntity<Void> removeDeptByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDeptByIds(@RequestBody Set<Long> ids) {
     systemDeptService.deleteDeptByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictController.java

@@ -53,6 +53,7 @@ public class SystemDictController {
     systemDictService.exportDictXlsx(response, args);
   }
 
+  @Deprecated
   @ApiOperation("查询所有字典")
   @PostMapping(value = "/queryAllDict")
   @PreAuthorize("@el.check('dict:list')")
@@ -78,17 +79,17 @@ public class SystemDictController {
   }
 
   @ApiOperation("修改字典")
-  @PostMapping(value = "/modifyDictById")
+  @PostMapping(value = "/updateDictById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
+  public ResponseEntity<Void> updateDictById(@Validated(SystemDictTb.Update.class) @RequestBody SystemDictTb args) {
     systemDictService.updateDictById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除字典")
-  @PostMapping(value = "/removeDictByIds")
+  @PostMapping(value = "/deleteDictByIds")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteDictByIds(@RequestBody Set<Long> ids) {
     systemDictService.deleteDictByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemDictDetailController.java

@@ -70,18 +70,18 @@ public class SystemDictDetailController {
   }
 
   @ApiOperation("修改字典详情")
-  @PostMapping(value = "/modifyDictDetailById")
+  @PostMapping(value = "/updateDictDetailById")
   @PreAuthorize("@el.check('dict:edit')")
-  public ResponseEntity<Void> modifyDictDetailById(
+  public ResponseEntity<Void> updateDictDetailById(
       @Validated(SystemDictDetailTb.Update.class) @RequestBody SystemDictDetailTb args) {
     systemDictDetailService.updateDictDetailById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除字典详情")
-  @PostMapping(value = "/removeDictDetailById")
+  @PostMapping(value = "/deleteDictDetailById")
   @PreAuthorize("@el.check('dict:del')")
-  public ResponseEntity<Void> removeDictDetailById(@RequestBody SystemDictDetailTb args) {
+  public ResponseEntity<Void> deleteDictDetailById(@RequestBody SystemDictDetailTb args) {
     systemDictDetailService.deleteDictDetailById(args.getId());
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemEmailController.java

@@ -46,16 +46,16 @@ public class SystemEmailController {
   }
 
   @ApiOperation("配置邮件")
-  @PostMapping(value = "/modifyEmailConfig")
+  @PostMapping(value = "/updateEmailConfigById")
-  public ResponseEntity<Void> modifyEmailConfig(@Validated @RequestBody SystemEmailConfigTb emailConfig)
+  public ResponseEntity<Void> updateEmailConfigById(@Validated @RequestBody SystemEmailConfigTb emailConfig)
       throws Exception {
     systemEmailService.updateEmailConfigById(emailConfig);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("发送邮件")
-  @PostMapping(value = "/sendEmail")
+  @PostMapping(value = "/send")
-  public ResponseEntity<Void> sendEmail(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
+  public ResponseEntity<Void> send(@Validated @RequestBody SystemSendEmailArgs sendEmailRequest) {
     systemEmailService.sendEmail(sendEmailRequest);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemJobController.java

@@ -70,17 +70,17 @@ public class SystemJobController {
   }
 
   @ApiOperation("修改岗位")
-  @PostMapping(value = "/modifyJobById")
+  @PostMapping(value = "/updateJobById")
   @PreAuthorize("@el.check('job:edit')")
-  public ResponseEntity<Void> modifyJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
+  public ResponseEntity<Void> updateJobById(@Validated(SystemJobTb.Update.class) @RequestBody SystemJobTb args) {
     systemJobService.updateJobById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除岗位")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('job:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemLocalStorageController.java

@@ -77,15 +77,15 @@ public class SystemLocalStorageController {
   }
 
   @ApiOperation("修改文件")
-  @PostMapping(value = "/modifyLocalStorageById")
+  @PostMapping(value = "/updateLocalStorageById")
   @PreAuthorize("@el.check('storage:edit')")
-  public ResponseEntity<Void> modifyLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
+  public ResponseEntity<Void> updateLocalStorageById(@Validated @RequestBody SystemLocalStorageTb args) {
     localStorageService.updateLocalStorageById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
+  @PostMapping(value = "/deleteFileByIds")
   public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     localStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMenuController.java

@@ -62,22 +62,22 @@ public class SystemMenuController {
   }
 
   @ApiOperation("返回全部的菜单")
-  @PostMapping(value = "/queryMenuListByPid")
+  @PostMapping(value = "/listMenuByPid")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<List<SystemMenuTb>> queryMenuListByPid(@RequestParam Long pid) {
+  public ResponseEntity<List<SystemMenuTb>> listMenuByPid(@RequestParam Long pid) {
     List<SystemMenuTb> systemMenuTbs = systemMenuService.listMenuByPid(pid);
     return ResponseEntity.ok(systemMenuTbs);
   }
 
   @ApiOperation("根据菜单ID返回所有子节点ID, 包含自身ID")
-  @PostMapping(value = "/queryChildMenuSet")
+  @PostMapping(value = "/listChildMenuSetByMenuId")
   @PreAuthorize("@el.check('menu:list','roles:list')")
-  public ResponseEntity<Set<Long>> queryChildMenuSet(@RequestParam Long id) {
+  public ResponseEntity<Set<Long>> listChildMenuSetByMenuId(@RequestParam Long id) {
     Set<Long> ids = systemMenuService.listChildMenuSetByMenuId(id);
     return ResponseEntity.ok(ids);
   }
 
-  @PostMapping(value = "/queryAllMenu")
+  @PostMapping(value = "/searchMenu")
   @ApiOperation("查询菜单")
   @PreAuthorize("@el.check('menu:list')")
   public ResponseEntity<KitPageResult<SystemMenuTb>> queryAllMenu(
@@ -106,17 +106,17 @@ public class SystemMenuController {
   }
 
   @ApiOperation("修改菜单")
-  @PostMapping(value = "/modifyMenuById")
+  @PostMapping(value = "/updateMenuById")
   @PreAuthorize("@el.check('menu:edit')")
-  public ResponseEntity<Void> modifyMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
+  public ResponseEntity<Void> updateMenuById(@Validated(SystemMenuTb.Update.class) @RequestBody SystemMenuTb args) {
     systemMenuService.updateMenuById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除菜单")
-  @PostMapping(value = "/removeMenuByIds")
+  @PostMapping(value = "/deleteMenuByIds")
   @PreAuthorize("@el.check('menu:del')")
-  public ResponseEntity<Void> removeMenuByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteMenuByIds(@RequestBody Set<Long> ids) {
     systemMenuService.deleteMenuByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemMonitorController.java

@@ -34,10 +34,10 @@ public class SystemMonitorController {
   @Autowired
   private SystemMonitorService systemMonitorService;
 
-  @PostMapping(value = "/queryServerMonitorInfo")
+  @PostMapping(value = "/getServerMonitorInfo")
   @ApiOperation("查询服务监控")
   @PreAuthorize("@el.check('monitor:list')")
-  public ResponseEntity<Map<String, Object>> queryServerMonitorInfo() {
+  public ResponseEntity<Map<String, Object>> getServerMonitorInfo() {
     return ResponseEntity.ok(systemMonitorService.getServerMonitorInfo());
   }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemOssStorageController.java

@@ -73,8 +73,8 @@ public class SystemOssStorageController {
   }
 
   @ApiOperation("多选删除")
-  @PostMapping(value = "/removeFileByIds")
+  @PostMapping(value = "/deleteFileByIds")
-  public ResponseEntity<Void> removeFileByIds(@RequestBody Long[] ids) {
+  public ResponseEntity<Void> deleteFileByIds(@RequestBody Long[] ids) {
     systemOssStorageService.deleteFileByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemQuartzJobController.java

@@ -114,9 +114,9 @@ public class SystemQuartzJobController {
   }
 
   @ApiOperation("删除定时任务")
-  @PostMapping(value = "/removeJobByIds")
+  @PostMapping(value = "/deleteJobByIds")
   @PreAuthorize("@el.check('quartzJob:del')")
-  public ResponseEntity<Void> removeJobByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteJobByIds(@RequestBody Set<Long> ids) {
     systemQuartzJobService.deleteJobByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemRoleController.java

@@ -49,9 +49,9 @@ public class SystemRoleController {
   private SystemRoleService systemRoleService;
 
   @ApiOperation("获取单个role")
-  @PostMapping(value = "/queryRoleById")
+  @PostMapping(value = "/getRoleById")
   @PreAuthorize("@el.check('roles:list')")
-  public ResponseEntity<SystemRoleVo> queryRoleById(@RequestBody SystemRoleTb args) {
+  public ResponseEntity<SystemRoleVo> getRoleById(@RequestBody SystemRoleTb args) {
     return ResponseEntity.ok(systemRoleService.getRoleById(args.getId()));
   }
 
@@ -63,9 +63,9 @@ public class SystemRoleController {
   }
 
   @ApiOperation("返回全部的角色")
-  @PostMapping(value = "/queryRoleList")
+  @PostMapping(value = "/listAllRole")
   @PreAuthorize("@el.check('roles:list','user:add','user:edit')")
-  public ResponseEntity<List<SystemRoleTb>> queryRoleList() {
+  public ResponseEntity<List<SystemRoleTb>> listAllRole() {
     return ResponseEntity.ok(systemRoleService.listAllRole());
   }
 
@@ -93,25 +93,25 @@ public class SystemRoleController {
   }
 
   @ApiOperation("修改角色")
-  @PostMapping(value = "/modifyRoleById")
+  @PostMapping(value = "/updateRoleById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateRoleById(@Validated(SystemRoleTb.Update.class) @RequestBody SystemRoleVo args) {
     systemRoleService.updateRoleById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("修改角色菜单")
-  @PostMapping(value = "/modifyBindMenuById")
+  @PostMapping(value = "/updateBindMenuById")
   @PreAuthorize("@el.check('roles:edit')")
-  public ResponseEntity<Void> modifyBindMenuById(@RequestBody SystemRoleVo args) {
+  public ResponseEntity<Void> updateBindMenuById(@RequestBody SystemRoleVo args) {
     systemRoleService.updateBindMenuById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除角色")
-  @PostMapping(value = "/removeRoleByIds")
+  @PostMapping(value = "/deleteRoleByIds")
   @PreAuthorize("@el.check('roles:del')")
-  public ResponseEntity<Void> removeRoleByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Void> deleteRoleByIds(@RequestBody Set<Long> ids) {
     systemRoleService.deleteRoleByIds(ids);
     return ResponseEntity.ok(null);
   }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/controller/SystemUserController.java

@@ -21,8 +21,10 @@ import cn.odboy.base.KitSelectOptionVo;
 import cn.odboy.system.dal.dataobject.SystemUserTb;
 import cn.odboy.system.dal.model.SystemQueryUserArgs;
 import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
+import cn.odboy.system.dal.model.SystemUserInfoVo;
 import cn.odboy.system.dal.model.SystemUserVo;
 import cn.odboy.system.framework.permission.core.KitSecurityHelper;
+import cn.odboy.system.service.SystemAuthService;
 import cn.odboy.system.service.SystemUserService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -50,6 +52,8 @@ public class SystemUserController {
 
   @Autowired
   private SystemUserService systemUserService;
+  @Autowired
+  private SystemAuthService systemAuthService;
 
 
   @ApiOperation("导出用户数据")
@@ -60,7 +64,7 @@ public class SystemUserController {
   }
 
   @ApiOperation("查询用户")
-  @PostMapping(value = "/aggregationSearchUserByArgs")
+  @PostMapping(value = "/aggregationSearchUser")
   @PreAuthorize("@el.check('user:list')")
   public ResponseEntity<KitPageResult<SystemUserVo>> queryUserByArgs(@Validated @RequestBody KitPageArgs<SystemQueryUserArgs> pageArgs) {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
@@ -77,31 +81,31 @@ public class SystemUserController {
   }
 
   @ApiOperation("修改用户")
-  @PostMapping(value = "/modifyUserById")
+  @PostMapping(value = "/updateUserById")
   @PreAuthorize("@el.check('user:edit')")
-  public ResponseEntity<Object> modifyUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
+  public ResponseEntity<Object> updateUserById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserVo args) {
     systemUserService.updateUserById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("修改用户：个人中心")
-  @PostMapping(value = "modifyUserCenterInfoById")
+  @PostMapping(value = "/updateUserCenterInfoById")
-  public ResponseEntity<Object> modifyUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
+  public ResponseEntity<Object> updateUserCenterInfoById(@Validated(SystemUserTb.Update.class) @RequestBody SystemUserTb args) {
     systemUserService.updateUserCenterInfoById(args);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("删除用户")
-  @PostMapping(value = "/removeUserByIds")
+  @PostMapping(value = "/deleteUserByIds")
   @PreAuthorize("@el.check('user:del')")
-  public ResponseEntity<Object> removeUserByIds(@RequestBody Set<Long> ids) {
+  public ResponseEntity<Object> deleteUserByIds(@RequestBody Set<Long> ids) {
-    systemUserService.removeUserByIds(ids);
+    systemUserService.deleteUserByIds(ids);
     return ResponseEntity.ok(null);
   }
 
   @ApiOperation("修改密码")
-  @PostMapping(value = "/modifyUserPasswordByUsername")
+  @PostMapping(value = "/updateUserPasswordByUsername")
-  public ResponseEntity<Object> modifyUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
+  public ResponseEntity<Object> updateUserPasswordByUsername(@RequestBody SystemUpdateUserPasswordArgs passVo) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserPasswordByUsername(currentUsername, passVo);
     return ResponseEntity.ok(null);
@@ -115,14 +119,14 @@ public class SystemUserController {
   }
 
   @ApiOperation("修改头像")
-  @PostMapping(value = "/modifyUserAvatar")
+  @PostMapping(value = "/updateUserAvatar")
-  public ResponseEntity<Object> modifyUserAvatar(@RequestParam MultipartFile avatar) {
+  public ResponseEntity<Object> updateUserAvatar(@RequestParam MultipartFile avatar) {
     return ResponseEntity.ok(systemUserService.updateUserAvatar(avatar));
   }
 
   @ApiOperation("修改邮箱")
-  @PostMapping(value = "/modifyUserEmailByUsername/{code}")
+  @PostMapping(value = "/updateUserEmailByUsername/{code}")
-  public ResponseEntity<Object> modifyUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
+  public ResponseEntity<Object> updateUserEmailByUsername(@PathVariable String code, @RequestBody SystemUserTb args) throws Exception {
     String currentUsername = KitSecurityHelper.getCurrentUsername();
     systemUserService.updateUserEmailByUsername(currentUsername, args, code);
     return ResponseEntity.ok(null);
@@ -135,4 +139,11 @@ public class SystemUserController {
     List<KitSelectOptionVo> collect = systemUserService.queryUserMetadataOptions(args);
     return ResponseEntity.ok(collect);
   }
+
+  @ApiOperation("获取用户信息")
+  @PostMapping(value = "/getCurrentUserInfo")
+  public ResponseEntity<SystemUserInfoVo> getUserInfo() {
+    SystemUserInfoVo userInfoVo = systemAuthService.getCurrentUserInfoVo();
+    return ResponseEntity.ok(userInfoVo);
+  }
 }

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/openapi/SystemCaptchaOpenController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/auth")
+@RequestMapping("/captcha")
 @Api(tags = "系统：验证码管理")
 public class SystemCaptchaOpenController {
 
@@ -34,7 +34,7 @@ public class SystemCaptchaOpenController {
   private SystemAuthService systemAuthService;
 
   @ApiOperation("获取验证码")
-  @AnonymousPostMapping(value = "/captcha/getImage")
+  @AnonymousPostMapping(value = "/getCode")
   public ResponseEntity<Map<String, Object>> getCode() {
     Map<String, Object> imgResult = systemAuthService.getCaptchaInfo();
     return ResponseEntity.ok(imgResult);

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemDeptService.java

@@ -78,7 +78,7 @@ public class SystemDeptService {
    * @param args /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void updateDept(SystemDeptTb args) {
+  public void updateDeptById(SystemDeptTb args) {
     // 旧的部门
     Long oldPid = this.getDeptById(args.getId()).getPid();
     Long newPid = args.getPid();
@@ -365,7 +365,7 @@ public class SystemDeptService {
     return depts;
   }
 
-  public List<SystemProductLineVo> queryDeptSelectDataSource() {
+  public List<SystemProductLineVo> listDeptSelectDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     return buildDeptSelectOptions(depts);
   }
@@ -414,7 +414,7 @@ public class SystemDeptService {
     }
   }
 
-  public List<SystemProductLineTreeVo> queryDeptSelectProDataSource() {
+  public List<SystemProductLineTreeVo> listDeptSelectProDataSource() {
     List<SystemDeptTb> depts = this.listEnabledDepts();
     // 获取所有部门并按父子关系组织
     Map<Long, SystemDeptTb> deptMap =

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/service/SystemUserService.java

@@ -209,7 +209,7 @@ public class SystemUserService {
    * @param ids /
    */
   @Transactional(rollbackFor = Exception.class)
-  public void removeUserByIds(Set<Long> ids) {
+  public void deleteUserByIds(Set<Long> ids) {
     Long currentUserId = KitSecurityHelper.getCurrentUserId();
     // 校验权限
     for (Long id : ids) {