Browse Source

包冲突

liujc 1 year ago
parent
commit
77d53a416a

+ 6 - 0
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>

+ 1 - 1
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 = "录制记录")

+ 1 - 1
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);
         }
     }
 

+ 8 - 0
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>