Merge branch 'feature/1020-tencent-im' into test

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

mec-application/src/main/java/com/ym/mec/web/controller/PhotoAlbumController.java

@@ -29,7 +29,7 @@ public class PhotoAlbumController extends BaseController {
 	@PreAuthorize("@pcs.hasPermissions('photoAlbum/add')")
 	public Object add(PhotoAlbum photoAlbum) {
 		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
-			photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
+			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
 		}
 		return succeed(photoAlbumService.insert(photoAlbum));
 	}

mec-application/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java

@@ -27,7 +27,7 @@ public class EduPhotoAlbumController extends BaseController {
 	@PostMapping(value = "add")
 	public Object add(PhotoAlbum photoAlbum) {
 		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
-			photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
+			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
 		}
 		return succeed(photoAlbumService.insert(photoAlbum));
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/SysUserService.java

@@ -16,4 +16,10 @@ public interface SysUserService {
     String getImName(SysUser sysUser);
 
     String getImAvatar(SysUser sysUser);
+
+    /**
+     * 注册用户三方IM
+     * @param userId 用户id
+     */
+    void registerImUserInfo(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -207,7 +207,11 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         }
         //添加用户现金账户
         sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(), tenantId, "CNY"));
-        ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(), null));
+        // IM头像
+        String imAvatar = sysUserService.getImAvatar(teacherDao.getUser(employee.getId()));
+        // IM用户昵称
+        String imName = sysUserService.getImName(teacherDao.getUser(employee.getId()));
+        ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), imName, imAvatar));
         employee.setImToken(imResult.getToken());
         teacherDao.updateUser(employee);
         if (user != null) {
@@ -291,7 +295,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         teacherDao.updateUser(employee);
         imGroupDao.updateNickname(employee.getUserId(), employee.getRealName());
         imGroupDao.updateUserFriendNickname(employee.getUserId(), employee.getRealName());
-        imFeignService.update(new ImUserModel(employee.getUserId().toString(), employee.getRealName(), sysUser.getAvatar()));
+        //imFeignService.update(new ImUserModel(employee.getUserId().toString(), employee.getRealName(), sysUser.getAvatar()));
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(employee.getUserId());
 
         employee.setAvatar(sysUser.getAvatar());
         //更新机构信息

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PhotoServiceImpl.java

@@ -56,7 +56,7 @@ public class PhotoServiceImpl extends BaseServiceImpl<Integer, Photo>  implement
 				photoAlbum.setMusicGroupId(musicGroupId);
 				photoAlbum.setName("获奖证书");
 				photoAlbum.setClientShow(YesOrNoEnum.YES);
-				photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
+				photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
 				photoAlbum.setType("SHOW");
 				photoAlbumDao.insert(photoAlbum);
 			}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -116,8 +116,6 @@ public class StudentManageServiceImpl implements StudentManageService {
 
     @Autowired
     private ImGroupDao imGroupDao;
-    @Autowired
-    private ImGroupCoreService imGroupCoreService;
 
     @Autowired
     private SysUserService sysUserService;
@@ -756,23 +754,7 @@ public class StudentManageServiceImpl implements StudentManageService {
         }
 
         // 用户更新信息同步到三方
-        SysUser userInfo = teacherDao.getUser(sysUser.getId());
-        if (Objects.nonNull(userInfo)) {
-
-            try {
-                String username = userInfo.getUsername();
-                List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
-                if (userTypes.size() > 1
-                    || userTypes.contains(ClientEnum.TEACHER.getCode())
-                    || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
-                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
-                }
-
-                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, sysUserService.getImAvatar(userInfo));
-            } catch (Exception e) {
-                log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
-            }
-        }
+        sysUserService.registerImUserInfo(sysUser.getId());
     }
 
 
@@ -783,7 +765,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (StringUtils.isNotBlank(sysUser.getUsername())) {
             imGroupDao.updateNickname(sysUser.getId(), sysUser.getUsername());
             imGroupDao.updateUserFriendNickname(sysUser.getId(), sysUser.getUsername());
-            imFeignService.update(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
+            // 事务问题，不能使用openfeign方式调用
+            //imFeignService.update(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
+
+            // 用户更新信息同步到三方
+            sysUserService.registerImUserInfo(sysUser.getId());
         }
     }
 
