From dc24b8a8ce6787f1dccc8425b5dd31252edbbbfd Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 10 Apr 2023 15:04:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=89=E5=85=A8=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A4=B1?= =?UTF-8?q?=E8=B4=A51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mnt/service/impl/DeployServiceImpl.java | 3 ++- .../security/rest/AuthorizationController.java | 4 ++-- .../org/nl/modules/system/rest/MenuController.java | 4 ++-- .../nl/modules/system/rest/MonitorController.java | 2 +- .../org/nl/modules/system/rest/RoleController.java | 4 ++-- .../org/nl/modules/system/rest/UserController.java | 14 +++++++------- .../system/service/impl/CodeDetailServiceImpl.java | 6 +++--- .../system/service/impl/GenCodeServiceImpl.java | 6 +++--- .../system/service/impl/ParamServiceImpl.java | 6 +++--- .../system/service/impl/UserServiceImpl.java | 3 ++- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/DeployServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/DeployServiceImpl.java index a1a1255..679204d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/DeployServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/mnt/service/impl/DeployServiceImpl.java @@ -19,6 +19,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.utils.UserInfoUtil; import org.nl.exception.BadRequestException; import org.nl.modules.mnt.domain.App; import org.nl.modules.mnt.domain.Deploy; @@ -204,7 +205,7 @@ public class DeployServiceImpl implements DeployService { //还原信息入库 DeployHistory deployHistory = new DeployHistory(); deployHistory.setAppName(appName); - deployHistory.setDeployUser(SecurityUtils.getCurrentUsername()); + deployHistory.setDeployUser(UserInfoUtil.getNickName()); deployHistory.setIp(ip); deployHistory.setDeployId(id); deployHistoryService.create(deployHistory); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java index 3dcb203..5ee988c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/AuthorizationController.java @@ -36,7 +36,7 @@ import org.nl.modules.security.service.dto.AuthUserDto; import org.nl.modules.security.service.dto.JwtUserDto; import org.nl.utils.RedisUtils; import org.nl.utils.RsaUtils; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -114,7 +114,7 @@ public class AuthorizationController { @ApiOperation("获取用户信息") @GetMapping(value = "/info") public ResponseEntity getUserInfo() { - return ResponseEntity.ok(SecurityUtils.getCurrentUser()); + return ResponseEntity.ok(UserInfoUtil.getNickName()); } @ApiOperation("获取验证码") diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java index 850c6a0..9a49254 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MenuController.java @@ -27,7 +27,7 @@ import org.nl.modules.system.service.dto.MenuDto; import org.nl.modules.system.service.dto.MenuQueryCriteria; import org.nl.modules.system.service.mapstruct.MenuMapper; import org.nl.utils.PageUtil; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; @@ -63,7 +63,7 @@ public class MenuController { @GetMapping(value = "/build") @ApiOperation("获取前端所需菜单") public ResponseEntity buildMenus(){ - List menuDtoList = menuService.findByUser(SecurityUtils.getCurrentUserId()); + List menuDtoList = menuService.findByUser(UserInfoUtil.getCurrentUserId()); List menuDtos = menuService.buildTree(menuDtoList); return new ResponseEntity<>(menuService.buildMenus(menuDtos),HttpStatus.OK); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java index 0eaccb2..a12faa8 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java @@ -40,7 +40,7 @@ public class MonitorController { @GetMapping @ApiOperation("查询服务监控") - @PreAuthorize("@el.check('monitor:list')") +// @PreAuthorize("@el.check('monitor:list')") public ResponseEntity query(){ return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java index c6f8185..5a6b023 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RoleController.java @@ -26,7 +26,7 @@ import org.nl.modules.system.service.RoleService; import org.nl.modules.system.service.dto.RoleDto; import org.nl.modules.system.service.dto.RoleQueryCriteria; import org.nl.modules.system.service.dto.RoleSmallDto; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -143,7 +143,7 @@ public class RoleController { * @return / */ private int getLevels(Integer level){ - List levels = roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()); + List levels = roleService.findByUsersId(UserInfoUtil.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList()); int min = Collections.min(levels); if(level != null){ if(level < min){ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index 5481004..9fbbc07 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -30,7 +30,7 @@ import org.nl.modules.system.service.dto.UserDto; import org.nl.modules.system.service.dto.UserQueryCriteria; import org.nl.utils.PageUtil; import org.nl.utils.RsaUtils; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.nl.utils.enums.CodeEnum; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -83,7 +83,7 @@ public class UserController { criteria.getDeptIds().addAll(deptService.getDeptChildren(deptService.findByPid(criteria.getDeptId()))); } // 数据权限 - List dataScopes = dataService.getDeptIds(userService.findByName(SecurityUtils.getCurrentUsername())); + List dataScopes = dataService.getDeptIds(userService.findByName(UserInfoUtil.getNickName())); // criteria.getDeptIds() 不为空并且数据权限不为空则取交集 if (!CollectionUtils.isEmpty(criteria.getDeptIds()) && !CollectionUtils.isEmpty(dataScopes)){ // 取交集 @@ -125,7 +125,7 @@ public class UserController { @ApiOperation("修改用户：个人中心") @PutMapping(value = "center") public ResponseEntity center(@Validated(User.Update.class) @RequestBody User resources){ - if(!resources.getId().equals(SecurityUtils.getCurrentUserId())){ + if(!resources.getId().equals(UserInfoUtil.getCurrentUserId())){ throw new BadRequestException("不能修改他人资料"); } userService.updateCenter(resources); @@ -138,7 +138,7 @@ public class UserController { @PreAuthorize("@el.check('user:del')") public ResponseEntity delete(@RequestBody Set ids){ for (Long id : ids) { - Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.findByUsersId(UserInfoUtil.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); Integer optLevel = Collections.min(roleService.findByUsersId(id).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足，不能删除：" + userService.findById(id).getUsername()); @@ -153,7 +153,7 @@ public class UserController { public ResponseEntity updatePass(@RequestBody UserPassVo passVo) throws Exception { String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getOldPass()); String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getNewPass()); - UserDto user = userService.findByName(SecurityUtils.getCurrentUsername()); + UserDto user = userService.findByName(UserInfoUtil.getNickName()); if(!passwordEncoder.matches(oldPass, user.getPassword())){ throw new BadRequestException("修改失败，旧密码错误"); } @@ -175,7 +175,7 @@ public class UserController { @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateEmail(@PathVariable String code,@RequestBody User user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); - UserDto userDto = userService.findByName(SecurityUtils.getCurrentUsername()); + UserDto userDto = userService.findByName(UserInfoUtil.getNickName()); if(!passwordEncoder.matches(password, userDto.getPassword())){ throw new BadRequestException("密码错误"); } @@ -189,7 +189,7 @@ public class UserController { * @param resources / */ private void checkLevel(User resources) { - Integer currentLevel = Collections.min(roleService.findByUsersId(SecurityUtils.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); + Integer currentLevel = Collections.min(roleService.findByUsersId(UserInfoUtil.getCurrentUserId()).stream().map(RoleSmallDto::getLevel).collect(Collectors.toList())); Integer optLevel = roleService.findByRoles(resources.getRoles()); if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java index d0ef86b..731f288 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/CodeDetailServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.IdUtil; import lombok.RequiredArgsConstructor; import com.alibaba.fastjson.JSONObject; import org.nl.modules.system.service.CodeDetailService; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; @@ -48,7 +48,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { json.put("code_rule_id",dict.get("id")); json.put("is_active","1"); json.put("is_delete","0"); - json.put("create_by",SecurityUtils.getCurrentUsername()); + json.put("create_by",UserInfoUtil.getNickName()); json.put("create_time", now); if(form.get("type").equals("02")){ Date date = DateUtil.date(); @@ -69,7 +69,7 @@ public class CodeDetailServiceImpl implements CodeDetailService { public void update(JSONObject json) { String now = DateUtil.now(); json.put("update_time",now); - json.put("update_by", SecurityUtils.getCurrentUsername()); + json.put("update_by", UserInfoUtil.getNickName()); WQLObject.getWQLObject("sys_code_rule_detail").update(json); } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 672c5d8..3a89bd7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.exception.BadRequestException; import org.nl.modules.system.service.GenCodeService; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; @@ -57,7 +57,7 @@ public class GenCodeServiceImpl implements GenCodeService { json.put("name", form.get("name")); json.put("is_active", "1"); json.put("is_delete", "0"); - json.put("create_by", SecurityUtils.getCurrentUsername()); + json.put("create_by", UserInfoUtil.getNickName()); json.put("create_time", now); WQLObject.getWQLObject("sys_code_rule").insert(json); } @@ -74,7 +74,7 @@ public class GenCodeServiceImpl implements GenCodeService { public void update(JSONObject json) { String now = DateUtil.now(); json.put("update_time", now); - json.put("update_by", SecurityUtils.getCurrentUsername()); + json.put("update_by", UserInfoUtil.getNickName()); WQLObject.getWQLObject("sys_code_rule").update(json); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java index 02148e6..ddc0662 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java @@ -13,7 +13,7 @@ import org.nl.exception.BadRequestException; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.service.dto.ParamDto; import org.nl.utils.FileUtil; -import org.nl.utils.SecurityUtils; +import org.nl.common.utils.UserInfoUtil; import org.nl.wql.core.bean.ResultBean; import org.nl.wql.core.bean.WQLObject; import org.nl.wql.util.WqlUtil; @@ -73,7 +73,7 @@ public class ParamServiceImpl implements ParamService { @Override @Transactional(rollbackFor = Exception.class) public void create(ParamDto dto) { - String currentUsername = SecurityUtils.getCurrentUsername(); + String currentUsername = UserInfoUtil.getNickName(); String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); @@ -93,7 +93,7 @@ public class ParamServiceImpl implements ParamService { ParamDto entity = this.findById(dto.getId()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - String currentUsername = SecurityUtils.getCurrentUsername(); + String currentUsername = UserInfoUtil.getNickName(); String now = DateUtil.now(); dto.setUpdate_time(now); dto.setUpdate_by(currentUsername); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java index 592e49e..53d8bc3 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/UserServiceImpl.java @@ -17,6 +17,7 @@ package org.nl.modules.system.service.impl; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; +import org.nl.common.utils.UserInfoUtil; import org.nl.config.FileProperties; import org.nl.exception.EntityExistException; import org.nl.exception.EntityNotFoundException; @@ -183,7 +184,7 @@ public class UserServiceImpl implements UserService { @Override @Transactional(rollbackFor = Exception.class) public Map updateAvatar(MultipartFile multipartFile) { - User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername()); + User user = userRepository.findByUsername(UserInfoUtil.getNickName()); String oldPath = user.getAvatarPath(); File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar()); user.setAvatarPath(Objects.requireNonNull(file).getPath());