wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

fix():修复admin账号为空的问题

dev.saas.ylys^2
王鑫 2024-10-10 14:05:26 +08:00 committed by yanchouchou
parent 30b4cde2f3
commit a710cd7390
6 changed files with 43 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
View File

@ -24,6 +24,6 @@ public class ServiceNameConstants {
/**
* 车辆服务的serviceid
*/
public static final String ENTERPRISE_SERVICE = "cloud-enterprise";
public static final String ENTERPRISE_SERVICE = "cloud-saas";
}

2
cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -1,6 +1,6 @@
# Tomcat
server:
port: 8080
port: 18080
# nacos线上地址
nacos:

5
cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java
View File

@ -1,5 +1,6 @@
package com.muyu.remote;
import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.ServiceNameConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.system.domain.SysUser;
@ -21,8 +22,8 @@ import java.util.List;
@FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue")
public interface RemoteFirmUserService {
@GetMapping("/firmUser/info/{username}")
public Result<SysUser> info(@PathVariable("username") String username);
@GetMapping("/saas/firmUser/info/{username}")
public Result<SysUser> info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FIRM_KEY) String firmKey);

2
cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java
View File

@ -20,7 +20,7 @@ public class RemoteFirmFallbackFactory implements FallbackFactory<RemoteFirmUser
return new RemoteFirmUserService() {
@Override
public Result<SysUser> info(String username) {
public Result<SysUser> info(String username, String firmKey) {
return Result.error("查询数据失败："+cause.getMessage());
}
};

2
cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
View File

@ -7,7 +7,7 @@ nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: xyr
namespace: wx
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:

87
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.bean.BeanValidators;
import com.muyu.common.datascope.annotation.DataScope;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.common.system.domain.SysFirmDatasource;
import com.muyu.common.system.domain.SysRole;
import com.muyu.common.system.domain.SysUser;
import com.muyu.remote.RemoteFirmUserService;
@ -16,6 +17,7 @@ import com.muyu.system.domain.SysPost;
import com.muyu.system.domain.SysUserPost;
import com.muyu.system.domain.SysUserRole;
import com.muyu.system.mapper.*;
import com.muyu.system.service.SysFirmDatasourceService;
import com.muyu.system.service.SysUserService;
import com.muyu.system.service.SysConfigService;
import jakarta.annotation.Resource;
@ -55,17 +57,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private SysConfigService configService;
@Resource
private RemoteFirmUserService remoteFirmUserService;
@Resource
private SysFirmDatasourceService sysFirmDatasourceService;
/**
* 根据条件分页查询用户列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList (SysUser user) {
public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}
@ -73,12 +76,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 根据条件分页查询已分配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectAllocatedList (SysUser user) {
public List<SysUser> selectAllocatedList(SysUser user) {
return userMapper.selectAllocatedList(user);
}
@ -86,12 +88,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 根据条件分页查询未分配用户角色列表
*
* @param user 用户信息
*
* @return 用户信息集合信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUnallocatedList (SysUser user) {
public List<SysUser> selectUnallocatedList(SysUser user) {
return userMapper.selectUnallocatedList(user);
}
@ -103,14 +104,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @return 用户对象信息
*/
@Override
public SysUser selectUserByUserName (String userName, Long firmId) {
public SysUser selectUserByUserName(String userName, Long firmId) {
SysUser sysUser = null;
if (firmId == 1){
if (firmId == 1) {
sysUser = userMapper.selectUserByUserName(userName);
}else {
Result<SysUser> result = remoteFirmUserService.info(userName);
if (result.getCode() == Result.SUCCESS){
} else {
SysFirmDatasource datasource = sysFirmDatasourceService.getById(firmId);
Result<SysUser> result = remoteFirmUserService.info(userName, datasource.getDatabaseName());
if (result.getCode() == Result.SUCCESS) {
sysUser = result.getData();
}
List<SysRole> byUserIdAndFirmId = roleMapper.findByUserIdAndFirmId(sysUser.getUserId(), sysUser.getFirmId());
@ -124,11 +126,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 通过用户ID查询用户
*
* @param userId 用户ID
*
* @return 用户对象信息
*/
@Override
public SysUser selectUserById (Long userId) {
public SysUser selectUserById(Long userId) {
return userMapper.selectUserById(userId);
}
@ -136,11 +137,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 查询用户所属角色组
*
* @param userName 用户名
*
* @return 结果
*/
@Override
public String selectUserRoleGroup (String userName) {
public String selectUserRoleGroup(String userName) {
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
@ -152,11 +152,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 查询用户所属岗位组
*
* @param userName 用户名
*
* @return 结果
*/
@Override
public String selectUserPostGroup (String userName) {
public String selectUserPostGroup(String userName) {
List<SysPost> list = postMapper.selectPostsByUserName(userName);
if (CollectionUtils.isEmpty(list)) {
return StringUtils.EMPTY;
@ -168,11 +167,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验用户名称是否唯一
*
* @param user 用户信息
*
* @return 结果
*/
@Override
public boolean checkUserNameUnique (SysUser user) {
public boolean checkUserNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
@ -185,11 +183,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验手机号码是否唯一
*
* @param user 用户信息
*
* @return
*/
@Override
public boolean checkPhoneUnique (SysUser user) {
public boolean checkPhoneUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
@ -202,11 +199,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 校验email是否唯一
*
* @param user 用户信息
*
* @return
*/
@Override
public boolean checkEmailUnique (SysUser user) {
public boolean checkEmailUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
@ -221,7 +217,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @param user 用户信息
*/
@Override
public void checkUserAllowed (SysUser user) {
public void checkUserAllowed(SysUser user) {
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
throw new ServiceException("不允许操作超级管理员用户");
}
@ -233,7 +229,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @param userId 用户id
*/
@Override
public void checkUserDataScope (Long userId) {
public void checkUserDataScope(Long userId) {
if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
SysUser user = new SysUser();
user.setUserId(userId);
@ -248,12 +244,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 新增保存用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertUser (SysUser user) {
public int insertUser(SysUser user) {
// 新增用户信息
int rows = userMapper.insertUser(user);
// 新增用户岗位关联
@ -267,11 +262,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 注册用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
public boolean registerUser (SysUser user) {
public boolean registerUser(SysUser user) {
return userMapper.insertUser(user) > 0;
}
@ -279,12 +273,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改保存用户信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updateUser (SysUser user) {
public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
@ -305,7 +298,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void insertUserAuth (Long userId, Long[] roleIds) {
public void insertUserAuth(Long userId, Long[] roleIds) {
userRoleMapper.deleteUserRoleByUserId(userId);
insertUserRole(userId, roleIds);
}
@ -314,11 +307,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改用户状态
*
* @param user 用户信息
*
* @return 结果
*/
@Override
public int updateUserStatus (SysUser user) {
public int updateUserStatus(SysUser user) {
return userMapper.updateUser(user);
}
@ -326,11 +318,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 修改用户基本信息
*
* @param user 用户信息
*
* @return 结果
*/
@Override
public int updateUserProfile (SysUser user) {
public int updateUserProfile(SysUser user) {
return userMapper.updateUser(user);
}
@ -339,11 +330,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param userName 用户名
* @param avatar 头像地址
*
* @return 结果
*/
@Override
public boolean updateUserAvatar (String userName, String avatar) {
public boolean updateUserAvatar(String userName, String avatar) {
return userMapper.updateUserAvatar(userName, avatar) > 0;
}
@ -351,11 +341,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 重置用户密码
*
* @param user 用户信息
*
* @return 结果
*/
@Override
public int resetPwd (SysUser user) {
public int resetPwd(SysUser user) {
return userMapper.updateUser(user);
}
@ -364,11 +353,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param userName 用户名
* @param password 密码
*
* @return 结果
*/
@Override
public int resetUserPwd (String userName, String password) {
public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}
@ -377,7 +365,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param user 用户对象
*/
public void insertUserRole (SysUser user) {
public void insertUserRole(SysUser user) {
this.insertUserRole(user.getUserId(), user.getRoleIds());
}
@ -386,7 +374,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*
* @param user 用户对象
*/
public void insertUserPost (SysUser user) {
public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
if (StringUtils.isNotEmpty(posts)) {
// 新增用户与岗位管理
@ -407,7 +395,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @param userId 用户ID
* @param roleIds 角色组
*/
public void insertUserRole (Long userId, Long[] roleIds) {
public void insertUserRole(Long userId, Long[] roleIds) {
if (StringUtils.isNotEmpty(roleIds)) {
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
@ -425,12 +413,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 通过用户ID删除用户
*
* @param userId 用户ID
*
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteUserById (Long userId) {
public int deleteUserById(Long userId) {
// 删除用户与角色关联
userRoleMapper.deleteUserRoleByUserId(userId);
// 删除用户与岗位表
@ -442,12 +429,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* 批量删除用户信息
*
* @param userIds 需要删除的用户ID
*
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int deleteUserByIds (Long[] userIds) {
public int deleteUserByIds(Long[] userIds) {
for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
@ -465,11 +451,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
* @param userList 用户数据列表
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
* @param operName 操作用户
*
* @return 结果
*/
@Override
public String importUser (List<SysUser> userList, Boolean isUpdateSupport, String operName) {
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
if (StringUtils.isNull(userList) || userList.size() == 0) {
throw new ServiceException("导入用户数据不能为空！");
}