Merge branch 'feature/0803-im' of http://git.dayaedu.com/yonge/cooleshow into feature/0803-im

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -2,10 +2,6 @@ package com.yonge.cooleshow.admin.controller;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.org.apache.bcel.internal.generic.NEW;
-import com.tencentyun.TLSSigAPIv2;
 import com.yonge.cooleshow.biz.dal.dto.ImGroupSearchDto;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 import com.yonge.cooleshow.biz.dal.entity.ImHistoryMessage;
@@ -15,10 +11,7 @@ import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.redis.service.RedisCache;
-import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.utils.date.DateUtil;
-import com.yonge.toolset.utils.http.HttpUtil;
 import com.yonge.toolset.utils.validator.ValidationKit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,11 +27,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;

cooleshow-user/user-biz/pom.xml

@@ -120,6 +120,12 @@
             <version>1.0.0</version>
         </dependency>
 
+
+        <!--修复依赖冲突-->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/LiveRoom.java

@@ -46,7 +46,7 @@ public class LiveRoom implements Serializable {
 
     @TableField("service_provider_")
     @ApiModelProperty(value = "服务提供方")
-    private String serviceProvider;
+    private String serviceProvider= "tencentCloud";
 
     @TableField("video_record_")
     @ApiModelProperty(value = "录制记录")

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

@@ -145,11 +145,7 @@ public interface ImGroupService extends IService<ImGroup> {
      * @param file
      */
     void saveImHistoryMessage(File file);
-
-    @Override
-    default IPage<ImGroup> page(IPage<ImGroup> page) {
-        return null;
-    }
+    
 
     /**
      * 读取融云数据库信息

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

@@ -423,7 +423,7 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 setDefaultRoomDefinedInfo(room);
             }
         } catch (Exception e) {
-            throw new BizException("创建直播间失败!", e.getCause());
+            throw new BizException("创建直播间失败!", e);
         }
     }
 

pom.xml

@@ -218,6 +218,14 @@
 				<version>5.1.1</version>
 			</dependency>
 
+
+            <!--修复依赖冲突-->
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>1.3.70</version>
+            </dependency>
+
 		</dependencies>
 	</dependencyManagement>