|
|
|
@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
|
import com.google.common.collect.ImmutableMap;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
import com.google.common.collect.Maps;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import lombok.SneakyThrows;
|
|
|
|
@ -496,9 +497,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
|
|
}
|
|
|
|
|
List<String> roles = authorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList());
|
|
|
|
|
map.put("roles", roles);
|
|
|
|
|
List<String> wechatIds =
|
|
|
|
|
remoteWechatService.getWechatId();
|
|
|
|
|
map.put("wechatIds", wechatIds);
|
|
|
|
|
/*List<String> wechatIds =
|
|
|
|
|
remoteWechatService.getWechatId();*/
|
|
|
|
|
map.put("wechatIds", Lists.newArrayList());
|
|
|
|
|
map.put("tiktokId", AesEncrypt.encrypt
|
|
|
|
|
(SecurityUtils.getCurrentUserId().toString(),
|
|
|
|
|
EncryptionConstants.ENCRYPTION_KEY));
|
|
|
|
|