Merge branch 'feature/0803-im'

# Conflicts:
#	cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/AdminFeignServiceFallback.java

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -211,4 +211,6 @@ public interface SysUserService extends BaseService<Long, SysUser> {
      * @return SysUser
      */
     SysUser queryUserInfoWithIMToken(Long userId, EClientType clientType);
+
+    void logoffByPhone(String phone);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,17 +3,13 @@ package com.yonge.cooleshow.auth.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.api.feign.AdminFeignService;
-import com.yonge.cooleshow.api.feign.TeacherFeignService;
 import com.yonge.cooleshow.api.feign.dto.UserFriendInfoVO;
-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.dto.*;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.config.CustomerServiceConfig;
 import com.yonge.cooleshow.auth.config.RongCloudConfig;
+import com.yonge.cooleshow.auth.core.service.CustomTokenServices;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
 import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.auth.service.SysConfigService;
@@ -68,8 +64,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     private AdminFeignService adminFeignService;
     @Autowired
     private CustomerServiceConfig customerServiceConfig;
-    @Autowired
-    private TeacherFeignService teacherFeignService;
+    @Resource
+    private CustomTokenServices tokenService;
 
     @Override
     public BaseDAO<Long, SysUser> getDAO() {
@@ -412,4 +408,19 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
 
         return sysUser;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void logoffByPhone(String phone) {
+        int num = sysUserDao.countByPhont(phone);
+        //冻结相关所有客户端账号
+        sysUserDao.updateLockStatusByPhone(phone);
+        //注销用户
+        int i = sysUserDao.logoffByPhone(num,phone);
+        if(i < 1){
+            throw new BizException("用户不存在或已注销");
+        }
+        //退出登录
+        tokenService.revokeTokenByPhone(phone);
+    }
 }