浏览代码

修改配置

liujunchi 2 年之前
父节点
当前提交
ad31c8af1d

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

@@ -2189,6 +2189,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (liveRoom.getCameraStatus() != null) {
             setGroupDefinedData(room,EGroupDefinedDataType.ANCHOR_CAMERA,liveRoom.getCameraStatus() == 1?
                 EOnOffStatus.ON.getCode():EOnOffStatus.OFF.getCode());
+            return true;
         }
 
         return this.updateById(imLiveBroadcastRoom);

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/ImLiveBroadcastRoomMemberMapper.xml

@@ -38,7 +38,7 @@
         GROUP_CONCAT(distinct mg.name_) musicGroupName,
         a.join_time_ as joinTime,
         a.total_time_ as totalViewTime,
-        if(b.user_id_ is null, 0, 1) as blackFlag
+        if(ib.user_id_ is null, 0, 1) as blackFlag
         from im_live_broadcast_room_member as a
         left join im_live_broadcast_room as i on a.room_uid_ = i.room_uid_
         left join sys_user as su on su.id_ = a.user_id_
@@ -48,7 +48,7 @@
         left join subject as b on st.subject_id_list_ = b.id_
 		left join `sys_user` tu on tu.`id_` = i.`speaker_id_` 
 		LEFT JOIN `organization` o on o.`id_` = su.`organ_id_`
-        left join im_live_room_black b on b.room_uid_ = a.room_uid_ and b.user_id_ = a.user_id_
+        left join im_live_room_black ib on ib.room_uid_ = a.room_uid_ and ib.user_id_ = a.user_id_
         where a.room_uid_ = #{param.roomUid}
         <if test="param.search != null ">
             AND (

+ 2 - 2
mec-web/src/main/resources/bootstrap-local.properties

@@ -1,9 +1,9 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.114.176.40:8848
+spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=763c3d7e-d071-41e3-885a-170b91e6376c
+spring.cloud.nacos.config.namespace=fcc00e52-a464-4ab8-96aa-3469b3f66062
 #\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}