From 8b9482e58d6208929449b8794a1e4ac7d42c8e26 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 3 Aug 2022 14:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/framework/aop/SysLogAspect.java | 2 ++ .../serve/common/model/annotation/SysLog.java | 2 +- .../serve/common/model/enums/SystemModule.java | 2 +- .../controller/AdminPortalController.java | 11 +++++------ .../qs/serve/controller/CommonController.java | 3 ++- .../sys/controller/SysDeptController.java | 10 +++++----- .../sys/controller/SysMenuController.java | 6 +++++- .../sys/controller/SysNoticeController.java | 9 +++++++++ .../controller/SysNoticeTypeController.java | 6 ++++++ .../sys/controller/SysPostController.java | 8 ++++---- .../sys/controller/SysRoleController.java | 11 +++++++---- .../sys/controller/SysTenantController.java | 6 ++++++ .../sys/controller/SysUserController.java | 18 +++++++++--------- src/main/resources/application-dev.yml | 2 -- 14 files changed, 62 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java b/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java index ae96e33..7d6ca24 100644 --- a/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java +++ b/src/main/java/com/qs/serve/common/framework/aop/SysLogAspect.java @@ -132,6 +132,8 @@ public class SysLogAspect { operationLog.setBizType(sysLog.biz().getValue()); operationLog.setInterType(sysLog.inter().name()); operationLog.setTitle(sysLog.title()); + operationLog.setModule(sysLog.module().getVale()); + operationLog.setOptDesc(sysLog.desc()); if (sysLog.saveReqParam()) { setRequestValue(joinPoint, operationLog); } diff --git a/src/main/java/com/qs/serve/common/model/annotation/SysLog.java b/src/main/java/com/qs/serve/common/model/annotation/SysLog.java index 78966cb..cb30b55 100644 --- a/src/main/java/com/qs/serve/common/model/annotation/SysLog.java +++ b/src/main/java/com/qs/serve/common/model/annotation/SysLog.java @@ -22,7 +22,7 @@ public @interface SysLog { String title() default ""; /** 操作描述 */ - String optDesc() default ""; + String desc() default ""; /** 操作类型 */ BizType biz() default BizType.OTHER; diff --git a/src/main/java/com/qs/serve/common/model/enums/SystemModule.java b/src/main/java/com/qs/serve/common/model/enums/SystemModule.java index 9caeae6..5f60eee 100644 --- a/src/main/java/com/qs/serve/common/model/enums/SystemModule.java +++ b/src/main/java/com/qs/serve/common/model/enums/SystemModule.java @@ -12,7 +12,7 @@ import lombok.Getter; public enum SystemModule { - SYSTEM("000","系统"); + SYSTEM("sys","系统"); String code; diff --git a/src/main/java/com/qs/serve/controller/AdminPortalController.java b/src/main/java/com/qs/serve/controller/AdminPortalController.java index 49041b7..300b0ce 100644 --- a/src/main/java/com/qs/serve/controller/AdminPortalController.java +++ b/src/main/java/com/qs/serve/controller/AdminPortalController.java @@ -41,7 +41,6 @@ public class AdminPortalController { private SysUserLoginService sysUserLoginService; private RedisService redisService; private SysUserService sysUserService; - private SysNoticeUserMapper sysNoticeUserMapper; /** * 获取所有租户 @@ -59,7 +58,7 @@ public class AdminPortalController { * @return */ @LimitSubmit - @SysLog(title = "后台登录",biz = BizType.LOGIN,saveReqParam = false) + @SysLog(title = "人员",desc = "后台登录",biz = BizType.LOGIN,saveReqParam = false) @PostMapping("/login") public R login(@RequestBody @Valid SysLoginParam param){ return R.ok(sysUserLoginService.login(param)); @@ -70,7 +69,7 @@ public class AdminPortalController { * @return */ @LimitSubmit - @SysLog(title = "手机登陆",biz = BizType.LOGIN,saveReqParam = false) + @SysLog(title = "人员",desc = "手机登陆",biz = BizType.LOGIN,saveReqParam = false) @PostMapping("/phoneLogin") public R phoneLogin(@RequestBody @Valid SysLoginByPhoneParam param){ return R.ok(sysUserLoginService.login(param)); @@ -80,7 +79,7 @@ public class AdminPortalController { * 登出接口 * @return */ - @SysLog(title = "退出登录",biz = BizType.LOGOUT,saveReqParam = false) + @SysLog(title = "人员",desc = "退出登录",biz = BizType.LOGOUT,saveReqParam = false) @GetMapping("/logout") public R login(){ return R.ok(); @@ -91,7 +90,7 @@ public class AdminPortalController { * 获取用户手机验证码 */ @LimitSubmit(interval = 10000,message = "请10秒后尝试") - @SysLog(title = "获取用户手机验证码") + @SysLog(title = "人员",desc = "获取用户手机验证码",biz = BizType.OTHER) @GetMapping("/userPhoneCode/{phone}") public R phoneCode(@PathVariable("phone") String phone){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -114,7 +113,7 @@ public class AdminPortalController { * 重置手机用户密码 */ @LimitSubmit(interval = 10000,message = "请10秒后尝试") - @SysLog(title = "重置手机用户密码") + @SysLog(title = "人员",desc = "重置手机用户密码",biz = BizType.RESET) @PostMapping("/resetPwdByPhone") public R phoneCode(@RequestBody @Valid SysResetPwdByPhoneParam param){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/controller/CommonController.java b/src/main/java/com/qs/serve/controller/CommonController.java index 9e284e3..4312a24 100644 --- a/src/main/java/com/qs/serve/controller/CommonController.java +++ b/src/main/java/com/qs/serve/controller/CommonController.java @@ -40,7 +40,7 @@ public class CommonController { * @param request * @return */ - @SysLog(title = "文件上传",biz = BizType.UPLOAD) + @SysLog(title = "文件",biz = BizType.UPLOAD) @PostMapping("/upload") public R upload(HttpServletRequest request) { String relativePath = UploadUtil.put(uploadProperties.getLogicalPath(),IdUtil.timeStampId(),request); @@ -66,6 +66,7 @@ public class CommonController { * @param request * @return */ + @SysLog(title = "文件",biz = BizType.UPLOAD) @PostMapping( "/uploadMulti") public R multiUpload(HttpServletRequest request) { String contentType = request.getContentType(); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java index 245105b..dc8567c 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java @@ -95,6 +95,7 @@ public class SysDeptController { * @param id * @return */ + @SysLog(title = "部门",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:dept:query')") public R getById(@PathVariable("id") String id){ @@ -113,7 +114,7 @@ public class SysDeptController { * @param param * @return */ - @SysLog(title = "新增部门",biz = BizType.INSERT) + @SysLog(title = "部门",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:dept:insert')") public R save(@RequestBody @Valid SysDept param){ @@ -126,7 +127,7 @@ public class SysDeptController { * @param param * @return */ - @SysLog(title = "更新部门",biz = BizType.UPDATE) + @SysLog(title = "部门",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:dept:update')") public R updateById(@RequestBody @Valid SysDept param){ @@ -139,7 +140,7 @@ public class SysDeptController { * @param param * @return */ - @SysLog(title = "部门迁移",biz = BizType.UPDATE) + @SysLog(title = "部门",desc = "部门迁移",biz = BizType.UPDATE) @PostMapping("/updateLevel") @PreAuthorize("hasRole('sys:post:update')") @Transactional(rollbackFor = Exception.class) @@ -149,7 +150,6 @@ public class SysDeptController { return R.ok(); } String subLevelPath = ""; - String subLevelPathName = ""; if(!dept.getParentId().equals(TreeUtil.DEFAULT_PID_STRING)){ SysDept orgParent = sysDeptService.getById(dept.getParentId()); subLevelPath = orgParent.getLevelPath()+"_"; @@ -181,7 +181,7 @@ public class SysDeptController { * @param id * @return */ - @SysLog(title = "删除部门",biz = BizType.DELETE) + @SysLog(title = "部门",biz = BizType.DELETE) @DeleteMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:dept:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java index 589e74e..72bb300 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java @@ -6,6 +6,7 @@ import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.util.*; import com.qs.serve.modules.sys.entity.SysMenu; import com.qs.serve.modules.sys.entity.SysMenuPermit; @@ -128,6 +129,7 @@ public class SysMenuController { * @param param * @return */ + @SysLog(title = "菜单",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:menu:update')") public R updateById(@RequestBody @Valid SysMenu param){ @@ -140,6 +142,7 @@ public class SysMenuController { * @param param * @return */ + @SysLog(title = "菜单",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:menu:insert')") public R save(@RequestBody @Valid SysMenu param){ @@ -152,7 +155,7 @@ public class SysMenuController { * @param param * @return */ - @SysLog(title = "授权系统菜单") + @SysLog(title = "菜单",biz = BizType.GRANT) @PostMapping("/grantMenu") @PreAuthorize("hasRole('sys:menu:insert')") public R save2(@RequestBody @Valid SysMenuPermitParam param){ @@ -173,6 +176,7 @@ public class SysMenuController { * @param id * @return */ + @SysLog(title = "菜单",biz = BizType.DELETE) @DeleteMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:menu:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java index 643d8e1..e0c06c2 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.sys.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; @@ -89,6 +91,7 @@ public class SysNoticeController { * @param id * @return */ + @SysLog(title = "公告",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:notice:query')") public R getById(@PathVariable("id") String id){ @@ -129,6 +132,7 @@ public class SysNoticeController { * @param param * @return */ + @SysLog(title = "公告",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:notice:insert')") public R save(@RequestBody @Valid SysNotice param){ @@ -141,6 +145,7 @@ public class SysNoticeController { * @param id * @return */ + @SysLog(title = "公告",desc = "发布公告",biz = BizType.OTHER) @PostMapping("/publish/{id}") @PreAuthorize("hasRole('sys:notice:publish')") public R publish(@PathVariable("id") String id){ @@ -153,6 +158,7 @@ public class SysNoticeController { * @param id * @return */ + @SysLog(title = "公告",desc = "撤销公告",biz = BizType.OTHER) @PostMapping("/repeal/{id}") @PreAuthorize("hasRole('sys:notice:repeal')") @Transactional(rollbackFor = Exception.class) @@ -169,6 +175,7 @@ public class SysNoticeController { * @param param * @return */ + @SysLog(title = "公告",desc = "保存并发布",biz = BizType.INSERT) @PostMapping("/saveAndPublish") @PreAuthorize("hasRole('sys:notice:publish') and hasRole('sys:notice:insert')") @Transactional(rollbackFor = Exception.class) @@ -188,6 +195,7 @@ public class SysNoticeController { * @param param * @return */ + @SysLog(title = "公告",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:notice:update')") public R updateById(@RequestBody @Valid SysNotice param){ @@ -200,6 +208,7 @@ public class SysNoticeController { * @param id * @return */ + @SysLog(title = "公告",biz = BizType.DELETE) @PostMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:notice:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java index e1b83bc..eaf9c77 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.sys.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.sys.entity.SysNoticeType; import com.qs.serve.modules.sys.service.SysNoticeTypeService; @@ -56,6 +58,7 @@ public class SysNoticeTypeController { * @param id * @return */ + @SysLog(title = "公告类型",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:noticeType:query')") public R getById(@PathVariable("id") String id){ @@ -68,6 +71,7 @@ public class SysNoticeTypeController { * @param param * @return */ + @SysLog(title = "公告类型",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:noticeType:insert')") public R save(@RequestBody @Valid SysNoticeType param){ @@ -80,6 +84,7 @@ public class SysNoticeTypeController { * @param param * @return */ + @SysLog(title = "公告类型",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:noticeType:update')") public R updateById(@RequestBody @Valid SysNoticeType param){ @@ -92,6 +97,7 @@ public class SysNoticeTypeController { * @param id * @return */ + @SysLog(title = "公告类型",biz = BizType.DELETE) @PostMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:noticeType:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java index 1845998..3e0f79e 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java @@ -67,7 +67,7 @@ public class SysPostController { * @return */ @GetMapping("/getById/{id}") - @SysLog(title = "系统职务ID查询",biz = BizType.QUERY) + @SysLog(title = "职务",biz = BizType.QUERY) @PreAuthorize("hasRole('sys:post:query')") public R getById(@PathVariable("id") String id){ SysPost sysPost = sysPostService.getById(id); @@ -84,7 +84,7 @@ public class SysPostController { * @param param * @return */ - @SysLog(title = "系统职务更新",biz = BizType.UPDATE) + @SysLog(title = "职务",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:post:update')") public R updateById(@RequestBody @Valid SysPost param){ @@ -100,7 +100,7 @@ public class SysPostController { * @return */ @PostMapping("/save") - @SysLog(title = "系统职务新增",biz = BizType.INSERT) + @SysLog(title = "职务",biz = BizType.INSERT) @PreAuthorize("hasRole('sys:post:insert')") public R save(@RequestBody @Valid SysPost param){ boolean result = sysPostService.save(param); @@ -112,7 +112,7 @@ public class SysPostController { * @param id * @return */ - @SysLog(title = "系统职务删除",biz = BizType.DELETE) + @SysLog(title = "职务",biz = BizType.DELETE) @DeleteMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:post:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java index a516014..3e55ed5 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java @@ -97,6 +97,7 @@ public class SysRoleController { * @param param * @return */ + @SysLog(title = "角色",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:role:insert')") public R save(@RequestBody @Valid SysRole param){ @@ -110,6 +111,7 @@ public class SysRoleController { * @param param * @return */ + @SysLog(title = "角色",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:role:update')") public R updateById(@RequestBody @Valid SysRole param){ @@ -127,6 +129,7 @@ public class SysRoleController { * @param id * @return */ + @SysLog(title = "角色",biz = BizType.DELETE) @PostMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:role:delete')") public R deleteById(@PathVariable("id") String id){ @@ -145,7 +148,7 @@ public class SysRoleController { * @param param * @return */ - @SysLog(title = "角色授权",biz = BizType.GRANT) + @SysLog(title = "角色",desc ="菜单授权",biz = BizType.GRANT) @PostMapping("/saveRoleMenu") @PreAuthorize("hasRole('sys:permit:grant')") @Transactional(rollbackFor = Exception.class) @@ -167,7 +170,7 @@ public class SysRoleController { * @param param * @return */ - @SysLog(title = "添加用户授权",biz = BizType.GRANT) + @SysLog(title = "角色",desc ="保存用户授权",biz = BizType.GRANT) @PostMapping("/saveUserRole") @PreAuthorize("hasRole('sys:userRole:grant')") @Transactional(rollbackFor = Exception.class) @@ -193,7 +196,7 @@ public class SysRoleController { * @param param * @return */ - @SysLog(title = "编辑页面关联用户角色",biz = BizType.GRANT) + @SysLog(title = "角色",desc ="编辑用户授权",biz = BizType.GRANT) @PostMapping("/saveUserRole4Edit") @PreAuthorize("hasRole('sys:userRole:editGrant')") @Transactional(rollbackFor = Exception.class) @@ -209,7 +212,7 @@ public class SysRoleController { * @param sysRoleUserParam * @return */ - @SysLog(title = "删除用户授权",biz = BizType.GRANT) + @SysLog(title = "角色",desc ="移除用户授权",biz = BizType.GRANT) @PostMapping("/removeUserRole") @PreAuthorize("hasRole('sys:userRole:delete')") public R deleteById(@RequestBody @Valid SysRoleUserParam sysRoleUserParam){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java index eef8ddd..2218438 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java @@ -1,8 +1,10 @@ package com.qs.serve.modules.sys.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.sys.entity.SysTenant; import com.qs.serve.modules.sys.service.SysTenantService; @@ -45,6 +47,7 @@ public class SysTenantController { * @param id * @return */ + @SysLog(title = "租户",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:tenant:query')") public R getById(@PathVariable("id") String id){ @@ -57,6 +60,7 @@ public class SysTenantController { * @param param * @return */ + @SysLog(title = "租户",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:tenant:insert')") public R save(@RequestBody @Valid SysTenant param){ @@ -69,6 +73,7 @@ public class SysTenantController { * @param param * @return */ + @SysLog(title = "租户",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:tenant:update')") public R updateById(@RequestBody @Valid SysTenant param){ @@ -81,6 +86,7 @@ public class SysTenantController { * @param id * @return */ + @SysLog(title = "租户",biz = BizType.DELETE) @PostMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:tenant:delete')") public R deleteById(@PathVariable("id") String id){ diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 69e03a8..2d0528b 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -86,7 +86,7 @@ public class SysUserController { * @param param * @return */ - @SysLog(title = "个人信息更新",biz = BizType.UPDATE) + @SysLog(title = "人员",desc = "个人信息更新",biz = BizType.UPDATE) @PostMapping("/updateInfo") public R updateInfo(@RequestBody @Valid SysUser param){ LoginUser loginUser = AuthContextUtils.getLoginUser(); @@ -107,7 +107,7 @@ public class SysUserController { * @param param * @return */ - @SysLog(title = "个人密码更新",biz = BizType.UPDATE) + @SysLog(title = "人员",desc = "个人密码更新",biz = BizType.UPDATE) @PostMapping("/updatePwd") public R updatePwd(@RequestBody @Valid SysUserPwdParam param){ LoginUser loginUser = AuthContextUtils.getLoginUser(); @@ -227,7 +227,7 @@ public class SysUserController { * @param id * @return */ - @SysLog(title = "用户查询",biz = BizType.QUERY) + @SysLog(title = "人员",desc = "用户查询",biz = BizType.QUERY) @GetMapping("/getById/{id}") @PreAuthorize("hasRole('sys:user:query')") public R getById(@PathVariable("id") String id){ @@ -245,7 +245,7 @@ public class SysUserController { * @param param * @return */ - @SysLog(title = "用户保存",biz = BizType.INSERT) + @SysLog(title = "人员",desc = "用户新增",biz = BizType.INSERT) @PostMapping("/save") @PreAuthorize("hasRole('sys:user:insert')") @Transactional(rollbackFor = Exception.class) @@ -274,7 +274,7 @@ public class SysUserController { * @param uid * @return */ - @SysLog(title = "重置用户密码",biz = BizType.RESET) + @SysLog(title = "人员",desc = "重置密码",biz = BizType.RESET) @PostMapping("/resetPwd/{uid}") @PreAuthorize("hasRole('sys:user:reset')") public R resetPwd(@PathVariable("uid") String uid){ @@ -294,7 +294,7 @@ public class SysUserController { * @param param * @return */ - @SysLog(title = "用户更新",biz = BizType.UPDATE) + @SysLog(title = "人员",desc = "用户更新",biz = BizType.UPDATE) @PostMapping("/updateById") @PreAuthorize("hasRole('sys:user:update')") @Transactional(rollbackFor = Exception.class) @@ -317,7 +317,7 @@ public class SysUserController { * @param id * @return */ - @SysLog(title = "用户删除",biz = BizType.DELETE) + @SysLog(title = "人员",desc = "用户删除",biz = BizType.DELETE) @PostMapping("/deleteById/{id}") @PreAuthorize("hasRole('sys:user:delete')") public R deleteById(@PathVariable("id") String id){ @@ -332,7 +332,7 @@ public class SysUserController { * @return */ @PostMapping("/tranPost") - @SysLog(title = "人员职务调动") + @SysLog(title = "人员",desc = "职务调动") @PreAuthorize("hasRole('sys:user:post')") @LimitSubmit(interval = 5000) public R tranPost(@RequestBody @Valid SysUserTranPostParam param){ @@ -349,7 +349,7 @@ public class SysUserController { * @param param * @return */ - @SysLog(title = "在职调动") + @SysLog(title = "人员",desc = "在职调动") @PostMapping("/leave") @PreAuthorize("hasRole('sys:user:leave')") @LimitSubmit(interval = 5000) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4e9f1b8..c92699e 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -19,8 +19,6 @@ spring: #项目配置 project: upload: - #临时文件 - temp-path: D:\\WebMapPath\\temp\\ #上传映射地址 proxy-url: http://183.234.29.228:6021/ #物理存储地址