@@ -852,8 +838,11 @@ public class StudentManageServiceImpl implements StudentManageService {
             teacherDao.addSysUser(student);
 //            HttpResponseResult<Integer> result = sysUserFeignService.addUser(student);
 //            student.setId(result.getData());
-
-            ImResult register = imFeignService.register(new ImUserModel(student.getId().toString(), student.getPhone(), null));
+            // IM头像
+            String imAvatar = sysUserService.getImAvatar(teacherDao.getUser(student.getId()));
+            // IM用户昵称
+            //String imName = sysUserService.getImName(teacherDao.getUser(student.getId()));
+            ImResult register = imFeignService.register(new ImUserModel(student.getId().toString(), student.getPhone(), imAvatar));
             student.setImToken(register.getToken());
             teacherDao.updateUser(student);
 
@@ -903,7 +892,9 @@ public class StudentManageServiceImpl implements StudentManageService {
             studentExtracurricularExercisesSituationService.deleteByStudent(student.getId(), monDayDate.toString());
         }
         webFeignService.updateNickName(userId, student.getUsername());
-        imFeignService.update(new ImUserModel(userId.toString(), student.getUsername(), sysUser1 == null ? null : sysUser1.getAvatar()));
+        //imFeignService.update(new ImUserModel(userId.toString(), student.getUsername(), sysUser1 == null ? null : sysUser1.getAvatar()));
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(userId);
         return userId;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -253,6 +253,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Autowired
     private ImUserFriendService imUserFriendService;
+    @Autowired
+    private SysUserService sysUserService;
 
     @Override
     public BaseDAO<Long, StudentRegistration> getDAO() {
@@ -608,7 +610,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             imGroupDao.updateUserFriendNickname(userId, studentRegistration.getName());
         }
 
-        imFeignService.update(new ImUserModel(userId.toString(), studentRegistration.getName(), sysUser.getAvatar()));
+        //imFeignService.update(new ImUserModel(userId.toString(), studentRegistration.getName(), sysUser.getAvatar()));
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(userId);
         // 增加报名学生数
         musicGroupSubjectPlanService.addApplyStudentNum(studentRegistration.getMusicGroupId(), studentRegistration.getSubjectId(), 1);
         // 报名成功后，发送短信
@@ -1099,7 +1103,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentDao.insert(new Student(userId, studentRegistration.getSubjectId().toString()));
             //添加用户现金账户
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-            ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), null));
+            // IM头像
+            String imAvatar = sysUserService.getImAvatar(teacherDao.getUser(userId));
+            // IM用户昵称
+            String imName = sysUserService.getImName(teacherDao.getUser(userId));
+            ImResult register = imFeignService.register(new ImUserModel(userId.toString(), imName, imAvatar));
             sysUser.setImToken(register.getToken());
             teacherDao.updateUser(sysUser);
         } else {
@@ -1180,7 +1188,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         student.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(student);
         //studentRegistrationDao.updateCurrentClass(studentRegistration);
-        imFeignService.update(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
+        //imFeignService.update(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(userId);
 
         //学生报名表
         sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -121,7 +121,8 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 
     @Autowired
     private StudentService studentService;
-
+    @Autowired
+    private SysUserService sysUserService;
 
     @Override
     public BaseDAO<Integer, Student> getDAO() {
@@ -1175,7 +1176,11 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             // 注册账户信息
             teacherDao.addSysUser(user);
             Integer userId = user.getId();
-            ImResult imResult = imFeignService.register(new ImUserModel(userId.toString(), user.getUsername(), user.getAvatar()));
+            // IM头像
+            String imAvatar = sysUserService.getImAvatar(teacherDao.getUser(userId));
+            // IM用户昵称
+            String imName = sysUserService.getImName(teacherDao.getUser(userId));
+            ImResult imResult = imFeignService.register(new ImUserModel(userId.toString(), imName, imAvatar));
             if(imResult != null && StringUtils.isNotEmpty(imResult.getToken())) {
                 user.setImToken(imResult.getToken());
                 teacherDao.updateUser(user);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserServiceImpl.java

@@ -3,26 +3,34 @@ package com.ym.mec.biz.service.impl;
 import com.google.common.collect.Lists;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.enums.ClientEnum;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.biz.service.im.ImGroupCoreService;
 import com.ym.mec.common.exception.BizException;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
+@Slf4j
 @Service
 public class SysUserServiceImpl implements SysUserService {
 
     @Autowired
     private SysUserFeignService sysUserFeignService;
-
+    @Autowired
+    private TeacherDao teacherDao;
     @Autowired
     private SysConfigService sysConfigService;
+    @Autowired
+    private ImGroupCoreService imGroupCoreService;
 
     @Override
     public Integer getUserId(){
@@ -93,4 +101,30 @@ public class SysUserServiceImpl implements SysUserService {
             return Optional.ofNullable(sysConfigService.findByParamName(SysConfigService.TEACHER_DEFAULT_AVATAR)).orElse(new SysConfig()).getParanValue();
         }
     }
+
+    /**
+     * 注册用户三方IM
+     *
+     * @param userId 用户id
+     */
+    @Override
+    public void registerImUserInfo(Integer userId) {
+        SysUser userInfo = teacherDao.getUser(userId);
+        if (Objects.nonNull(userInfo)) {
+
+            try {
+                String username = userInfo.getUsername();
+                List<String> userTypes = Lists.newArrayList(userInfo.getUserType().split(","));
+                if (userTypes.size() > 1
+                    || userTypes.contains(ClientEnum.TEACHER.getCode())
+                    || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
+                    username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
+                }
+
+                imGroupCoreService.register(String.valueOf(userInfo.getId()), "", username, getImAvatar(userInfo));
+            } catch (Exception e) {
+                log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
+            }
+        }
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherServiceImpl.java

@@ -4,12 +4,52 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
-import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.*;
-import com.ym.mec.biz.dal.page.*;
+import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.DemoGroupDao;
+import com.ym.mec.biz.dal.dao.ImGroupDao;
+import com.ym.mec.biz.dal.dao.ImUserFriendDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dao.OrganizationDao;
+import com.ym.mec.biz.dal.dao.SchoolDao;
+import com.ym.mec.biz.dal.dao.StudentDao;
+import com.ym.mec.biz.dal.dao.StudentExtracurricularExercisesSituationDao;
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
+import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
+import com.ym.mec.biz.dal.dao.StudentTeacherMapperDao;
+import com.ym.mec.biz.dal.dao.SubjectDao;
+import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.BaseMapDto;
+import com.ym.mec.biz.dal.dto.BasicUserDto;
+import com.ym.mec.biz.dal.dto.ImUserFriendDto;
+import com.ym.mec.biz.dal.dto.MusicGroupStudentApplyDto;
+import com.ym.mec.biz.dal.dto.MusicGroupTeacherAttendanceDto;
+import com.ym.mec.biz.dal.dto.MusicGroupTeachersDto;
+import com.ym.mec.biz.dal.dto.SysUserDto;
+import com.ym.mec.biz.dal.dto.TeacherBasicDto;
+import com.ym.mec.biz.dal.dto.TeacherCloseDto;
+import com.ym.mec.biz.dal.dto.TeacherDefaultSalaryDto;
+import com.ym.mec.biz.dal.dto.TeacherExercisesServiceDto;
+import com.ym.mec.biz.dal.dto.TeacherMusicStudentOverViewDto;
+import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.entity.ImUserFriend;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.Organization;
+import com.ym.mec.biz.dal.entity.School;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.SysUserCashAccount;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.page.MusicGroupTeacherAttendanceQueryInfo;
+import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherCloseQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherNameQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherQueryInfo;
+import com.ym.mec.biz.dal.page.TeacherServeQueryInfo;
+import com.ym.mec.biz.dal.page.UserBasicQueryInfo;
+import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.OaUserService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.constant.CommonConstants;
@@ -29,6 +69,7 @@ import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticati
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.idcard.IdcardValidator;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -41,10 +82,20 @@ import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implements TeacherService {
 
@@ -77,8 +128,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
     @Autowired
     private StudentExtracurricularExercisesSituationDao studentExtracurricularExercisesSituationDao;
     @Autowired
-    private StudentDao studentDao;
-    @Autowired
     private ImUserFriendDao imUserFriendDao;
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
@@ -88,6 +137,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
     private TenantInfoService tenantInfoService;
     @Autowired
     private OaUserService oaUserService;
+    @Autowired
+    private SysUserService sysUserService;
 
     @Autowired
     private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
@@ -138,7 +189,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         //添加用户电子签章账户
 //		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
         teacherDao.insert(teacher);
-        ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), null));
+        // IM头像
+        String imAvatar = sysUserService.getImAvatar(teacherDao.getUser(teacher.getId()));
+        // IM用户昵称
+        String imName = sysUserService.getImName(teacherDao.getUser(teacher.getId()));
+        ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), imName, imAvatar));
         if (imResult != null) {
             teacher.setImToken(imResult.getToken());
             teacherDao.updateUser(teacher);
@@ -181,7 +236,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         teacherDao.updateUser(teacher);
         imGroupDao.updateNickname(teacher.getId(), teacher.getRealName());
         imGroupDao.updateUserFriendNickname(teacher.getId(), teacher.getRealName());
-        imFeignService.update(new ImUserModel(teacher.getId().toString(), teacher.getRealName(), teacher.getAvatar()));
+        //imFeignService.update(new ImUserModel(teacher.getId().toString(), teacher.getRealName(), teacher.getAvatar()));
+
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(teacher.getId());
     }
 
     @Override
@@ -215,7 +273,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
         teacherDao.updateUser(teacher);
         imGroupDao.updateNickname(teacher.getId(), teacher.getRealName());
         imGroupDao.updateUserFriendNickname(teacher.getId(), teacher.getRealName());
-        imFeignService.update(new ImUserModel(teacher.getId().toString(), teacher.getRealName(), teacher.getAvatar()));
+        //imFeignService.update(new ImUserModel(teacher.getId().toString(), teacher.getRealName(), teacher.getAvatar()));
+
+        // 用户更新信息同步到三方
+        sysUserService.registerImUserInfo(teacher.getId());
         //更新OA信息
         teacher.setAvatar(user.getAvatar());
         teacher.setUsername(user.getUsername());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -675,7 +675,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         //购买服务的时长单位
         param.put("expiryUnit", TenantProductInfo.MONTH.equals(tenantInfo.getExpiryUnit()) ? "个月" : "年");
         //乙方公章
-        param.put("officialSealB", "https://daya.ks3-cn-beijing.ksyun.com/202202/Sx6rzWm.png");
+        param.put("officialSealB", "https://oss.dayaedu.com/default-images/mec/Sx6rzWm.png");
         //获取产品名称
         opsContractData(tenantInfo.getServeId(), platformServeService::queryProductNameById,
                 "未查询到产品信息！",

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -4733,7 +4733,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
         }
         imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(),
-                vipGroup.getName(), null, "https://gyt.ks3-cn-beijing.ksyuncs.com/icon_live_class_group_avatar.png",
+                vipGroup.getName(), null, "",
                 vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
         classGroup.setTotalClassTimes(courseSchedules.size());
         classGroupDao.update(classGroup);

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -1509,7 +1509,7 @@
         <foreach collection="vipGroupIds" item="groupId" open="(" close=")" separator=",">
             #{groupId}
         </foreach>
-        AND cg.group_type_ = 'VIP'
+        AND cg.group_type_ in ('VIP','LIVE')
     </select>
     <select id="findClassGroupWithIds" resultMap="ClassGroup">
         SELECT * FROM class_group WHERE id_ IN

mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -183,8 +183,8 @@
         (`title_`, `content_`, `cover_image_`, `type_`, `sub_type_`, `status_`, `online_time_`, `offline_time_`,
          `memo_`, `create_time_`, `update_time_`, `link_url_`, `href_target_`, `order_`, `del_flag_`, `tenant_id_`,
          `video_cover_image_`, `attribute1_`, `attribute2_`, `subject_id_list_`, `organ_id_list_`)
-        VALUES ('云教室——高保真低延时', '<p><img src=\"https://daya.ks3-cn-beijing.ksyun.com/202201/Sv298Ab.png\"></p>',
-                'https://daya.ks3-cn-beijing.ksyun.com/202201/SupcQn3.png', 1, NULL, '1', NULL, NULL, '', now(), NULL,
+        VALUES ('云教室——高保真低延时', '<p><img src=\"https://oss.dayaedu.com/default-images/mec/Sv298Ab.png\"></p>',
+                'https://oss.dayaedu.com/default-images/mec/SupcQn3.png', 1, NULL, '1', NULL, NULL, '', now(), NULL,
                 '', NULL, 1, 0, #{tenantId}, '', '0', NULL, '', #{orgId})
              , ('管乐迷UI全新改版升级！',
                 '<p>管乐迷UI全新改版升级</p> <p>图标视觉设计更加精美，色彩配置更加丰富。</p> <p>让新版管乐迷陪练您一起成长吧！</p><p><br></p><p><img src=\"https://daya.ks3-cn-beijing.ksyun.com/202201/Sv2FByz.png\"><img src=\"https://daya.ks3-cn-beijing.ksyun.com/202201/Sv2H9sH.png\"><img src=\"https://daya.ks3-cn-beijing.ksyun.com/202201/Sv2FFTA.png\"></p>',

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -97,22 +97,25 @@ public class UserController {
                     || userTypes.contains(ClientEnum.SYSTEM.getCode())) {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
+                // 用户昵称
+                userModel.setName(username);
+                // 用户头像
+                userModel.setPortrait(sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
+            }
+            ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), clientType, userModel.getName(),
+                userModel.getPortrait());
 
-                ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), clientType, username,
-                    sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
+            // 用户注册接入Token
+            tokenResult.setToken(register.getImToken());
+            // 用户注册接入Id
+            tokenResult.setUserId(register.getImUserId());
 
-                // 用户注册接入Token
-                tokenResult.setToken(register.getImToken());
-                // 用户注册接入Id
-                tokenResult.setUserId(register.getImUserId());
-
-                SysUser sysUser = new SysUser();
-                sysUser.setId(Integer.parseInt(userModel.getId()));
-                // 更新用户imToken值
-                sysUser.setImToken(register.getImToken());
-                sysUser.setUpdateTime(new Date());
-                sysUserService.updateSysUser(sysUser);
-            }
+            SysUser sysUser = new SysUser();
+            sysUser.setId(Integer.parseInt(userModel.getId()));
+            // 更新用户imToken值
+            sysUser.setImToken(register.getImToken());
+            sysUser.setUpdateTime(new Date());
+            sysUserService.updateSysUser(sysUser);
 
         } else {
             // 融云
@@ -174,16 +177,21 @@ public class UserController {
                     username = Optional.ofNullable(userInfo.getRealName()).filter(StringUtils::isNotBlank).orElse(username);
                 }
 
-                try {
+                // 用户昵称
+                userModel.setName(username);
+                // 用户头像
+                userModel.setPortrait(sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
 
-                    ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), "",
-                        username,  sysUserService.getImAvatar(teacherDao.getUser(userInfo.getUserId().intValue())));
+            }
 
-                    log.info("update IM_USER userId={}, username={} register: {}", userModel.getId(), username, JSONObject.toJSONString(register));
-                } catch (Exception e) {
-                    log.error("更新注册IM用户信息", e);
-                }
+            try {
 
+                ImGroupWrapper.ImUserInfo register = imGroupCoreService.register(userModel.getId(), "",
+                    userModel.getName(), userModel.getPortrait());
+
+                log.info("update IM_USER userId={}, username={} register: {}", userModel.getId(), userModel.getName(), JSONObject.toJSONString(register));
+            } catch (Exception e) {
+                log.error("更新注册IM用户信息", e);
             }
 
         } else {