Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_1020_redis

# Conflicts:
#	mec-application/src/main/resources/bootstrap-dev.properties
#	mec-application/src/main/resources/logback-spring.xml
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java
#	mec-education/src/main/resources/bootstrap-prod.properties
#	mec-monitor/src/main/resources/bootstrap-prod.properties
#	mec-student/src/main/resources/bootstrap-prod.properties
#	mec-teacher/src/main/resources/bootstrap-prod.properties
#	mec-web/src/main/java/com/ym/mec/web/controller/PhotoAlbumController.java
#	mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java
#	mec-zipkin/src/main/resources/bootstrap-prod.properties

audio-analysis/src/main/java/com/yonge/netty/dto/HardLevelEnum.java

@@ -9,7 +9,7 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * 完成度范围, 未演奏的范围
 	 */
 	//BEGINNER("入门级", 3, 5, 5, 5, 10, 10, 13, 15, 60, 10), 
-	BEGINNER("入门级", 5, 5, 3, 3, 6, 8, 13, 15, 95, 10), 
+	BEGINNER("入门级", 3, 5, 10, 10, 15, 15, 22, 22, 75, 25), 
 	/**
 	 * 进阶级, 振幅阈值, 频率阈值 <br>
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
@@ -22,7 +22,8 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
 	 * 完成度范围, 未演奏的范围
 	 */
-	PERFORMER("大师级", 3, 3, 3, 5, 10, 10, 13, 15, 95, 10);
+	//PERFORMER("大师级", 3, 3, 3, 5, 10, 10, 13, 15, 95, 10);
+	PERFORMER("大师级", 3, 3, 3, 3, 6, 8, 13, 15, 95, 10);
 
 	private String msg;
 

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -915,6 +915,10 @@ public class UserChannelContext {
 		
 		//int range = hardLevel.getAmplitudeThreshold();
 		int range = 5;
+		
+		if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.DECIBELS.getCode())) {
+			range = 50;
+		}
 
 		for (int i = 1; i < chunkAmplitudeList.size(); i++) {
 			if (chunkAmplitudeList.get(i - 1) + range >= chunkAmplitudeList.get(i)) {

audio-analysis/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

cms/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.google.common.collect.Lists;
 import com.yonge.log.wrapper.HistoryMessageTencentWrapper;
 import com.ym.mec.biz.service.ImGroupService;
 import com.ym.mec.biz.service.UploadFileService;
@@ -15,11 +16,18 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
 
 @RequestMapping("${app-config.url.web:}/imHistoryMessage")
 @Api(tags = "系统操作日志")
@@ -27,93 +35,194 @@ import java.util.List;
 @RestController
 public class ImHistoryMessageController extends BaseController {
 
-	@Autowired
-	private HistoryMessageService historyMessageService;
-	@Autowired
-	private UploadFileService uploadFileService;
+    @Autowired
+    private HistoryMessageService historyMessageService;
+    @Autowired
+    private UploadFileService uploadFileService;
 
-	@Autowired
-	private ImGroupService imGroupService;
+    @Autowired
+    private ImGroupService imGroupService;
 
     @Autowired
     private HistoryMessageTenantService historyMessageTenantService;
 
-	@GetMapping("/save")
-	public Object saveImHistoryMessage(String fileDir) throws Exception {
-		File file = new File(fileDir);
-		UploadReturnBean uploadReturnBean = uploadFileService.uploadImHistoryMsgFile(file);
-		historyMessageService.saveImHistoryMessage(file);
-		return succeed();
-	}
+    @GetMapping("/save")
+    public Object saveImHistoryMessage(String fileDir) throws Exception {
+        File file = new File(fileDir);
+        UploadReturnBean uploadReturnBean = uploadFileService.uploadImHistoryMsgFile(file);
+        historyMessageService.saveImHistoryMessage(file);
+        return succeed();
+    }
+
+
+    @ApiOperation("IM导入消息")
+    @PostMapping(value = "/ImportIM")
+    public void ImportIM() {
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+
+            // 100个线程的无界线程池
+            ExecutorService executorService = Executors.newFixedThreadPool(100);
+            com.yonge.mongodb.PageInfo<HistoryMessage> info;
+//        historyMessageService.updateAllStatus(0);
+            //计算总数据量
+            int count = imGroupService.queryInfoCount(3);
+            log.info("总数据量："+count);
+            //计算调用次数
+            int num = (int) Math.ceil(count / 100);
+            for (int i = 0; i <= num; i++) {
+                int size = 100;
+                //获取融云消息
+                //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+                info = imGroupService.getRongYunInfo(1, size,3);
+                List<HistoryMessage> footer = info.getRows();
+                if (CollectionUtils.isEmpty(footer)) {
+                    break;
+                }
+                //IM导入
+                try {
+                    // 过滤 groupId为空的
+                    footer = footer.stream().filter(o -> StringUtils.isNotBlank(o.getGroupId())).collect(Collectors.toList());
+                    // 根据 groupId 分组
+                    Map<String, List<HistoryMessage>> map = footer.stream().collect(Collectors.groupingBy(HistoryMessage::getGroupId));
+
+                    List<Future<?>> list = new ArrayList<>();
+                    for (Map.Entry<String, List<HistoryMessage>> entry : map.entrySet()) {
+                        String k = entry.getKey();
+                        List<HistoryMessage> v = entry.getValue();
+
+                        list.add(executorService.submit(() -> {
+                            try {
+                                imGroupService.importInfo(v);
+                            } catch (Exception e) {
+
+                                log.error("群聊导入失败",e);
+                            }
+
+                        }));
+                    }
+                    for (Future<?> future : list) {
+                        try {
+                            future.get();
+                        } catch (Exception e){
+                            log.error("群聊导入失败",e);
+                        }
+                    }
+                } catch (Exception e) {
+                    log.error("IM导入失败",e);
+                }
+                log.info("已导入：" + (i + 1) * size);
+            }
+            executorService.shutdown();
+        });
+    }
+
 
+    @ApiOperation("IM导入消息")
+    @PostMapping(value = "/ImportIMPrivate")
+    public void ImportIMPrivate() {
 
-	@ApiOperation("IM导入消息")
-	@PostMapping(value = "/ImportIM")
-	public void ImportIM() throws Exception {
-		com.yonge.mongodb.PageInfo<HistoryMessage> info;
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            com.yonge.mongodb.PageInfo<HistoryMessage> info;
 //        historyMessageService.updateAllStatus(0);
-		//计算总数据量
-		int count = imGroupService.queryInfoCount();
-		//计算调用次数
-		int num = (int) Math.ceil(count / 100);
-		for (int i = 0; i <=num ; i++) {
-			int size =100;
-			//获取融云消息
-			//List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
-			info = imGroupService.getRongYunInfo(1,size);
-			List<HistoryMessage> footer = info.getRows();
-            if (CollectionUtils.isEmpty(footer)) {
-                break;
+            //计算总数据量
+            int count = imGroupService.queryInfoCount(1);
+            log.info("总数据量："+count);
+            //计算调用次数
+            int num = (int) Math.ceil(count / 100);
+            for (int i = 0; i <= num; i++) {
+                int size = 100;
+                //获取融云消息
+                //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+                info = imGroupService.getRongYunInfo(1, size,1);
+                List<HistoryMessage> footer = info.getRows();
+                if (CollectionUtils.isEmpty(footer)) {
+                    break;
+                }
+                //IM导入
+                try {
+                    imGroupService.importInfo(footer);
+                } catch (Exception e) {
+                    log.error("IM导入失败",e);
+                }
+                log.info("已导入：" + (i + 1) * size);
             }
-			//IM导入
-			imGroupService.importInfo(footer);
-		}
-	}
+        });
+    }
 
     @ApiOperation("融云im To 腾讯")
     @PostMapping(value = "/imToTencent")
     public void imToTencent() throws Exception {
 
-        // 删除旧数据
-        historyMessageTenantService.deleteOld();
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            // 删除旧数据
+//        historyMessageTenantService.deleteOld();
+
 
-        com.yonge.mongodb.PageInfo<HistoryMessage> info;
+            // 100个线程的无界线程池
+            ExecutorService executorService = Executors.newFixedThreadPool(100);
+            com.yonge.mongodb.PageInfo<HistoryMessage> info;
 //        historyMessageService.updateAllStatus(0);
-        //计算总数据量
-        long count = historyMessageService.querySyncCount();
-        log.info("总数据量："+count);
-        //计算调用次数
-        long num = (int) Math.ceil(count / 100);
-        for (long i = 0; i <=num ; i++) {
-            int size =100;
-            //获取融云消息
-            //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
-            info = historyMessageService.getImToTencent(i,size);
-            List<HistoryMessage> footer = info.getRows();
-            if (CollectionUtils.isEmpty(footer)) {
-                break;
+            //计算总数据量
+            long count = historyMessageService.querySyncCount();
+            log.info("总数据量："+count);
+            //计算调用次数
+            long num = (int) Math.ceil(count / 200);
+            for (long i = 0; i <=num ; i++) {
+                int size = 200;
+                //获取融云消息
+                //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+                info = historyMessageService.getImToTencent(1, size);
+                List<HistoryMessage> footer = info.getRows();
+                if (CollectionUtils.isEmpty(footer)) {
+                    break;
+                }
+                //IM转换
+                List<Future<?>> list = new ArrayList<>();
+                for (List<HistoryMessage> historyMessages : Lists.partition(footer, 10)) {
+                    list.add(executorService.submit(() -> {
+                        try {
+                            imGroupService.imToTencent(historyMessages);
+                        } catch (Exception e) {
+                            log.error("IM转换失败",e);
+                        }
+                    }));
+                }
+                for (Future<?> future : list) {
+                    try {
+                        future.get();
+                    } catch (Exception e){
+                        log.error("IM转换失败",e);
+                    }
+                }
+                log.info("已转换：" + (i + 1) * size);
             }
-            //IM转换
-            imGroupService.imToTencent(footer);
-            log.info("已转换："+(i+1)*size);
-        }
+            executorService.shutdown();
+        });
     }
 
     @ApiOperation("初始化消息体")
     @PostMapping(value = "/initMsgBodyJson")
     public void initMsgBodyJson() throws Exception {
-        //计算总数据量
-        int count = historyMessageTenantService.initMsgBodyJsonCount();
-        log.info("总数据量："+count);
-        //计算调用次数
-        int num = (int) Math.ceil(count / 100);
-        for (int i = 0; i <=num ; i++) {
-            int size =100;
-            //获取融云消息
-            //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
-            historyMessageTenantService.initMsgBodyJson(1,size);
-            log.info("已转换："+(i+1)*size);
-        }
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        executor.execute(() -> {
+            //计算总数据量
+            int count = historyMessageTenantService.initMsgBodyJsonCount();
+            log.info("总数据量：" + count);
+            //计算调用次数
+            int num = (int) Math.ceil(count / 100);
+            for (int i = 0; i <= num; i++) {
+                int size = 100;
+                //获取融云消息
+                //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+                historyMessageTenantService.initMsgBodyJson(1, size);
+                log.info("已转换：" + (i + 1) * size);
+            }
+        });
     }
 
     @ApiOperation("历史聊天记录查询")

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.microsvc.toolkit.middleware.live.LivePluginContext;
 import com.microsvc.toolkit.middleware.live.message.TencentWrapper;
 import com.ym.mec.biz.dal.dto.ImLiveBroadcastRoomDto;
 import com.ym.mec.biz.dal.dto.LiveRoomStatus;
