|
|
|
@ -30,6 +30,7 @@ import com.baiye.constant.DefaultNumberConstants;
|
|
|
|
|
import com.baiye.constant.RoleNumberConstants;
|
|
|
|
|
import com.baiye.exception.BadRequestException;
|
|
|
|
|
import com.baiye.exception.EntityExistException;
|
|
|
|
|
import com.baiye.feign.IRemoteAuthService;
|
|
|
|
|
import com.baiye.feign.SourceClueClient;
|
|
|
|
|
import com.baiye.model.dto.*;
|
|
|
|
|
import com.baiye.model.enums.ResponseCode;
|
|
|
|
@ -49,7 +50,9 @@ import com.google.common.collect.ImmutableMap;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.cache.Cache;
|
|
|
|
|
import org.springframework.cache.annotation.CacheConfig;
|
|
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
@ -60,7 +63,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
import javax.validation.constraints.NotBlank;
|
|
|
|
|
import java.io.File;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.*;
|
|
|
|
@ -83,10 +85,13 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
private final FileProperties properties;
|
|
|
|
|
private final BusinessConfig businessConfig;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final CompanyService companyService;
|
|
|
|
|
|
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
|
private final LabelRepository labelRepository;
|
|
|
|
|
private final IRemoteAuthService remoteAuthService;
|
|
|
|
|
|
|
|
|
|
private final LabelOrganizeRepository labelOrganizeRepository;
|
|
|
|
|
|
|
|
|
|
private final PasswordEncoder passwordEncoder;
|
|
|
|
@ -459,7 +464,11 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
}
|
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
|
if (Boolean.FALSE.equals(resources.getEnabled())) {
|
|
|
|
|
// onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
|
try {
|
|
|
|
|
this.remoteAuthService.delete(Collections.singleton(resources.getId()));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new BadRequestException(ResponseCode.UPDATE_USER_ERROR.getDesc());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {
|
|
|
|
@ -673,14 +682,21 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void updatePass(String username, String pass) {
|
|
|
|
|
@CacheEvict(key = "'id:' + #p0")
|
|
|
|
|
public void updatePass(Long id, String username, String pass) {
|
|
|
|
|
userRepository.updatePass(username, pass, new Date());
|
|
|
|
|
try {
|
|
|
|
|
this.remoteAuthService.delete(Collections.singleton(id));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new BadRequestException(ResponseCode.UPDATE_USER_ERROR.getDesc());
|
|
|
|
|
}
|
|
|
|
|
// flushCache(username);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@CacheEvict(key = "'id:' + #p0")
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public Map<String, String> updateAvatar(MultipartFile multipartFile) {
|
|
|
|
|
public Map<String, String> updateAvatar(Long currentUserId, MultipartFile multipartFile) {
|
|
|
|
|
// 文件大小验证
|
|
|
|
|
FileUtil.checkSize(properties.getAvatarMaxSize(), multipartFile.getSize());
|
|
|
|
|
// 验证文件上传的格式
|
|
|
|
@ -698,8 +714,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
if (StringUtils.isNotBlank(oldPath)) {
|
|
|
|
|
FileUtil.del(oldPath);
|
|
|
|
|
}
|
|
|
|
|
@NotBlank String username = user.getUsername();
|
|
|
|
|
// flushCache(username);
|
|
|
|
|
|
|
|
|
|
return ImmutableMap.of("avatar", file.getName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -707,7 +722,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void updateEmail(String username, String email) {
|
|
|
|
|
userRepository.updateEmail(username, email);
|
|
|
|
|
// flushCache(username);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@ -744,8 +759,6 @@ public class UserServiceImpl implements UserService {
|
|
|
|
|
/* private void flushCache(String username) {
|
|
|
|
|
userCacheClean.cleanUserCache(username);
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void buyPackage(BuyComboDTO buyComboDTO) {
|
|
|
|
|