From 42e13bd289018bd57286c427f4a1c833da77d292 Mon Sep 17 00:00:00 2001 From: mikochen <1059665047@qq.com> Date: Mon, 29 Mar 2021 11:50:48 +0800 Subject: [PATCH] =?UTF-8?q?SecurityUtil.java=E6=96=B0=E5=A2=9E=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=B8=BAObject=E3=80=82=20?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2System=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?Controller=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF=EF=BC=8C?= =?UTF-8?q?=E8=A7=A3=E5=86=B3https://gitee.com/pear-admin/Pear-Admin-Boot/?= =?UTF-8?q?issues/I3DIIZ=20=E6=8F=90=E5=87=BA=E7=9A=84create=5Fby=EF=BC=8C?= =?UTF-8?q?update=5Fby=EF=BC=8Ccreate=5Ftime,=20update=5Ftime=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=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 --- .../pearadmin/common/tools/secure/SecurityUtil.java | 8 ++++++++ .../src/main/resources/vm/java/controller.java.vm | 10 +++++++++- .../system/controller/SysNoticeController.java | 4 ++-- .../pearadmin/system/controller/SysUserController.java | 6 +++--- .../system/service/impl/ISysMailServiceImpl.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 1 + 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java b/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java index 0cad31eb..ec9b25d7 100644 --- a/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java +++ b/pear-common/src/main/java/com/pearadmin/common/tools/secure/SecurityUtil.java @@ -1,5 +1,6 @@ package com.pearadmin.common.tools.secure; + import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -32,5 +33,12 @@ public class SecurityUtil { Authentication auth = SecurityContextHolder.getContext().getAuthentication(); return !(auth instanceof AnonymousAuthenticationToken); } + /** + * 获取当前登录用户对象 + * retrun SysUser + * */ + public static Object currentUserObj(){ + return SecurityUtil.currentUser().getPrincipal(); + } } diff --git a/pear-modules/pear-generate/src/main/resources/vm/java/controller.java.vm b/pear-modules/pear-generate/src/main/resources/vm/java/controller.java.vm index 6676080a..1d1456f8 100644 --- a/pear-modules/pear-generate/src/main/resources/vm/java/controller.java.vm +++ b/pear-modules/pear-generate/src/main/resources/vm/java/controller.java.vm @@ -16,7 +16,7 @@ import ${packageName}.service.I${ClassName}Service; /** * ${functionName}Controller - * + * * @author ${author} * @date ${datetime} */ @@ -66,6 +66,10 @@ public class ${ClassName}Controller extends BaseController @PreAuthorize("hasPermission('/${moduleName}/${businessName}/add','${permissionPrefix}:add')") public Result save(@RequestBody ${ClassName} ${className}) { + SysUser sysUser = (SysUser)SecurityUtil.currentUserObj(); + ${className}.setCreateTime(LocalDateTime.now()); + ${className}.setCreateBy(sysUser.getUserId()); + ${className}.setCreateName(sysUser.getUserName()); return decide(${className}Service.insert${ClassName}(${className})); } @@ -89,6 +93,10 @@ public class ${ClassName}Controller extends BaseController @PreAuthorize("hasPermission('/${moduleName}/${businessName}/edit','${permissionPrefix}:edit')") public Result update(@RequestBody ${ClassName} ${className}) { + SysUser sysUser = (SysUser)SecurityUtil.currentUserObj(); + ${className}.setUpdateTime(LocalDateTime.now()); + ${className}.setUpdateBy(sysUser.getUserId()); + ${className}.setUpdateName(sysUser.getUserName()); return decide(${className}Service.update${ClassName}(${className})); } diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysNoticeController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysNoticeController.java index c8d429b6..81952997 100644 --- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysNoticeController.java +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysNoticeController.java @@ -27,7 +27,7 @@ import java.util.Map; /** * 消息控制器 - * + * * @author 就眠仪式 * @date 2021-03-13 */ @@ -76,7 +76,7 @@ public class SysNoticeController extends BaseController SysNotice privateParam = new SysNotice(); privateParam.setType("private"); - privateParam.setAccept(((SysUser) SecurityUtil.currentUser().getPrincipal()).getUserId()); + privateParam.setAccept(((SysUser)SecurityUtil.currentUserObj()).getUserId()); SysNotice noticeParam = new SysNotice(); noticeParam.setType("notice"); diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java index 12f21b84..3b87f519 100644 --- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/controller/SysUserController.java @@ -204,7 +204,7 @@ public class SysUserController extends BaseController { @PreAuthorize("hasPermission('/system/user/edit','sys:user:edit')") @Logging(title = "修改头像", describe = "修改头像", type = BusinessType.EDIT) public Result updateAvatar(@RequestBody SysUser sysUser) { - sysUser.setUserId(((SysUser)SecurityUtil.currentUser().getPrincipal()).getUserId()); + sysUser.setUserId(((SysUser)SecurityUtil.currentUserObj()).getUserId()); boolean result = sysUserService.update(sysUser); return decide(result); } @@ -247,7 +247,7 @@ public class SysUserController extends BaseController { @GetMapping("getUserMenu") @ApiOperation(value = "获取用户菜单数据") public List getUserMenu() { - SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal(); + SysUser sysUser = (SysUser)SecurityUtil.currentUserObj(); List menus = sysUserService.getUserMenu(sysUser.getUsername()); return sysUserService.toUserMenu(menus, "0"); } @@ -286,7 +286,7 @@ public class SysUserController extends BaseController { @GetMapping("center") @ApiOperation(value = "个人资料") public ModelAndView center(Model model) { - SysUser sysUser = (SysUser) SecurityUtil.currentUser().getPrincipal(); + SysUser sysUser = (SysUser) SecurityUtil.currentUserObj(); model.addAttribute("userInfo", sysUserService.getById(sysUser.getUserId())); model.addAttribute("logs", sysLogService.selectTopLoginLog(sysUser.getUsername())); return jumpPage(MODULE_PATH + "center"); diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysMailServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysMailServiceImpl.java index c96fff4b..fa64d780 100644 --- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysMailServiceImpl.java +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/ISysMailServiceImpl.java @@ -35,7 +35,7 @@ public class ISysMailServiceImpl implements ISysMailService { public Integer save(SysMail sysMail) { if (sendMail(sysMail)) { sysMail.setMailId(SequenceUtil.makeStringId()); - sysMail.setCreateBy(((SysUser) SecurityUtil.currentUser().getPrincipal()).getUsername()); + sysMail.setCreateBy(((SysUser)SecurityUtil.currentUserObj()).getUsername()); return sysMailMapper.insert(sysMail); } else { return 0; diff --git a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java index 2f4e8268..79455778 100644 --- a/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java +++ b/pear-modules/pear-system/src/main/java/com/pearadmin/system/service/impl/SysUserServiceImpl.java @@ -165,6 +165,7 @@ public class SysUserServiceImpl implements ISysUserService { * Param: SysUser * Return: 操作结果 * */ + @Override public List getUserRole(String userId){ List allRole = sysRoleMapper.selectList(null); List myRole = sysUserRoleMapper.selectByUserId(userId); -- Gitee