@@ -19,6 +20,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.WrapperUtil;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -46,6 +48,8 @@ public class ImLiveBroadcastRoomController extends BaseController {
     @Resource
     private ImLiveBroadcastRoomService imLiveBroadcastRoomService;
 
+    @Autowired
+    private LivePluginContext livePluginContext;
     @ApiImplicitParams({
             @ApiImplicitParam(name = "search", dataType = "String", value = "模糊查询关键字"),
             @ApiImplicitParam(name = "liveState", dataType = "Integer", value = "直播状态 0未开始 1开始 2结束"),
@@ -306,5 +310,20 @@ public class ImLiveBroadcastRoomController extends BaseController {
         return succeed(imLiveBroadcastRoomService.roomLiveStreamStatus(roomUid));
     }
 
+
+    @ApiOperation("直播间自定义")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "roomUid", dataType = "String", value = "房间Uid", required = true),
+    })
+    @GetMapping(value = "/liveDefineData")
+    public HttpResponseResult<Object> liveDefineData(String roomUid) throws Exception {
+
+        // 直播间推流状态查询
+
+        List<TencentWrapper.ChatRoomGroupCounter> chatRoomGroupDefinedData = livePluginContext
+            .getPluginService().getChatRoomGroupDefinedData(roomUid);
+        return succeed(chatRoomGroupDefinedData);
+    }
+
 }
 

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/TaskController.java

@@ -18,6 +18,7 @@ import com.ym.mec.im.ImFeignService;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.service.HistoryMessageService;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +37,7 @@ import java.util.concurrent.TimeUnit;
 
 @RequestMapping("${app-config.url.web:}/task")
 @RestController
+@Slf4j
 public class TaskController extends BaseController {
 
 	@Autowired
@@ -654,7 +656,21 @@ public class TaskController extends BaseController {
     @ApiOperation("每分钟-查询是否有直播间需要创建")
     @GetMapping(value = "/createLiveRoom")
     public void createLiveRoom(){
-        imLiveBroadcastRoomService.createLiveRoom();
+        try {
+            imLiveBroadcastRoomService.createLiveRoom();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("创建直播间失败",e);
+        }
+
+        // 网络教室
+        try {
+
+            courseScheduleService.rtcRoomCreate();
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("创建网络教室失败",e);
+        }
     }
 
     @ApiOperation("每分钟-查询是否有直播间需要销毁")
@@ -691,7 +707,17 @@ public class TaskController extends BaseController {
 	@ApiOperation("每天凌晨2点钟-直播间销毁定时任务")
 	@GetMapping("/destroyLiveRoom")
 	public Object destroyLiveRoom() {
-		imLiveBroadcastRoomService.destroyLiveRoom();
+        try {
+            imLiveBroadcastRoomService.destroyLiveRoom();
+        } catch (Exception e) {
+            log.error("销毁直播间失败",e);
+        }
+
+        try {
+            courseScheduleService.destroyRtcRoom();
+        } catch (Exception e) {
+            log.error("销毁网络教室失败",e);
+        }
 		return succeed();
 	}
 

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-application/src/main/java/com/ym/mec/web/controller/education/SysMusicCompareRecordController.java

@@ -42,7 +42,7 @@ public class SysMusicCompareRecordController extends BaseController {
             return failed("请设置功能点");
         }
         record.setUserId(sysUser.getId());
-        record.setClientId("com/ym/app/web/controller/education");
+        record.setClientId("education");
         return succeed(sysMusicCompareRecordService.insert(record));
     }
 

mec-application/src/main/resources/bootstrap-prod.properties

@@ -1,12 +1,12 @@
-spring.cloud.nacos.config.server-addr=10.206.0.13:8848,10.206.0.4:8848,10.206.0.8:8848
+spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}
-spring.cloud.nacos.config.prefix=auth
+spring.cloud.nacos.config.prefix=app
 #\u6307\u5b9a\u6587\u4ef6\u540e\u7f00
 spring.cloud.nacos.config.file-extension=yaml
 #\u662f\u5426\u542f\u7528nacos\u914d\u7f6e\u4e2d\u5fc3
 spring.cloud.nacos.config.enabled=true
-logging.config=classpath:logback-dev.xml
+logging.config=classpath:logback-spring.xml

mec-application/src/main/resources/logback-spring.xml

@@ -1,63 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="10 seconds">
 
-	<property name="LOG_HOME" value="/mdata/logs/gateway-%d{yyyy-MM-dd_HH}-%i.log" />
-	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
-
-	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder charset="UTF-8">
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
-
-	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<FileNamePattern>${LOG_HOME}</FileNamePattern>
-			<MaxHistory>90</MaxHistory>
-			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<MaxFileSize>20MB</MaxFileSize>
-			</TimeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-
-		<encoder>
-			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="com.ym.mec" level="INFO" />
-
-	<!--本地环境:打印控制台 -->
-	<springProfile name="local">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-	<!--开发环境:打印控制台 -->
-	<springProfile name="dev">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-	
-	<springProfile name="test">
-		<root level="INFO">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-	<!--生产环境:输出到文件 -->
-	<springProfile name="prod">
-		<root level="WARN">
-			<appender-ref ref="stdout" />
-			<appender-ref ref="file" />
-		</root>
-	</springProfile>
-
-</configuration>
+    <property name="LOG_HOME" value="/mdata/logs/app-%d{yyyy-MM-dd_HH}-%i.log"/>
+    <property name="CONSOLE_LOG_PATTERN"
+              value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n"/>
+
+    <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder charset="UTF-8">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}</FileNamePattern>
+            <MaxHistory>90</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>20MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="messagefile"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>/mdata/logs/app-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+            <MaxHistory>90</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>20MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="liveFile"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>/mdata/logs/app-live-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
+            <MaxHistory>90</MaxHistory>
+            <TimeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <MaxFileSize>20MB</MaxFileSize>
+            </TimeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+
+        <encoder>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="com.ym.mec" level="INFO"/>
+
+    <logger name="com.ym.mec.thirdparty" level="INFO" additivity="false">
+        <appender-ref ref="messagefile"/>
+    </logger>
+
+    <!--开发环境:打印控制台 -->
+    <logger name="com.ym.mec.biz.service.impl.ImLiveBroadcastRoomServiceImpl" level="INFO" additivity="false">
+        <appender-ref ref="liveFile"/>
+    </logger>
+
+    <!--开发环境:打印控制台 -->
+    <springProfile name="local">
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+            <appender-ref ref="file"/>
+        </root>
+    </springProfile>
+
+    <!--开发环境:打印控制台 -->
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+            <appender-ref ref="file"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="test">
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+            <appender-ref ref="file"/>
+        </root>
+    </springProfile>
+
+    <springProfile name="dev_server">
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+            <appender-ref ref="file"/>
+        </root>
+    </springProfile>
+
+    <!--生产环境:输出到文件 -->
+    <springProfile name="prod">
+        <root level="INFO">
+            <appender-ref ref="stdout"/>
+            <appender-ref ref="file"/>
+        </root>
+    </springProfile>
+
+</configuration>

