Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/ImLiveBroadcastRoomMemberVo.java

@@ -64,6 +64,14 @@ public class ImLiveBroadcastRoomMemberVo implements java.io.Serializable {
     @ApiModelProperty(value = "是否能上麦:false否；true是")
     private boolean microphoneFlag;
 
+    public boolean isMicrophoneFlag() {
+        return microphoneFlag;
+    }
+
+    public void setMicrophoneFlag(boolean microphoneFlag) {
+        this.microphoneFlag = microphoneFlag;
+    }
+
     public ImLiveBroadcastRoomSimpleMemberVo getSimpleMemberVo(ImLiveBroadcastRoomMemberVo memberVo) {
         return JSON.parseObject(JSON.toJSONString(memberVo), ImLiveBroadcastRoomSimpleMemberVo.class);
     }

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

@@ -1503,7 +1503,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
         } else {
             //第一次进该房间 写入用户首次进入时间
-            userInfo = getLiveRoomUserInfo(userId, imLiveBroadcastRoomVo);
+            userInfo = getLiveRoomUserInfo(userId, imLiveBroadcastRoomVo, microphoneFlag);
         }
 
         //查询主讲人信息

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountMapper.xml

@@ -41,8 +41,7 @@
     </select>
 
     <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccount" useGeneratedKeys="true"
-            keyColumn="id" keyProperty="id">
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysUserCashAccount" useGeneratedKeys="true">
         INSERT INTO sys_user_cash_account
             (user_id_, currency_, create_time_, update_time, tenant_id_)
         VALUES (#{userId}, #{currency}, now(), now(), #{tenantId})

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

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 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=d0699206-ca95-4404-a20d-420864a8029f
+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}