From 2cfc9c9a953200566c06705e1c5b6b4bb48fd326 Mon Sep 17 00:00:00 2001 From: aeizzz <1129603149@qq.com> Date: Thu, 8 Dec 2022 21:38:14 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/app/api/feign/RemoteAppUserService.java | 8 ++------ .../pigx/app/controller/AppRoleController.java | 2 +- .../pigx/app/controller/AppUserController.java | 1 - .../com/pig4cloud/pigx/app/mapper/AppMenuMapper.java | 3 ++- .../pig4cloud/pigx/app/service/AppMenuService.java | 2 -- .../pigx/app/service/AppRoleMenuService.java | 3 ++- .../pig4cloud/pigx/app/service/AppRoleService.java | 3 ++- .../pig4cloud/pigx/app/service/AppUserService.java | 1 + .../pigx/app/service/impl/AppRoleMenuServiceImpl.java | 1 + .../pigx/app/service/impl/AppRoleServiceImpl.java | 2 ++ .../pigx/common/core/constant/CacheConstants.java | 1 - .../pigx/common/core/constant/SecurityConstants.java | 1 - .../pigx/common/core/constant/enums/UserTypeEnum.java | 4 ++-- .../pigx/common/core/exception/ErrorCodes.java | 2 -- .../data/datascope/PigxDefaultDatascopeHandle.java | 2 +- .../service/PigxAppUserDetailsServiceImpl.java | 6 +++--- .../service/PigxMobildAppUserDetailsServiceImpl.java | 7 ++++--- .../service/PigxMobileUserDetailServiceImpl.java | 8 ++++---- .../security/service/PigxUserDetailsService.java | 2 +- .../pigx/admin/service/impl/SysUserServiceImpl.java | 11 ++++------- 20 files changed, 32 insertions(+), 38 deletions(-) diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java index 634d5ca65..9e2bbf3ec 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/feign/RemoteAppUserService.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.app.api.feign; - import com.pig4cloud.pigx.app.api.dto.AppUserInfo; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants; @@ -39,9 +38,8 @@ public interface RemoteAppUserService { /** * 通过用户名查询用户、角色信息 - * * @param username 用户名 - * @param from 调用标志 + * @param from 调用标志 * @return R */ @GetMapping("/appuser/info/{username}") @@ -56,12 +54,10 @@ public interface RemoteAppUserService { @GetMapping("/appuser/social/info/{inStr}") R social(@PathVariable("inStr") String inStr, @RequestHeader(SecurityConstants.FROM) String from); - /** * 锁定用户 - * * @param username 用户名 - * @param from 调用标识 + * @param from 调用标识 * @return */ @PutMapping("/user/lock/{username}") diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java index d9a9b415d..2cddd424a 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java @@ -121,7 +121,6 @@ public class AppRoleController { return R.ok(appRoleService.removeById(roleId)); } - /** * 更新角色菜单 * @param roleVo 角色对象 @@ -133,6 +132,7 @@ public class AppRoleController { public R saveRoleMenus(@RequestBody AppRoleVO roleVo) { return R.ok(appRoleService.updateRoleMenus(roleVo)); } + /** * 导出excel 表格 * @param appRole 查询条件 diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java index 1b94dbff4..ac75b5ffc 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java @@ -53,7 +53,6 @@ public class AppUserController { private final AppUserService appUserService; - @Inner @GetMapping("/info/{username}") public R info(@PathVariable String username) { diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java index 428140125..960f52854 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/mapper/AppMenuMapper.java @@ -32,5 +32,6 @@ import java.util.List; @Mapper public interface AppMenuMapper extends PigxBaseMapper { - List listMenusByRoleId(Long roleId); + List listMenusByRoleId(Long roleId); + } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java index edcc09ff6..445c48e69 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppMenuService.java @@ -34,7 +34,6 @@ import java.util.Set; */ public interface AppMenuService extends IService { - /** * 通过角色编号查询URL 权限 * @param roleId 角色ID @@ -72,5 +71,4 @@ public interface AppMenuService extends IService { */ List> filterMenu(Set voSet, String type, Long parentId); - } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleMenuService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleMenuService.java index f8c9fd7f2..f01bd2fa9 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleMenuService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleMenuService.java @@ -28,5 +28,6 @@ import com.pig4cloud.pigx.app.api.entity.AppRoleMenu; */ public interface AppRoleMenuService extends IService { - Boolean saveRoleMenus(Long roleId, String menuIds); + Boolean saveRoleMenus(Long roleId, String menuIds); + } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java index 627858e94..ee28639be 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppRoleService.java @@ -32,7 +32,8 @@ import java.util.List; */ public interface AppRoleService extends IService { - Boolean updateRoleMenus(AppRoleVO roleVo); + Boolean updateRoleMenus(AppRoleVO roleVo); List findRolesByUserId(Long userId); + } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppUserService.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppUserService.java index e7e6153da..4a76be663 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppUserService.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/AppUserService.java @@ -46,4 +46,5 @@ public interface AppUserService extends IService { Boolean deleteUserById(Long userId); AppUserInfo findUserInfo(AppUser user); + } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java index e8f63be4b..a682433a8 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/service/impl/AppRoleMenuServiceImpl.java @@ -55,4 +55,5 @@ public class AppRoleMenuServiceImpl extends ServiceImpl implements AppRoleService { + private final AppRoleMenuService appRoleMenuService; @Override @@ -47,4 +48,5 @@ public class AppRoleServiceImpl extends ServiceImpl impl public List findRolesByUserId(Long userId) { return baseMapper.listRolesByUserId(userId); } + } diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java index 1f29262b7..bb617df6d 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -30,7 +30,6 @@ public interface CacheConstants { */ String USER_DETAILS = "user_details"; - /** * 移动端用户信息缓存 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java index 5f97fc48e..e841678b8 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java @@ -95,7 +95,6 @@ public interface SecurityConstants { */ String GRANT_MOBILE = "mobile"; - /** * 小程序授权 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/UserTypeEnum.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/UserTypeEnum.java index a2e5405e4..e72d15d48 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/UserTypeEnum.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/enums/UserTypeEnum.java @@ -7,8 +7,7 @@ import lombok.Getter; @AllArgsConstructor public enum UserTypeEnum { - TOB("0","面向后台应用"), - TOC("1","面向小程序"); + TOB("0", "面向后台应用"), TOC("1", "面向小程序"); /** * 类型 @@ -19,4 +18,5 @@ public enum UserTypeEnum { * 描述 */ private final String description; + } diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ErrorCodes.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ErrorCodes.java index 534eb331c..08c223cb1 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ErrorCodes.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/exception/ErrorCodes.java @@ -23,7 +23,6 @@ public interface ErrorCodes { */ String SYS_USER_USERNAME_EXISTING = "sys.user.username.existing"; - /** * 用户已存在 */ @@ -106,7 +105,6 @@ public interface ErrorCodes { */ String SYS_CONNECT_CP_USER_SYNC_ERROR = "sys.connect.cp.user.sync.error"; - /** * 用户信息为空 */ diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java index e3f607aae..ad5ade7eb 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/PigxDefaultDatascopeHandle.java @@ -55,7 +55,7 @@ public class PigxDefaultDatascopeHandle implements DataScopeHandle { @Override public Boolean calcScope(DataScope dataScope) { PigxUser user = SecurityUtils.getUser(); - if(UserTypeEnum.TOC.getStatus().equals(user.getUserType())){ + if (UserTypeEnum.TOC.getStatus().equals(user.getUserType())) { return true; } List roleIdList = user.getAuthorities().stream().map(GrantedAuthority::getAuthority) diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxAppUserDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxAppUserDetailsServiceImpl.java index 1b0673aeb..58c60ae1f 100755 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxAppUserDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxAppUserDetailsServiceImpl.java @@ -54,6 +54,7 @@ import java.util.Set; public class PigxAppUserDetailsServiceImpl implements PigxUserDetailsService { private final CacheManager cacheManager; + private final RemoteAppUserService remoteAppUserService; /** @@ -70,13 +71,12 @@ public class PigxAppUserDetailsServiceImpl implements PigxUserDetailsService { } R info = remoteAppUserService.info(username, SecurityConstants.FROM_IN); UserDetails userDetailsAppUser = this.getUserDetailsAppUser(info); - if(cache != null){ + if (cache != null) { cache.put(username, userDetailsAppUser); } return userDetailsAppUser; } - @Override public UserDetails loadUserByUser(PigxUser pigxUser) { return pigxUser; @@ -112,7 +112,7 @@ public class PigxAppUserDetailsServiceImpl implements PigxUserDetailsService { return new PigxUser(user.getUserId(), user.getUsername(), null, user.getPhone(), user.getAvatar(), user.getNickname(), user.getName(), user.getEmail(), user.getTenantId(), - SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOC.getStatus(),true, + SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOC.getStatus(), true, !CommonConstants.STATUS_LOCK.equals(user.getLockFlag()), authorities); } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobildAppUserDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobildAppUserDetailsServiceImpl.java index 62a162e3e..a8e63a62f 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobildAppUserDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobildAppUserDetailsServiceImpl.java @@ -52,7 +52,9 @@ import java.util.Set; public class PigxMobildAppUserDetailsServiceImpl implements PigxUserDetailsService { private final UserDetailsService pigxAppUserDetailsServiceImpl; + private final CacheManager cacheManager; + private final RemoteAppUserService remoteAppUserService; /** @@ -69,13 +71,12 @@ public class PigxMobildAppUserDetailsServiceImpl implements PigxUserDetailsServi } R info = remoteAppUserService.social(phone, SecurityConstants.FROM_IN); UserDetails userDetailsAppUser = this.getUserDetailsAppUser(info); - if(cache != null){ + if (cache != null) { cache.put(phone, userDetailsAppUser); } return userDetailsAppUser; } - @Override public UserDetails loadUserByUser(PigxUser pigxUser) { return pigxAppUserDetailsServiceImpl.loadUserByUsername(pigxUser.getUsername()); @@ -111,7 +112,7 @@ public class PigxMobildAppUserDetailsServiceImpl implements PigxUserDetailsServi return new PigxUser(user.getUserId(), user.getUsername(), null, user.getPhone(), user.getAvatar(), user.getNickname(), user.getName(), user.getEmail(), user.getTenantId(), - SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOC.getStatus(),true, + SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOC.getStatus(), true, !CommonConstants.STATUS_LOCK.equals(user.getLockFlag()), authorities); } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java index 0bf03e266..c89481e86 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxMobileUserDetailServiceImpl.java @@ -20,9 +20,10 @@ import org.springframework.security.core.userdetails.UserDetailsService; @RequiredArgsConstructor public class PigxMobileUserDetailServiceImpl implements PigxUserDetailsService { - private final UserDetailsService pigxDefaultUserDetailsServiceImpl; + private final RemoteUserService remoteUserService; + private final CacheManager cacheManager; @Override @@ -47,11 +48,9 @@ public class PigxMobileUserDetailServiceImpl implements PigxUserDetailsService { return pigxDefaultUserDetailsServiceImpl.loadUserByUsername(pigxUser.getUsername()); } - /** * 支持所有的 mobile 类型 - * - * @param clientId 目标客户端 + * @param clientId 目标客户端 * @param grantType 授权类型 * @return true/false */ @@ -59,4 +58,5 @@ public class PigxMobileUserDetailServiceImpl implements PigxUserDetailsService { public boolean support(String clientId, String grantType) { return SecurityConstants.GRANT_MOBILE.equals(grantType) && !SecurityConstants.CLIENT_MINI.equals(clientId); } + } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java index 7dc968dc1..3c0100f65 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsService.java @@ -96,7 +96,7 @@ public interface PigxUserDetailsService extends UserDetailsService, Ordered { return new PigxUser(user.getUserId(), user.getUsername(), user.getDeptId(), user.getPhone(), user.getAvatar(), user.getNickname(), user.getName(), user.getEmail(), user.getTenantId(), - SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOB.getStatus(),true, + SecurityConstants.BCRYPT + user.getPassword(), true, true, UserTypeEnum.TOB.getStatus(), true, !CommonConstants.STATUS_LOCK.equals(user.getLockFlag()), authorities); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 77c07408e..7a61c3f7c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -209,13 +209,10 @@ public class SysUserServiceImpl extends ServiceImpl impl public R updateUser(UserDTO userDto) { SysUser sysUser = new SysUser(); - - boolean exists = baseMapper.exists(Wrappers.lambdaQuery() - .eq(SysUser::getPhone, userDto.getPhone()) - .ne(SysUser::getUserId, userDto.getUserId()) - ); - if(exists){ - return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING,userDto.getPhone())); + boolean exists = baseMapper.exists(Wrappers.lambdaQuery().eq(SysUser::getPhone, userDto.getPhone()) + .ne(SysUser::getUserId, userDto.getUserId())); + if (exists) { + return R.failed(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, userDto.getPhone())); } BeanUtils.copyProperties(userDto, sysUser);