mec-auth/mec-auth-server/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -2090,4 +2090,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     CourseSchedule findByRoomUid(@Param("roomUid") String roomUid, @Param("type") GroupType type);
 
     List<ExportCourseIncomeDto> exportCourseIncome(@Param("month") String month);
+
+    List<CourseSchedule> getNotStartOnlineNoLive(@Param("beforeTime") Integer beforeTime, @Param("tenantInfoId") Integer tenantInfoId);
+
+    List<CourseSchedule> getEndTimeBetweenYesterdayAndNow();
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroup.java

@@ -34,7 +34,7 @@ public class ImGroup extends BaseEntity {
 	/** 乐团群 MUSIC，班级群 CLASS，训练营 TRAINING 学校SCHOOL*/
 	private String type;
 
-	private String importFlag;
+	private Boolean importFlag;
 
 	public enum GroupTypeEnum implements BaseEnum<String,GroupTypeEnum> {
 		NORMAL("NORMAL", "普通班级", "https://oss.dayaedu.com/default-images/mec/NORMAL.png"),
@@ -196,11 +196,11 @@ public class ImGroup extends BaseEntity {
 		return this.updateTime;
 	}
 
-	public String getImportFlag() {
+	public Boolean getImportFlag() {
 		return importFlag;
 	}
 
-	public void setImportFlag(String importFlag) {
+	public void setImportFlag(Boolean importFlag) {
 		this.importFlag = importFlag;
 	}
 

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupPlus.java

@@ -71,7 +71,7 @@ public class ImGroupPlus implements Serializable {
 
 
     @TableField(value = "import_flag_")
-    private String importFlag;
+    private Boolean importFlag;
 
     //群类型
     @TableField(value = "group_type_")

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

@@ -857,4 +857,8 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	void sendChatRoomMessage(List<CourseSchedule> courseSchedules);
 
     List<ExportCourseIncomeDto> exportCourseIncome(String month);
+
+    void rtcRoomCreate();
+
+    void destroyRtcRoom();
 }

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

@@ -3,13 +3,10 @@ package com.ym.mec.biz.service;
 import com.alibaba.fastjson.JSONObject;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.microsvc.toolkit.middleware.im.message.TencentRequest;
-import com.microsvc.toolkit.middleware.rtc.RTCRoomPluginService;
-import com.ym.mec.biz.dal.dto.im.BasicUserInfo;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.dto.NameDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
-import com.ym.mec.biz.dal.entity.ImHistoryMessage;
 import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.common.service.BaseService;
@@ -195,12 +192,12 @@ public interface ImGroupService extends BaseService<String, ImGroup> {
 	 * 查询总数
 	 * @return
 	 */
-	int queryInfoCount();
+	int queryInfoCount(int targetType);
 
 	/**
 	 * 读取融云数据库信息
 	 */
-	com.yonge.mongodb.PageInfo getRongYunInfo(int page, int size);
+	com.yonge.mongodb.PageInfo getRongYunInfo(int page, int size, int targetType);
 
 	/**
 	 * 导入IM腾讯云

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/CourseScheduleServiceImpl.java

@@ -8,6 +8,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.middleware.live.LivePluginContext;
 import com.microsvc.toolkit.middleware.live.LivePluginService;
 import com.microsvc.toolkit.middleware.live.message.LiveRoomMessage;
+import com.microsvc.toolkit.middleware.rtc.RTCRoomPluginContext;
+import com.microsvc.toolkit.middleware.rtc.RTCRoomPluginService;
+import com.microsvc.toolkit.middleware.rtc.impl.TencentCloudRTCPlugin;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
@@ -36,6 +39,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
+import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext.MessageSender;
 import com.ym.mec.util.collection.ListUtil;
 import com.ym.mec.util.collection.MapUtil;
@@ -47,7 +51,6 @@ import org.apache.commons.collections.CollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang3.SerializationUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.joda.time.DateTime;
@@ -59,7 +62,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.lang.reflect.InvocationTargetException;
@@ -70,9 +72,6 @@ import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType.MUSIC_NETWORK;
@@ -207,11 +206,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     private ImLiveRoomVideoService imLiveRoomVideoService;
 
     @Autowired
+    private RTCRoomPluginContext rtcRoomPluginContext;
+    @Autowired
     private ImLiveRoomVideoDao imLiveRoomVideoDao;
 
     @Autowired
     private LiveGroupPlusMapper liveGroupPlusMapper;
 
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
     private final Logger businessLogger = LoggerFactory
             .getLogger(this.getClass());
 
@@ -6206,6 +6210,96 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
+    public void rtcRoomCreate() {
+
+        List<TenantInfo> list = tenantInfoService.list();
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+
+        for (TenantInfo tenantInfo : list) {
+            //是否提前进入教室
+            String courseBeforeBufferTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.COURSE_BEFORE_BUFFER_TIME, tenantInfo.getId());
+            if (StringUtils.isEmpty(courseBeforeBufferTime)) {
+                courseBeforeBufferTime = "5";
+            }
+            Integer beforeTime = Integer.parseInt(courseBeforeBufferTime) + 5;
+
+            List<CourseSchedule> scheduleList = courseScheduleDao.getNotStartOnlineNoLive(beforeTime, tenantInfo.getId());
+            if (CollectionUtils.isEmpty(scheduleList)) {
+                continue;
+            }
+            for (CourseSchedule courseSchedule : scheduleList) {
+                try {
+                    RTCRoomPluginService pluginService;
+                    if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
+                        pluginService = rtcRoomPluginContext.getPluginService();
+                    } else {
+                        pluginService = rtcRoomPluginContext.getPluginService(courseSchedule.getServiceProvider());
+                    }
+                    // 群组帐号注册
+                    Teacher teacher = teacherDao.get(courseSchedule.getTeacherId());
+                    if (Objects.nonNull(teacher)) {
+                        try {
+                            pluginService.register(courseSchedule.getTeacherId().toString(), teacher.getRealName(), teacher.getAvatar());
+                        } catch (Exception e) {
+                            log.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
+                        }
+                    }
+
+                    //记录用户实际选择的房间
+                    String roomId = courseSchedule.getId().toString();
+                    if (courseSchedule.getGroupType() == GroupType.COMM) {
+                        roomId = "I" + roomId;
+                    } else {
+                        roomId = "S" + roomId;
+                    }
+
+                    // 生成群组
+                    pluginService.chatRoomCreate(roomId, courseSchedule.getName(), courseSchedule.getTeacherId().toString());
+                    courseScheduleDao.updateLiveRemind(courseSchedule.getId(),1);
+                } catch (Exception e) {
+                    log.error("创建rtc房间失败", e);
+                }
+            }
+        }
+        
+
+    }
+
+    @Override
+    public void destroyRtcRoom() {
+
+        // 查询结束时间在昨天到现在的课程
+        List<CourseSchedule> scheduleList = courseScheduleDao.getEndTimeBetweenYesterdayAndNow();
+        if (CollectionUtils.isEmpty(scheduleList)) {
+            return;
+        }
+        for (CourseSchedule courseSchedule : scheduleList) {
+            try {
+                RTCRoomPluginService pluginService;
+                if (StringUtils.isBlank(courseSchedule.getServiceProvider())) {
+                    pluginService = rtcRoomPluginContext.getPluginService();
+                } else {
+                    pluginService = rtcRoomPluginContext.getPluginService(courseSchedule.getServiceProvider());
+                }
+                if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
+                    // 腾讯云群销毁
+                    String roomId = courseSchedule.getId().toString();
+                    if (courseSchedule.getGroupType() == GroupType.COMM) {
+                        roomId = "I" + roomId;
+                    } else {
+                        roomId = "S" + roomId;
+                    }
+                    pluginService.chatRoomDestroy(roomId);
+                }
+            } catch (Exception e) {
+                log.error("销毁rtc房间失败", e);
+            }
+        }
+    }
+
+    @Override
     public List<CourseScheduleStudentDto> queryDetailList(CourseDetailQueryInfo courseDetailQueryInfo) {
 
 

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());
         //更新机构信息
@@ -765,7 +771,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
 
                 ImGroupWrapper.ImUserInfo imUserInfo = imGroupCoreService.register(String.valueOf(userInfo.getId()), "",
                     username, sysUserService.getImAvatar(userInfo));
-                log.info("用户更新信息同步到三方成功，userId={}, ret={}", userInfo.getId(), JSON.toJSONString(imUserInfo));
+                log.info("用户更新信息同步到三方成功，userId={}, username={}, ret={}", userInfo.getId(), username, JSON.toJSONString(imUserInfo));
             } catch (Exception e) {
                 log.error("用户更新信息同步到三方失败，userId：{}", userInfo.getId(), e);
             }

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

@@ -12,7 +12,6 @@ import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
 import com.microsvc.toolkit.middleware.im.message.MessageWrapper;
 import com.microsvc.toolkit.middleware.im.message.TencentRequest;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
 import com.ym.mec.biz.dal.dao.ImGroupDao;
 import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
@@ -78,6 +77,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -891,6 +891,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
      */
     @Override
     public void groupTransfer(String startTime, String endTime) {
+
+        // 100个线程的无界线程池
+        ExecutorService executorService = Executors.newFixedThreadPool(100);
         int page = 1;
         int size = 100;
         QueryInfo queryInfo = new QueryInfo();
@@ -899,8 +902,12 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         queryInfo.setImportFlag(false);
         PageInfo<ImGroup> imGroupPageInfo = this.queryPage(queryInfo);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int total = imGroupPageInfo.getTotal();
         int importImGroupCount = 0;
-        while (!imGroupPageInfo.getRows().isEmpty()) {
+        int num = (int) Math.ceil(total / 100);
+        for (int i = 0; i <=num ; i++) {
+
+            imGroupPageInfo = this.queryPage(queryInfo);
             List<ImGroup> rows = imGroupPageInfo.getRows();
             try {
                 if (StringUtils.isNotEmpty(startTime)) {
@@ -920,34 +927,62 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             } catch (ParseException e) {
                 throw new BizException("时间区间参数错误，格式为：yyyy-MM-dd");
             }
-            groupTransfer(rows);
+            List<Future<?>> list = new ArrayList<>();
+
+            rows.forEach(imGroup -> {
+
+                list.add(executorService.submit(() -> {
+                    log.info("群销毁开始：{}", imGroup.getId());
+                    // 先删除群组
+                    try {
+                        // 解散群
+                        imPluginContext.getPluginService().groupDismiss(imGroup.getId(), new ArrayList<>());
+                    } catch (Exception e) {
+                        log.error(String.format("群迁移删除群聊失败：%s", e.getMessage()), e);
+                    }
+                }));
+            });
+            for (Future<?> future : list) {
+                try {
+                    future.get();
+                } catch (Exception e){
+                    log.error("群销毁失败",e);
+                }
+            }
+
+            try {
+                Thread.sleep(1500);
+            } catch (InterruptedException e) {
+                log.error("线程休眠失败",e);
+            }
+
+
+            list.clear();
+            for (ImGroup row : rows) {
+                list.add(executorService.submit(() -> {
+                    groupTransfer(Lists.newArrayList(row));
+                }));
+            }
+
+            for (Future<?> future : list) {
+                try {
+                    future.get();
+                } catch (Exception e){
+                    log.error("群迁移失败",e);
+                }
+            }
             importImGroupCount += rows.size();
             log.info("------------------------------- import im group --------------------------------------------");
-            log.info("import im group success count:{}/{}", importImGroupCount, imGroupPageInfo.getTotal());
-
-            page++;
-            queryInfo.setPage(page);
-            imGroupPageInfo = this.queryPage(queryInfo);
+            log.info("import im group success count:{}/{}", importImGroupCount, total);
         }
         log.info("-------------------- import im group finished and success! -------------------------------");
+        executorService.shutdown();
     }
 
     private void groupTransfer(List<ImGroup> records) {
 
         for (ImGroup imGroup : records) {
 
-            log.info("群销毁开始：{}", imGroup.getId());
-            // 先删除群组
-            try {
-                // 解散群
-                imPluginContext.getPluginService().groupDismiss(imGroup.getId(), new ArrayList<>());
-            } catch (Exception e) {
-                log.error(String.format("群迁移删除群聊失败：%s", e.getMessage()), e);
-            }
-        }
-
-        for (ImGroup imGroup : records) {
-
             log.info("群迁移开始：{}", imGroup.getId());
 
             GroupMemberQueryInfo groupMemberQueryInfo = new GroupMemberQueryInfo();
@@ -967,29 +1002,44 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 }
                 importGroup.setType("Public");
                 importGroup.setGroupId(imGroup.getId());
-                importGroup.setName(imGroup.getName());
+                importGroup.setName(StringUtils.isBlank(imGroup.getName())?imGroup.getId():imGroup.getName());
                 importGroup.setIntroduction(imGroup.getIntroduce());
                 importGroup.setNotification(imGroup.getMemo());
                 importGroup.setFaceUrl(imGroup.getImg());
                 if (StringUtils.isEmpty(imGroup.getImg())) {
-                    importGroup.setFaceUrl(imGroup.getGroupType().getAvatar());
+                    importGroup.setFaceUrl(Optional.ofNullable(imGroup.getGroupType()).orElse(ImGroup.GroupTypeEnum.NORMAL).getAvatar());
                 }
                 importGroup.setApplyJoinOption("FreeAccess");
-                importGroup.setCreateTime(imGroup.getCreateTime().getTime() / 1000);
-                if (admin != null) {
-                    register(admin.getUserId().toString(), getClientType(admin.getRoleType()),"");
+                if (imGroup.getCreateTime() == null) {
+                    imGroup.setCreateTime(DateTime.now().plusYears(-1).toDate());
                 }
+                importGroup.setCreateTime(imGroup.getCreateTime().getTime() / 1000);
+//                if (admin != null) {
+//                    register(admin.getUserId().toString(), getClientType(admin.getRoleType()),"");
+//                }
                 imPluginContext.getPluginService().importGroup(importGroup);
 
                 List<ImGroupMember> groupMembers = pageInfo.getRows().stream()
                         .filter(next -> !next.getIsAdmin()).collect(Collectors.toList());
+
+
+                groupMembers = groupMembers
+                    .stream()
+                    .filter(next -> next.getUserId() != null && next.getUserId() > 0)
+                    .collect(Collectors.toList());
+
                 if (groupMembers.isEmpty()) {
                     imGroupDao.updateImportStatusSuccess(imGroup.getId());
                     continue;
                 }
-                for (ImGroupMember member : groupMembers) {
-                    register(member.getUserId().toString(), getClientType(member.getRoleType()),"");
-                }
+
+//                for (ImGroupMember member : groupMembers) {
+//                    try {
+//                        register(member.getUserId().toString(), getClientType(member.getRoleType()),"");
+//                    }catch (Exception e){
+//                        log.error("用户注册失败",e);
+//                    }
+//                }
                 MessageWrapper.ImportGroupMember importGroupMember = new MessageWrapper.ImportGroupMember();
                 importGroupMember.setGroupId(imGroup.getId());
                 Date date = new DateTime(imGroup.getCreateTime()).plusSeconds(3).toDate();
@@ -998,6 +1048,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                             MessageWrapper.ImportGroupMemberData data = new MessageWrapper.ImportGroupMemberData();
                             data.setMemberAccount(getImUserId(next.getUserId().toString(),
                                     getClientType(next.getRoleType())));
+                            if (next.getCreateTime() == null){
+                                next.setCreateTime(DateTime.now().plusMonths(-6).toDate());
+                            }
                             if (next.getCreateTime().getTime() / 1000 <= importGroup.getCreateTime()) {
                                 data.setJoinTime(date.getTime() / 1000);
                             } else {
@@ -1011,14 +1064,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 imGroupDao.updateImportStatusSuccess(imGroup.getId());
             } catch (Exception e) {
                 log.error(String.format("群迁移失败,失败群组：%s", JSON.toJSONString(imGroup)));
-                log.error(String.format("群迁移失败：%s", e.getMessage()));
+                log.error("群迁移失败：", e);
             }
             log.info("群迁移成功：{}", imGroup.getId());
         }
     }
 
     private void register(String userId, String clientType,String avatar) {
-        SysUser user = sysUserService.queryUserById(Integer.valueOf(userId));
+        SysUser user = teacherDao.getUser(Integer.valueOf(userId));
         if (user == null) {
             return;
         }
@@ -1039,6 +1092,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 //            imGroupCoreService.register(userId,clientType, username, sysUserService.getImAvatar(user));
             imGroupCoreService.register(userId,clientType, username, avatar);
         } catch (Exception e) {
+            log.error("register user error,userId:{}", userId);
             log.error("register user error", e);
         }
     }
@@ -1064,12 +1118,21 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     @Override
     public void importUser() {
         int page = 1;
-        int rows = 200;
+        int rows = 100;
 
         int count = 0;
 
+        // 100个线程的无界线程池
+        ThreadPoolExecutor executorService =  new ThreadPoolExecutor(100, 100,
+            0L, TimeUnit.MILLISECONDS,
+            new LinkedBlockingQueue<Runnable>());
+
         log.info("------------------------------- import user student ---------------------------");
+        // 学生花费时间计算
+        long start = System.currentTimeMillis();
         List<String[]> student = getStudent(page, rows);
+        long end = System.currentTimeMillis();
+        log.info("查询学生花费时间：{}毫秒", end - start);
         SysConfig studentAvatar = sysConfigService.findByParamName(SysConfigService.STUDENT_DEFAULT_AVATAR);
         while (!student.isEmpty()) {
             for (String[] next : student) {
@@ -1077,8 +1140,17 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 if (StringUtils.isEmpty(avatar)) {
                     avatar = studentAvatar.getParanValue();
                 }
-                register(next[0], next[1], avatar);
+                String finalAvatar = avatar;
+                executorService.execute(() -> {
+                    register(next[0], next[1], finalAvatar);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        log.error("线程等待异常", e);
+                    }
+                });
             }
+
             count += student.size();
             log.info("import im student success count:{}", count);
             page++;
@@ -1090,15 +1162,28 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         count = 0;
         page = 1;
         SysConfig staffAvatar = sysConfigService.findByParamName(SysConfigService.USER_DEFAULT_AVATAR);
+        start = System.currentTimeMillis();
         List<String[]> staff = getStaff(page, rows);
+        end = System.currentTimeMillis();
+        log.info("查询老师花费时间：{}毫秒", end - start);
         while (!staff.isEmpty()) {
+
             for (String[] next : staff) {
                 String avatar = next[2];
                 if (StringUtils.isEmpty(avatar)) {
                     avatar = staffAvatar.getParanValue();
                 }
-                register(next[0], next[1], avatar);
+                String finalAvatar = avatar;
+                executorService.execute(() -> {
+                    register(next[0], next[1], finalAvatar);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        log.error("线程等待异常", e);
+                    }
+                });
             }
+
             count += staff.size();
             log.info("import im staff success count:{}", count);
             page++;
@@ -1117,7 +1202,15 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 if (StringUtils.isEmpty(avatar)) {
                     avatar = empAvatar.getParanValue();
                 }
-                register(next[0], next[1], avatar);
+                String finalAvatar = avatar;
+                executorService.execute(() -> {
+                    register(next[0], next[1], finalAvatar);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        log.error("线程等待异常", e);
+                    }
+                });
             }
             count += emps.size();
             log.info("import im emps success count:{}", count);
@@ -1136,7 +1229,15 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 if (StringUtils.isEmpty(avatar)) {
                     avatar = teacherAvatar.getParanValue();
                 }
-                register(next[0], next[1], avatar);
+                String finalAvatar = avatar;
+                executorService.execute(() -> {
+                    register(next[0], next[1], finalAvatar);
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        log.error("线程等待异常", e);
+                    }
+                });
             }
             count += teachers.size();
             log.info("import im teacher success count:{}", count);
@@ -1144,12 +1245,21 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             teachers = getTeachers(page, rows);
         }
 
+        while (executorService.getQueue().size() > 0) {
+            try {
+                log.info("线程池中正在执行的任务数量：{},等待数量：{}", executorService.getActiveCount(),executorService.getQueue().size());
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                log.error("线程等待异常", e);
+            }
+        }
+        executorService.shutdown();
         log.info("------------------------------- import user success ---------------------------");
     }
 
     @Override
-    public int queryInfoCount() {
-        long count = historyMessageService.selectCount(0,new DateTime().plusMonths(-2).toDate());
+    public int queryInfoCount(int targetType) {
+        long count = historyMessageService.selectCount(0,new DateTime().plusMonths(-2).toDate(),targetType);
         return (int) count;
     }
 
@@ -1211,8 +1321,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
 
     @Override
-    public com.yonge.mongodb.PageInfo<HistoryMessage> getRongYunInfo( int page, int size) {
-        com.yonge.mongodb.PageInfo<HistoryMessage> pageInfo = historyMessageService.selectPage(page, size, 0,new DateTime().plusMonths(-2).toDate());
+    public com.yonge.mongodb.PageInfo<HistoryMessage> getRongYunInfo(int page, int size, int targetType) {
+        com.yonge.mongodb.PageInfo<HistoryMessage> pageInfo = historyMessageService.selectPage(page, size, 0,new DateTime().plusMonths(-2).toDate(),targetType);
         //List<HistoryMessage> imHistoryMessageslist = imGroupDao.selectAll(result,size);
         return pageInfo;
     }
@@ -1226,7 +1336,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     public void importInfo(List<HistoryMessage> info) throws Exception {
 
         for (HistoryMessage i : info) {//判断消息类型
-            log.info("消息导入 HistoryMessage：{}", JSON.toJSONString(i));
+//            log.info("消息导入 HistoryMessage：{}", JSON.toJSONString(i));
             try {
                 Integer type = i.getTargetType();
                 if (type == 1) {
@@ -1262,8 +1372,21 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     //设置接收人
                     privateImportMessage.setToAccount(targetIdUserId);
                     //设置随机数
-                    privateImportMessage.setMsgRandom(new Random().nextInt());
+                    if (i.getMsgRandom() == null) {
+                        int nextInt = Math.abs(new Random().nextInt());
+                        privateImportMessage.setMsgRandom(nextInt);
+                        i.setMsgRandom(nextInt);
+                    } else {
+                        privateImportMessage.setMsgRandom(i.getMsgRandom());
+                    }
 
+                    if (i.getMsgSeq() == null) {
+                        int nextInt = Math.abs(new Random().nextInt());
+                        i.setMsgSeq(nextInt);
+                        privateImportMessage.setMsgSeq(nextInt);
+                    } else {
+                        privateImportMessage.setMsgSeq(i.getMsgSeq());
+                    }
                     //设置发送时间
                     String time = i.getDateTime();
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1271,7 +1394,13 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         Date date = df.parse(time);
                         long dateTime = date.getTime();
                         dateTime = dateTime / (1000);
-                        privateImportMessage.setMsgTimeStamp(dateTime);
+                        if (i.getMsgTimeStamp() == null) {
+                            privateImportMessage.setMsgTimeStamp(dateTime);
+                            i.setMsgTimeStamp(dateTime);
+                        } else {
+                            privateImportMessage.setMsgTimeStamp(i.getMsgTimeStamp());
+
+                        }
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
@@ -1316,6 +1445,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         imPluginContext.getPluginService().importPrivateMessage(privateImportMessage);
                         //为已导入数据更改标识
                         updateStatus(i,1);
+                        historyMessageService.updateMsg(i.getMsgUID(),i.getMsgSeq(),i.getMsgRandom(),i.getMsgTimeStamp());
+                        log.info("导入私聊消息成功");
                     } catch (Exception e) {
                         updateStatus(i,2);
                         log.error("导入私聊IM消息失败 msg:{},entity:{}", list, i, e);
@@ -1392,11 +1523,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                         imPluginContext.getPluginService().importGroupMessage(groupImportMessage);
                         //为已导入数据更改标识
                         updateStatus(i,1);
+                        log.info("导入消息成功");
                     } catch (Exception e) {
                         updateStatus(i,2);
                         log.error("导入群组IM消息失败 msg:{},entity:{}", list, i, e);
                     }
-                    log.info("导入消息成功：{}", i);
                 }
             }catch (Exception e) {
                 log.error("导入消息失败:", e);
@@ -1432,14 +1563,22 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 tencent.setGroupId(historyMessage.getGroupId());
                 bodyList = getGroupMessage(historyMessage,jsonObject);
             } else {
+
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
 
             if (CollectionUtils.isEmpty(bodyList)) {
+
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
             bodyList = bodyList.stream().filter(Objects::nonNull).collect(Collectors.toList());
             if (CollectionUtils.isEmpty(bodyList)) {
+                historyMessage.setSyncFlag(1);
+                historyMessageService.updateSyncFlag(historyMessage.getMsgUID(),1);
                 continue;
             }
             // 发送人
@@ -1472,7 +1611,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             String content = jsonObject.getString("content");
 
             // http开头的链接 扩展字段没有值 放在扩展字段里
-            if (content.startsWith("http")) {
+            if (StringUtils.isNotBlank(content) && content.startsWith("http")) {
                 String extra = jsonObject.getString("extra");
                 if (StringUtils.isEmpty(extra)) {
                     jsonObject.put("extra", content);
@@ -1550,7 +1689,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             String content = jsonObject.getString("content");
 
             // http开头的链接 扩展字段没有值 放在扩展字段里
-            if (content.startsWith("http")) {
+            if (StringUtils.isNotBlank(content) && content.startsWith("http")) {
                 String extra = jsonObject.getString("extra");
                 if (StringUtils.isEmpty(extra)) {
                     jsonObject.put("extra", content);

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

@@ -2263,6 +2263,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                     throw new BizException("当前用户存在更早的待直播的房间");
                 }*/
 
+                ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
                 //去融云创建房间
                 LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());
 
@@ -2272,6 +2273,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 // 创建直播间IM群
                 pluginService.chatRoomCreate(room.getRoomUid(), room.getRoomTitle(),imGroupCoreService.getImUserId(sysUser.getId().toString(),room.getClientType().getCode()));
 
+                // 设置直播间房间属性默认值
+                setDefaultRoomDefinedInfo(roomVo);
                 createSpeakerInfo(room, sysUser);
                 Boolean whetherVideoFlag = getRoomConfig(room.getRoomConfig()).map(o -> o.getWhether_video() == 0).orElse(true);
 
@@ -2320,15 +2323,12 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                                                                         .eq(ImLiveRoomBlack::getRoomUid, room.getRoomUid())
                                                                         .list();
 
-                ImLiveBroadcastRoomVo roomVo = getImLiveBroadcastRoomVo(room.getRoomUid());
                 if (CollectionUtils.isNotEmpty(blackList)) {
                     // 将黑名单人员踢出房间
                     for (ImLiveRoomBlack black : blackList) {
                         imLiveRoomBlackService.setBlack(black.getUserId(),roomVo);
                     }
                 }
-                // 设置直播间房间属性默认值
-                setDefaultRoomDefinedInfo(roomVo);
             } finally {
                 if (lock.getHoldCount() != 0 && lock.isHeldByCurrentThread()) {
                     lock.unlock();
@@ -2342,6 +2342,15 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     }
 
     private void setDefaultRoomDefinedInfo(ImLiveBroadcastRoomVo roomVo) {
+        try {
+            List<TencentWrapper.ChatRoomGroupCounter> chatRoomGroupDefinedData = livePluginContext
+                .getPluginService(roomVo.getServiceProvider()).getChatRoomGroupDefinedData(roomVo.getRoomUid());
+            if (CollectionUtils.isNotEmpty(chatRoomGroupDefinedData)){
+                return;
+            }
+        } catch (Exception e) {
+            log.error("获取直播群配置失败", e);
+        }
         List<TencentRequest.ChatRoomGroupDefinedData> appDefinedData = new ArrayList<>();
         Arrays.stream(EGroupDefinedDataType.values()).forEach(key -> {
             switch (key) {
@@ -2398,6 +2407,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                                                                                    .groupId(roomVo.getRoomUid())
                                                                                    .appDefinedData(appDefinedData)
                                                                                    .build());
+            log.info("设置直播群配置成功 roomUid:{}", roomVo.getRoomUid());
         } catch (Exception e) {
             log.error("设置直播群配置失败", e);
         }

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,8 +765,12 @@ 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());
     }
 
     @Override
@@ -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/SysMessageServiceImpl.java

@@ -326,14 +326,28 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		LOGGER.info("sendGroupMessage groupSend ret={}", JSON.toJSONString(imMessageDto));
 		//ExecutorService executor = Executors.newCachedThreadPool();
 		CompletableFuture.runAsync(()->{
-			imFeignService.groupSend(imMessageDto);
+			Object ret;
+			int maxRetry = 5;
+			do {
+				// 若发送失败，重试5次后放弃
+				ret = imFeignService.groupSend(imMessageDto);
+				LOGGER.info("sendGroupMessage groupSend retry={}, ret={}", maxRetry, JSON.toJSONString(ret));
+			} while (ret == null && maxRetry-- > 0);
 		});
 	}
 
 
     public void sendImMessage(ImMessageDto imMessageDto){
 		LOGGER.info("sendImMessage privateSend ret={}", JSON.toJSONString(imMessageDto));
-        CompletableFuture.runAsync(()-> imFeignService.privateSend(imMessageDto));
+        CompletableFuture.runAsync(()-> {
+			Object ret;
+			int maxRetry = 5;
+			do {
+				// 若发送失败，重试5次后放弃
+				ret = imFeignService.privateSend(imMessageDto);
+				LOGGER.info("sendGroupMessage groupSend retry={}, ret={}", maxRetry, JSON.toJSONString(ret));
+			} while (ret == null && maxRetry-- > 0);
+		});
     }
 
 	@Override

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

@@ -4736,7 +4736,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/CourseScheduleMapper.xml

@@ -4506,4 +4506,18 @@
           AND cs.tenant_id_ = 1
         group by cs.id_ order by cs.organ_id_;
     </select>
+
+    <select id="getNotStartOnlineNoLive" resultMap="CourseSchedule">
+        select * from course_schedule where status_ = 'NOT_START' and teach_mode_ = 'ONLINE' and type_ != 'LIVE'
+        and CONCAT(class_date_,' ',start_class_time_) &lt;= date_format(date_add(now(),interval #{beforeTime} minute),'%Y-%m-%d %H:%i:%s')
+
+        and live_remind_ = 0
+        and tenant_id_ = #{tenantInfoId}
+    </select>
+
+    <select id="getEndTimeBetweenYesterdayAndNow" resultMap="CourseSchedule">
+        select * from course_schedule where status_ = 'OVER' and teach_mode_ = 'ONLINE' and type_ != 'LIVE'
+        and CONCAT(class_date_,' ',end_class_time_) &gt;= date_format(date_add(now(),interval -1 day),'%Y-%m-%d')
+        and CONCAT(class_date_,' ',end_class_time_) &lt;= date_format(now(),'%Y-%m-%d %H:%i:%s')
+    </select>
 </mapper>

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/HistoryMessage.java

@@ -46,6 +46,9 @@ public class HistoryMessage implements Serializable {
     private String appId;
 
     private String busChannel;
+    private Integer msgSeq;
+    private Integer msgRandom;
+    private Long msgTimeStamp;
 
     public String getFromUserId() {
         return fromUserId;

mec-common/audit-log/src/main/java/com/yonge/log/service/HistoryMessageService.java

@@ -5,9 +5,7 @@ import com.yonge.mongodb.PageInfo;
 import com.yonge.mongodb.service.BaseServiceWithMongo;
 
 import java.io.File;
-import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.List;
 
 public interface HistoryMessageService extends BaseServiceWithMongo<String, HistoryMessage> {
 
@@ -18,9 +16,9 @@ public interface HistoryMessageService extends BaseServiceWithMongo<String, Hist
      */
     void saveImHistoryMessage(File file) throws Exception;
 
-    long selectCount(int status, Date date);
+    long selectCount(int status, Date date, int targetType);
 
-    PageInfo<HistoryMessage> selectPage(int page, int size, int status, Date date);
+    PageInfo<HistoryMessage> selectPage(int page, int size, int status, Date date, int targetType);
 
     void updateStatus(String id, Integer status);
 
@@ -31,4 +29,7 @@ public interface HistoryMessageService extends BaseServiceWithMongo<String, Hist
     PageInfo<HistoryMessage> getImToTencent(long page, int size);
 
     void updateSyncFlag(String id, int syncFlag);
+
+    void updateMsg(String msgUID, Integer msgSeq, Integer msgRandom, Long msgTimeStamp);
+
 }

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/HistoryMessageServiceImpl.java

@@ -1,22 +1,18 @@
 package com.yonge.log.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.mongodb.operation.AggregateOperation;
 import com.yonge.log.dal.dao.HistoryMessageDao;
 import com.yonge.log.dal.model.HistoryMessage;
-import com.yonge.log.dal.model.HistoryMessageTencent;
 import com.yonge.log.service.HistoryMessageService;
 import com.yonge.mongodb.PageInfo;
 import com.yonge.mongodb.dao.BaseDaoWithMongo;
 import com.yonge.mongodb.service.impl.BaseServiceImplWithMongo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -33,7 +29,6 @@ import java.util.Set;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -64,7 +59,7 @@ public class HistoryMessageServiceImpl extends BaseServiceImplWithMongo<String,
     }
 
     @Override
-    public long selectCount(int status, Date date) {
+    public long selectCount(int status, Date date, int targetType) {
         Query query = new Query();
 
         // 查询status 为null or 0
@@ -77,12 +72,14 @@ public class HistoryMessageServiceImpl extends BaseServiceImplWithMongo<String,
 
 
         Criteria criteria = Criteria.where("dateTime").gt(dateFormat).orOperator(Criteria.where("status").is(0),Criteria.where("status").is(null));
+        criteria.and("targetType").is(targetType);
+        criteria.and("classname").in("RC:ImgMsg", "RC:GIFMsg", "RC:HQVCMsg", "RC:FileMsg", "RC:SightMsg", "RC:LBSMsg", "RC:ImgTextMsg","RC:TxtMsg");
         query.addCriteria(criteria);
         return mongoTemplate.count(query,HistoryMessage.class);
     }
 
     @Override
-    public PageInfo<HistoryMessage> selectPage(int page, int size, int status, Date date) {
+    public PageInfo<HistoryMessage> selectPage(int page, int size, int status, Date date, int targetType) {
         PageInfo<HistoryMessage> pageInfo = new PageInfo<HistoryMessage>(page, size);
 
         // date 转 LocalDateTime
@@ -90,12 +87,14 @@ public class HistoryMessageServiceImpl extends BaseServiceImplWithMongo<String,
 
         String dateFormat = ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
         List<HistoryMessage> dataList = null;
-        long total = this.selectCount(status,date);
+        long total = this.selectCount(status,date, targetType);
         if (total > 0) {
             pageInfo.setTotal(total);
 
             Query query = new Query();
             Criteria criteria = Criteria.where("dateTime").gt(dateFormat).orOperator(Criteria.where("status").is(0),Criteria.where("status").is(null));
+            criteria.and("targetType").is(targetType);
+            criteria.and("classname").in("RC:ImgMsg", "RC:GIFMsg", "RC:HQVCMsg", "RC:FileMsg", "RC:SightMsg", "RC:LBSMsg", "RC:ImgTextMsg","RC:TxtMsg");
             query.addCriteria(criteria);
             query.skip(pageInfo.getOffset()).limit(pageInfo.getLimit());
             dataList = mongoTemplate.find(query, HistoryMessage.class);
@@ -172,6 +171,20 @@ public class HistoryMessageServiceImpl extends BaseServiceImplWithMongo<String,
         mongoTemplate.updateMulti(query, update, HistoryMessage.class);
     }
 
+    @Override
+    public void updateMsg(String msgUID, Integer msgSeq, Integer msgRandom, Long msgTimeStamp) {
+
+        Criteria criteria = Criteria.where("_id").is(msgUID);
+        Query query = new Query(criteria);
+
+        Update update = new Update();
+        update.set("msgSeq", msgSeq); // 设置新的 status 值
+        update.set("msgRandom", msgRandom); // 设置新的 status 值
+        update.set("msgTimeStamp", msgTimeStamp); // 设置新的 status 值
+
+        mongoTemplate.updateMulti(query, update, HistoryMessage.class);
+    }
+
 
 //	public static void main(String[] args) throws Exception {
 //		doNioReadFile1(new File("/Users/chenxiaoyu/Documents/77fe9ce6-7d91-4568-afe3-9e8ac351e87f.zip"));

mec-common/audit-log/src/main/java/com/yonge/log/service/impl/HistoryMessageTenantServiceImpl.java

@@ -78,7 +78,7 @@ public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<St
     @Override
     public int initMsgBodyJsonCount() {
         Query query = new Query();
-        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("syncFlag").is(null));
+        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("json_flag").is(null));
         query.addCriteria(criteria);
         return Long.valueOf(mongoTemplate.count(query,HistoryMessageTencent.class)).intValue();
     }
@@ -86,7 +86,7 @@ public class HistoryMessageTenantServiceImpl extends BaseServiceImplWithMongo<St
     @Override
     public void initMsgBodyJson(int page, int size) {
         Query query = new Query();
-        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("syncFlag").is(null));
+        Criteria criteria = Criteria.where("msg_body_json").is(null).orOperator(Criteria.where("json_flag").is(0),Criteria.where("json_flag").is(null));
         query.addCriteria(criteria);
         query.skip(page).limit(size);
         List<HistoryMessageTencent> historyMessageTencents = mongoTemplate.find(query, HistoryMessageTencent.class);

mec-eureka/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-gateway/mec-gateway-web/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

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

@@ -374,4 +374,12 @@ public class RoomController{
         Boolean result = roomService.memberOnlineStatus(statusList, nonce, timestamp, signature);
         return new BaseResponse<>(result);
     }
+
+
+    @RequestMapping(value = "createRtcRoom", method = RequestMethod.GET)
+    public Object createRtcRoom(@RequestParam Long courseScheduleId)
+            throws Exception {
+        roomService.createRtcGroup(courseScheduleId);
+        return new BaseResponse<>();
+    }
 }

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 register: {}", 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 {

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -60,7 +60,6 @@ import org.joda.time.format.DateTimeFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -683,21 +682,8 @@ public class RoomServiceImpl implements RoomService {
                 log.info("createImGroup: roomId = {}, userId = {}", roomId, actualTeacherId);
                 if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
 
-                    // 群组帐号注册
-                    Teacher teacher = teacherDao.get(courseSchedule.getTeacherId());
-                    if (Objects.nonNull(teacher)) {
-                        try {
-                            pluginService.register(courseSchedule.getTeacherId().toString(), teacher.getRealName(), teacher.getAvatar());
-                        } catch (Exception e) {
-                            log.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
-                        }
-                    }
 
-                    // 生成群组
-                    pluginService.chatRoomCreate(roomId, courseSchedule.getName(), courseSchedule.getTeacherId().toString());
-
-                    // 更新群自定义字段
-                    updateChatRoomGroupData(roomId, courseSchedule, pluginService);
+                    createRtcGroup(courseSchedule.getId());
 
                     // 群组老师信息
                     List<ImGroupMemberWrapper.ImGroupMember> groupMembers = Lists.newArrayList(ImGroupMemberWrapper.ImGroupMember
@@ -742,6 +728,41 @@ public class RoomServiceImpl implements RoomService {
         }
     }
 
+    @Override
+    public void createRtcGroup(Long courseScheduleId) throws Exception {
+
+        CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
+        if (Objects.isNull(courseSchedule)) {
+            log.warn("createRtcGroup courseSchedule is null: courseScheduleId = {}", courseScheduleId);
+            return;
+        }
+
+        RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(courseSchedule.getServiceProvider());
+        // 群组帐号注册
+        Teacher teacher = teacherDao.get(courseSchedule.getTeacherId());
+        if (Objects.nonNull(teacher)) {
+            try {
+                pluginService.register(courseSchedule.getTeacherId().toString(), teacher.getRealName(), teacher.getAvatar());
+            } catch (Exception e) {
+                log.error("直播房间群主注册失败: userId={}", courseSchedule.getTeacherId(), e);
+            }
+        }
+
+        //记录用户实际选择的房间
+        String roomId = courseSchedule.getId().toString();
+        if (courseSchedule.getGroupType() == GroupType.COMM) {
+            roomId = "I" + roomId;
+        } else {
+            roomId = "S" + roomId;
+        }
+
+        // 生成群组
+        pluginService.chatRoomCreate(roomId, courseSchedule.getName(), courseSchedule.getTeacherId().toString());
+
+        // 更新群自定义字段
+        updateChatRoomGroupData(roomId, courseSchedule, pluginService);
+    }
+
     /**
      * 更新群自定义字段
      * @param roomId 群ID
@@ -783,7 +804,7 @@ public class RoomServiceImpl implements RoomService {
         RTCRoomPluginService pluginService = rtcRoomPluginContext.getPluginService(serviceProvider);
         if (TencentCloudRTCPlugin.PLUGIN_NAME.equals(pluginService.pluginName())) {
             // 腾讯云群销毁
-            pluginService.chatRoomDestroy(roomId);
+//            pluginService.chatRoomDestroy(roomId);
         } else {
             // 融云群销毁
             // 销毁群组

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -112,6 +112,8 @@ public interface RoomService {
      */
     void adjustMusicScore(MusicScoreData musicScoreData) throws Exception;
 
+    void createRtcGroup(Long courseScheduleId) throws Exception;
+
     /**
      * 移动端用户加入房间失败
      * @author zouxuan

mec-im/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-mall/mall-admin/src/main/resources/bootstrap-prod.yml

@@ -3,7 +3,7 @@ spring:
     nacos:
       config:
         server-addr: 10.206.0.12:8848
-        namespace: f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+        namespace: b7aee20b-41e8-43d8-8e2d-45b6447f66ae
         group: DEFAULT_GROUP
         prefix: mall-admin
         file-extension: yaml

mec-mall/mall-portal/src/main/resources/bootstrap-prod.yml

@@ -3,7 +3,7 @@ spring:
     nacos:
       config:
         server-addr: 10.206.0.12:8848
-        namespace: f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+        namespace: b7aee20b-41e8-43d8-8e2d-45b6447f66ae
         group: DEFAULT_GROUP
         prefix: mall-portal
         file-extension: yaml

mec-task/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

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

@@ -0,0 +1,59 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.PhotoAlbum;
+import com.ym.mec.biz.dal.page.PhotoQueryInfo;
+import com.ym.mec.biz.service.PhotoAlbumService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("photoAlbum")
+@Api(tags = "相册")
+@RestController
+public class PhotoAlbumController extends BaseController {
+
+	@Autowired
+	private PhotoAlbumService photoAlbumService;
+
+	@ApiOperation("新增")
+	@PostMapping(value = "add")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/add')")
+	public Object add(PhotoAlbum photoAlbum) {
+		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
+			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
+		}
+		return succeed(photoAlbumService.insert(photoAlbum));
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "batchUpdate")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/batchUpdate')")
+	public Object batchUpdate(@RequestBody List<PhotoAlbum> photoAlbumList) {
+		photoAlbumService.batchUpdate(photoAlbumList);
+		return succeed();
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "del")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/del')")
+	public Object del(String ids) {
+		photoAlbumService.batchDelete(ids);
+		return succeed();
+	}
+
+	@ApiOperation("分页查询")
+	@PostMapping(value = "queryPage")
+	@PreAuthorize("@pcs.hasPermissions('photoAlbum/queryPage')")
+	public Object queryPage(PhotoQueryInfo queryInfo) {
+		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
+	}
+}

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

@@ -0,0 +1,55 @@
+package com.ym.mec.web.controller.education;
+
+import com.ym.mec.biz.dal.entity.PhotoAlbum;
+import com.ym.mec.biz.dal.page.PhotoQueryInfo;
+import com.ym.mec.biz.service.PhotoAlbumService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("eduPhotoAlbum")
+@Api(tags = "相册")
+@RestController
+public class EduPhotoAlbumController extends BaseController {
+
+	@Autowired
+	private PhotoAlbumService photoAlbumService;
+
+	@ApiOperation("新增")
+	@PostMapping(value = "add")
+	public Object add(PhotoAlbum photoAlbum) {
+		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
+			photoAlbum.setCoverUrl("https://oss.dayaedu.com/default-images/mec/Sdmx7vx.png");
+		}
+		return succeed(photoAlbumService.insert(photoAlbum));
+	}
+
+	@ApiOperation("修改")
+	@PostMapping(value = "batchUpdate")
+	public Object batchUpdate(@RequestBody List<PhotoAlbum> photoAlbumList) {
+		photoAlbumService.batchUpdate(photoAlbumList);
+		return succeed();
+	}
+
+	@ApiOperation("删除")
+	@PostMapping(value = "del")
+	public Object del(String ids) {
+		photoAlbumService.batchDelete(ids);
+		return succeed();
+	}
+
+	@ApiOperation("分页查询")
+	@PostMapping(value = "queryPage")
+	public Object queryPage(PhotoQueryInfo queryInfo) {
+		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
+	}
+}

mec-websocket/src/main/resources/bootstrap-prod.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=10.206.0.12:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=f40a7594-4bd0-4bc6-8397-9353c6d2e63a
+spring.cloud.nacos.config.namespace=b7aee20b-41e8-43d8-8e2d-45b6447f66ae
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}