|
|
|
@ -97,7 +97,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
|
|
|
|
@Override |
|
|
|
public LoginVO login(LoginDTO dto) { |
|
|
|
log.info("【测试】前端传的uniqueToken：{}，kefuid：{}", dto.getUniqueToken(), dto.getKeFuId()); |
|
|
|
// log.info("【测试】前端传的uniqueToken：{}，kefuid：{}", dto.getUniqueToken(), dto.getKeFuId());
|
|
|
|
|
|
|
|
String uniqueToken = dto.getUniqueToken(); |
|
|
|
// 检查uniqueToken是否为空或已过期
|
|
|
|
@ -156,8 +156,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
vo.setCustomerServiceId(customerServiceId == null ? -1 : customerServiceId); |
|
|
|
vo.setUser(guestUser); |
|
|
|
|
|
|
|
log.info("游客登录成功，userId:{}, uniqueToken:{}，分配客服ID:{}", |
|
|
|
guestUser.getId(), dto.getUniqueToken(), customerServiceId); |
|
|
|
// log.info("游客登录成功，userId:{}, uniqueToken:{}，分配客服ID:{}",
|
|
|
|
// guestUser.getId(), dto.getUniqueToken(), customerServiceId);
|
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -296,8 +296,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
currentUser.setSwitchableAccountIds(newIdsStr); |
|
|
|
this.updateById(currentUser); |
|
|
|
|
|
|
|
log.info("用户 {} 添加了可切换账号 {}，当前可切换账号列表: {}", |
|
|
|
currentUserId, targetUser.getId(), newIdsStr); |
|
|
|
// log.info("用户 {} 添加了可切换账号 {}，当前可切换账号列表: {}",
|
|
|
|
// currentUserId, targetUser.getId(), newIdsStr);
|
|
|
|
|
|
|
|
LoginVO vo = new LoginVO(); |
|
|
|
return vo; |
|
|
|
@ -398,7 +398,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
user.setPassword(passwordEncoder.encode(user.getPassword())); |
|
|
|
user.setIsCustomer(1); |
|
|
|
this.save(user); |
|
|
|
log.info("注册用户，用户id:{},用户名:{},昵称:{}", user.getId(), dto.getUserName(), dto.getNickName()); |
|
|
|
// log.info("注册用户，用户id:{},用户名:{},昵称:{}", user.getId(), dto.getUserName(), dto.getNickName());
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -410,7 +410,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
} |
|
|
|
user.setPassword(passwordEncoder.encode(dto.getNewPassword())); |
|
|
|
this.updateById(user); |
|
|
|
log.info("用户修改密码，用户id:{},用户名:{},昵称:{}", user.getId(), user.getUserName(), user.getNickName()); |
|
|
|
// log.info("用户修改密码，用户id:{},用户名:{},昵称:{}", user.getId(), user.getUserName(), user.getNickName());
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -455,7 +455,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
user.setHeadImage(vo.getHeadImage()); |
|
|
|
user.setHeadImageThumb(vo.getHeadImage()); |
|
|
|
this.updateById(user); |
|
|
|
log.info("用户信息更新，用户:{}}", user); |
|
|
|
// log.info("用户信息更新，用户:{}}", user);
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@ -481,7 +481,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
|
|
|
|
if (StringUtils.hasText(user.getSourceUrl())) { |
|
|
|
String platformName = PlatformConfigurationService.getPlatformNameBySourceUrl(user.getSourceUrl()); |
|
|
|
log.info("用户信息更新，用户:{}}", platformName); |
|
|
|
// log.info("用户信息更新，用户:{}}", platformName);
|
|
|
|
vo.setPlatformName(platformName); |
|
|
|
} |
|
|
|
|
|
|
|
@ -569,21 +569,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
throw new GlobalException(ResultCode.PROGRAM_ERROR, "更新用户分组失败"); |
|
|
|
} |
|
|
|
|
|
|
|
log.info("用户 {} 的分组已更新为: {}", userId, groupId); |
|
|
|
// log.info("用户 {} 的分组已更新为: {}", userId, groupId);
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void saveUserLabel(Long userId, String labelIds) { |
|
|
|
User user = this.getById(userId); |
|
|
|
log.info("用户 {} 的分组已更新为: {}", userId, labelIds); |
|
|
|
// log.info("用户 {} 的分组已更新为: {}", userId, labelIds);
|
|
|
|
if (ObjectUtil.isNull(user)) { |
|
|
|
throw new GlobalException(ResultCode.PROGRAM_ERROR, "用户不存在"); |
|
|
|
} |
|
|
|
// 保存标签ID串
|
|
|
|
user.setLabelIds(labelIds); |
|
|
|
this.updateById(user); |
|
|
|
log.info("用户{}标签保存成功: {}", userId, labelIds); |
|
|
|
// log.info("用户{}标签保存成功: {}", userId, labelIds);
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
[yxf]
3 weeks ago