Merge branch 'develop'

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAccountRecordController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import cn.hutool.core.net.URLEncodeUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
@@ -112,6 +113,7 @@ public class TenantAccountRecordController extends BaseController {
     public HttpResponseResult<FileImportInfo> importFile(@RequestBody FileImportInfoWrapper.FileImport wrapper) {
 
 
+        wrapper.setImportUrl(URLEncodeUtil.encode(wrapper.getImportUrl()));
         // 读取数据
         return HttpResponseResult.succeed(excelAnalyseCoreService.analyseReadExcelData(
                 JSON.parseObject(JSON.toJSONString(wrapper), FileImportInfoWrapper.FileImportInfo.class)));

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/ImController.java

@@ -10,6 +10,7 @@ import com.yonge.cooleshow.admin.io.request.course.CourseRelationVo;
 import com.yonge.cooleshow.admin.io.request.im.IMNotifyMessageVO;
 import com.yonge.cooleshow.admin.io.request.im.UserFriendInfoVO;
 import com.yonge.cooleshow.api.feign.dto.ImUserInfo;
+import com.yonge.cooleshow.biz.dal.dto.LiveRoomStatus;
 import com.yonge.cooleshow.biz.dal.dto.TencentData;
 import com.yonge.cooleshow.biz.dal.dto.TencentImCallbackResult;
 import com.yonge.cooleshow.biz.dal.entity.ImUserStateSync;
@@ -241,8 +242,20 @@ public class ImController extends BaseController {
 
         // 推流事件通知
         if (event.getEventType() == 1) {
+            // 房间uid
+            String roomUid = getRoomUid(event.getStreamId());
+
+            LiveRoomStatus roomStatus = new LiveRoomStatus();
+            // 房间ID
+            roomStatus.setRoomUid(roomUid);
+            // 主播状态
+            roomStatus.setSpeakerStatus(1);
+            // 推流状态
+            roomStatus.setPushStatus(1);
+            // 更新直播间状态
+            liveRoomService.updateRoomStatus(roomStatus);
             // 自动开启录制
-            liveRoomService.startLive(getRoomUid(event.getStreamId()), getSpeakerId(event.getStreamId()),event.getSequence());
+            liveRoomService.startLive(roomUid, getSpeakerId(event.getStreamId()), event.getSequence());
 
             imUserState.setStatus("0");
         }

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

@@ -76,6 +76,7 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
                 fileImportInfoService.update(importInfo);
 
             }catch (NotOfficeXmlFileException e) {
+                log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
                 throw new BizException("上传文件格式版本太低");
             }catch (Exception e) {
                 log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
@@ -105,6 +106,7 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
             return fileImportInfoService.getById(wrapper.getId());
 
         }catch (NotOfficeXmlFileException e) {
+            log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
             throw new BizException("文件名格式错误");
         } catch (Exception e) {
             log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);

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

@@ -1112,7 +1112,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
 
         appDefinedData.add(TencentRequest.ChatRoomGroupDefinedData.builder()
                 .key(EGroupDefinedDataType.UPDATE_INFO.getCode())
-                .value(StringUtils.join(EGroupDefinedDataType.MEMBER_ONLINE.getCode(),EGroupDefinedDataType.MEMBER_TOTAL.getCode(),","))
+                .value(StringUtils.join(EGroupDefinedDataType.MEMBER_ONLINE.getCode(),",",EGroupDefinedDataType.MEMBER_TOTAL.getCode()))
                 .build());
         try {
             livePluginContext.getPluginService(roomVo.getServiceProvider())

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -13,6 +13,7 @@ import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
+import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;