|
|
@ -48,6 +48,7 @@ import com.baiye.util.*;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.cache.annotation.CacheConfig;
|
|
|
|
import org.springframework.cache.annotation.CacheConfig;
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@ -83,7 +84,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
private final BusinessConfig businessConfig;
|
|
|
|
private final BusinessConfig businessConfig;
|
|
|
|
|
|
|
|
|
|
|
|
private final CompanyService companyService;
|
|
|
|
private final CompanyService companyService;
|
|
|
|
private final UserCacheClean userCacheClean;
|
|
|
|
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
private final UserRepository userRepository;
|
|
|
|
private final LabelRepository labelRepository;
|
|
|
|
private final LabelRepository labelRepository;
|
|
|
|
private final LabelOrganizeRepository labelOrganizeRepository;
|
|
|
|
private final LabelOrganizeRepository labelOrganizeRepository;
|
|
|
@ -91,7 +92,6 @@ public class UserServiceImpl implements UserService {
|
|
|
|
private final PasswordEncoder passwordEncoder;
|
|
|
|
private final PasswordEncoder passwordEncoder;
|
|
|
|
private final WeChatUserService weChatUserService;
|
|
|
|
private final WeChatUserService weChatUserService;
|
|
|
|
|
|
|
|
|
|
|
|
private final OnlineUserService onlineUserService;
|
|
|
|
|
|
|
|
private final OrganizeRepository organizeRepository;
|
|
|
|
private final OrganizeRepository organizeRepository;
|
|
|
|
private final PayComboService payComboService;
|
|
|
|
private final PayComboService payComboService;
|
|
|
|
private final PayComboLogService payComboLogService;
|
|
|
|
private final PayComboLogService payComboLogService;
|
|
|
@ -459,7 +459,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
// 如果用户被禁用,则清除用户登录信息
|
|
|
|
if (Boolean.FALSE.equals(resources.getEnabled())) {
|
|
|
|
if (Boolean.FALSE.equals(resources.getEnabled())) {
|
|
|
|
onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
// onlineUserService.kickOutForUsername(resources.getUsername());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {
|
|
|
|
if (!user.getUsername().equals(resources.getUsername()) && user.getCompanyId() != null) {
|
|
|
@ -675,7 +675,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void updatePass(String username, String pass) {
|
|
|
|
public void updatePass(String username, String pass) {
|
|
|
|
userRepository.updatePass(username, pass, new Date());
|
|
|
|
userRepository.updatePass(username, pass, new Date());
|
|
|
|
flushCache(username);
|
|
|
|
// flushCache(username);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -699,7 +699,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
FileUtil.del(oldPath);
|
|
|
|
FileUtil.del(oldPath);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@NotBlank String username = user.getUsername();
|
|
|
|
@NotBlank String username = user.getUsername();
|
|
|
|
flushCache(username);
|
|
|
|
// flushCache(username);
|
|
|
|
return ImmutableMap.of("avatar", file.getName());
|
|
|
|
return ImmutableMap.of("avatar", file.getName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -707,7 +707,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void updateEmail(String username, String email) {
|
|
|
|
public void updateEmail(String username, String email) {
|
|
|
|
userRepository.updateEmail(username, email);
|
|
|
|
userRepository.updateEmail(username, email);
|
|
|
|
flushCache(username);
|
|
|
|
// flushCache(username);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -733,7 +733,7 @@ public class UserServiceImpl implements UserService {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void delCaches(Long id, String username) {
|
|
|
|
public void delCaches(Long id, String username) {
|
|
|
|
redisUtils.del(CacheKey.USER_ID + id);
|
|
|
|
redisUtils.del(CacheKey.USER_ID + id);
|
|
|
|
flushCache(username);
|
|
|
|
// flushCache(username);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -741,9 +741,9 @@ public class UserServiceImpl implements UserService {
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param username /
|
|
|
|
* @param username /
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private void flushCache(String username) {
|
|
|
|
/* private void flushCache(String username) {
|
|
|
|
userCacheClean.cleanUserCache(username);
|
|
|
|
userCacheClean.cleanUserCache(username);
|
|
|
|
}
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|