Merge branch 'feature/0803-im'

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -18,7 +18,9 @@ import com.yonge.cooleshow.biz.dal.queryInfo.TeacherQueryInfo;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo;
 import com.yonge.cooleshow.biz.dal.service.*;
+import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.teacher.TeacherWrapper;
 import com.yonge.cooleshow.common.enums.ESettlementFrom;
 import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
@@ -133,6 +135,9 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     private TenantUnbindHistoryMapper tenantUnbindHistoryMapper;
 
 
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
+
     @Override
     public TeacherVo detail(Long userId) {
         TeacherVo detail = baseMapper.detail(userId);
@@ -218,6 +223,16 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         TeacherHomeVo teacherHomeVo = new TeacherHomeVo();
         BeanUtils.copyProperties(teacher, teacherHomeVo);
 
+        try {
+            ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(teacher.getUserId().toString(),
+                    ClientEnum.STUDENT.getCode(),
+                    teacher.getUsername(),
+                    teacher.getAvatar());
+            teacherHomeVo.setImToken(register.getImToken());
+        } catch (Exception e) {
+            throw new BizException("获取IMToken失败");
+        }
+
         // 设置IM用户ID
         teacherHomeVo.setImUserId(imGroupService.getImUserId(userId.toString(),ClientEnum.TEACHER.getCode()));
 
@@ -366,9 +381,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             throw new BizException("插入用户信息失败");
         }
         //设置昵称
-        if (StringUtils.isEmpty(sysUser.getUsername())) {
-            sysUser.setUsername("游客" + sysUser.getId());
-        }
+        sysUser.setUsername("游客" + sysUser.getId());
         employeeDao.updateSysUser(sysUser);
         return sysUser;
     }
@@ -660,8 +673,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             Map<Long, String> receivers = new HashMap<>();
             receivers.put(userId, user.getPhone());
 
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    MessageTypeEnum.CUSTOME_MESSAGE_PUSH, receivers, null, 0,
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.CUSTOME_MESSAGE_PUSH, receivers, null, 0,
                     null, ClientEnum.TEACHER.getCode(), message);
 
         } catch (Exception e) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherHomeVo.java

@@ -87,6 +87,9 @@ public class TeacherHomeVo extends Teacher implements Serializable {
     @ApiModelProperty(value = "IM用户ID")
     private String imUserId;
 
+    @ApiModelProperty(value = "imToken")
+    private String imToken;
+
     public String getTenantName() {
         return tenantName;
     }
@@ -340,4 +343,12 @@ public class TeacherHomeVo extends Teacher implements Serializable {
     public void setImUserId(String imUserId) {
         this.imUserId = imUserId;
     }
+
+    public String getImToken() {
+        return imToken;
+    }
+
+    public void setImToken(String imToken) {
+        this.imToken = imToken;
+    }
 }