|
|
@ -15,12 +15,15 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
package com.baiye.modules.system.service.impl;
|
|
|
|
package com.baiye.modules.system.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
import com.baiye.config.properties.FileProperties;
|
|
|
|
|
|
|
|
import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
import com.baiye.exception.EntityExistException;
|
|
|
|
import com.baiye.exception.EntityExistException;
|
|
|
|
import com.baiye.exception.EntityNotFoundException;
|
|
|
|
import com.baiye.exception.EntityNotFoundException;
|
|
|
|
import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
import com.baiye.modules.security.service.OnlineUserService;
|
|
|
|
import com.baiye.modules.security.service.UserCacheClean;
|
|
|
|
import com.baiye.modules.security.service.UserCacheClean;
|
|
|
|
|
|
|
|
import com.baiye.modules.system.domain.Role;
|
|
|
|
import com.baiye.modules.system.domain.User;
|
|
|
|
import com.baiye.modules.system.domain.User;
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
import com.baiye.modules.system.repository.UserRepository;
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
|
import com.baiye.modules.system.service.UserService;
|
|
|
@ -123,7 +126,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
|
|
|
|
redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
if(!resources.getEnabled()){
|
|
|
|
if (!resources.getEnabled()) {
|
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
user.setUsername(resources.getUsername());
|
|
|
|
user.setUsername(resources.getUsername());
|
|
|
@ -169,12 +172,22 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public UserDto findByName(String userName) {
|
|
|
|
public UserDto findByName(String userName) {
|
|
|
|
|
|
|
|
UserDto convert;
|
|
|
|
User user = userRepository.findByUsername(userName);
|
|
|
|
User user = userRepository.findByUsername(userName);
|
|
|
|
if (user == null) {
|
|
|
|
if (user == null) {
|
|
|
|
throw new EntityNotFoundException(User.class, "name", userName);
|
|
|
|
throw new EntityNotFoundException(User.class, "name", userName);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
return userMapper.toDto(user);
|
|
|
|
convert = Convert.convert(UserDto.class, user);
|
|
|
|
|
|
|
|
Set<Role> roles = user.getRoles();
|
|
|
|
|
|
|
|
convert.setIsManager(Boolean.FALSE);
|
|
|
|
|
|
|
|
for (Role role : roles) {
|
|
|
|
|
|
|
|
// TODO 修改管理员id
|
|
|
|
|
|
|
|
if (role.getId() == DefaultNumberConstants.EIGHT_NUMBER) {
|
|
|
|
|
|
|
|
convert.setIsManager(Boolean.TRUE);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return convert;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -192,8 +205,8 @@ public class UserServiceImpl implements UserService {
|
|
|
|
// 验证文件上传的格式
|
|
|
|
// 验证文件上传的格式
|
|
|
|
String image = "gif jpg png jpeg";
|
|
|
|
String image = "gif jpg png jpeg";
|
|
|
|
String fileType = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
|
|
|
|
String fileType = FileUtil.getExtensionName(multipartFile.getOriginalFilename());
|
|
|
|
if(fileType != null && !image.contains(fileType)){
|
|
|
|
if (fileType != null && !image.contains(fileType)) {
|
|
|
|
throw new BadRequestException("文件格式错误!, 仅支持 " + image +" 格式");
|
|
|
|
throw new BadRequestException("文件格式错误!, 仅支持 " + image + " 格式");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername());
|
|
|
|
User user = userRepository.findByUsername(SecurityUtils.getCurrentUsername());
|
|
|
|
String oldPath = user.getAvatarPath();
|
|
|
|
String oldPath = user.getAvatarPath();
|
|
|
|