|
@@ -1,40 +1,37 @@
|
|
|
package com.yonge.cooleshow.auth.service.impl;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Arrays;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import com.google.common.collect.Lists;
|
|
|
import com.yonge.cooleshow.api.feign.AdminFeignService;
|
|
|
-import com.yonge.cooleshow.auth.api.dto.*;
|
|
|
+import com.yonge.cooleshow.auth.api.dto.QRLoginDto;
|
|
|
+import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
|
|
|
+import com.yonge.cooleshow.auth.api.dto.SysUserInfo;
|
|
|
+import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
|
|
|
+import com.yonge.cooleshow.auth.api.dto.UserSetReq;
|
|
|
+import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
+import com.yonge.cooleshow.auth.api.vo.UserSetVo;
|
|
|
import com.yonge.cooleshow.auth.config.RongCloudConfig;
|
|
|
+import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
|
|
|
+import com.yonge.cooleshow.auth.service.SysConfigService;
|
|
|
+import com.yonge.cooleshow.auth.service.SysRoleMenuService;
|
|
|
+import com.yonge.cooleshow.auth.service.SysUserRoleService;
|
|
|
+import com.yonge.cooleshow.auth.service.SysUserService;
|
|
|
+import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
|
+import com.yonge.cooleshow.common.entity.ImUserModel;
|
|
|
import com.yonge.cooleshow.common.enums.CacheNameEnum;
|
|
|
import com.yonge.cooleshow.common.enums.SysUserType;
|
|
|
import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
|
|
|
-import com.yonge.cooleshow.common.enums.UserLockFlag;
|
|
|
+import com.yonge.toolset.base.exception.BizException;
|
|
|
+import com.yonge.toolset.mybatis.dal.BaseDAO;
|
|
|
import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
|
|
|
import io.rong.models.user.UserModel;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.redisson.api.RedissonClient;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
-
|
|
|
-import com.yonge.cooleshow.auth.api.entity.SysUser;
|
|
|
-import com.yonge.cooleshow.auth.api.vo.UserSetVo;
|
|
|
-import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
|
|
|
-import com.yonge.cooleshow.auth.service.SysConfigService;
|
|
|
-import com.yonge.cooleshow.auth.service.SysRoleMenuService;
|
|
|
-import com.yonge.cooleshow.auth.service.SysUserRoleService;
|
|
|
-import com.yonge.cooleshow.auth.service.SysUserService;
|
|
|
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
|
|
|
-import com.yonge.toolset.mybatis.dal.BaseDAO;
|
|
|
-import com.yonge.cooleshow.common.entity.ImUserModel;
|
|
|
-import com.yonge.toolset.base.exception.BizException;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@Service
|
|
|
public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implements SysUserService {
|
|
@@ -51,9 +48,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
private RedissonClient redissonClient;
|
|
|
@Resource
|
|
|
private AdminFeignService adminFeignService;
|
|
|
- // 新用户注册,默认添加官方客服联系人配置
|
|
|
- @Value("${app.customer.service:17740683946}")
|
|
|
- private String customerService;
|
|
|
|
|
|
@Override
|
|
|
public BaseDAO<Long, SysUser> getDAO() {
|
|
@@ -169,9 +163,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
|
|
|
sysUserDao.update(sysUser);
|
|
|
|
|
|
// 自动添加系统默认IM帐号为好友,并自动发送通知消息
|
|
|
- List<String> mobileInfos = Lists.newArrayList(customerService.split(","));
|
|
|
-
|
|
|
- //sysUserDao.
|
|
|
|
|
|
|
|
|
return queryUserInfoByPhone(phone);
|