liujunchi 2 anni fa
parent
commit
a7df0f72b4

+ 7 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TencentData.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Description
@@ -56,7 +57,8 @@ public class TencentData {
             CallbackAfterMemberExit res = new CallbackAfterMemberExit();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
             res.setType(jsonObject.getObject("Type",ETencentGroupType.class));
             res.setExitType(jsonObject.getString("ExitType"));
@@ -113,7 +115,8 @@ public class TencentData {
             CallbackOnMemberStateChange res = new CallbackOnMemberStateChange();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
 
             JSONArray exitMemberList = jsonObject.getJSONArray("MemberList");
@@ -162,7 +165,8 @@ public class TencentData {
             CallbackAfterNewMemberJoin res = new CallbackAfterNewMemberJoin();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
             res.setType(jsonObject.getObject("Type",ETencentGroupType.class));
             res.setJoinType(jsonObject.getString("JoinType"));

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

@@ -1691,7 +1691,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         try {
             //生成主讲人信息到缓存
             SysUser sysUser = getSysUser(room.getSpeakerId());
-            createSpeakerInfo(room, sysUser);
 
             //去融云创建房间
             LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());

+ 3 - 3
mec-im/src/main/java/com/ym/controller/UserController.java

@@ -101,7 +101,7 @@ public class UserController {
         String optPlatform = request.getParameter("OptPlatform");
 
 
-        if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKONMEMBERSTATECHANGE.name())) {
+        if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKONMEMBERSTATECHANGE.getCommand())) {
             TencentData.CallbackOnMemberStateChange callbackOnMemberStateChange = TencentData.CallbackOnMemberStateChange.toObject(
                 body);
 
@@ -111,7 +111,7 @@ public class UserController {
             imLiveBroadcastRoomService.callbackOnMemberStateChange(callbackOnMemberStateChange);
 
 
-        } else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERMEMBEREXIT.name())) {
+        } else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERMEMBEREXIT.getCommand())) {
             TencentData.CallbackAfterMemberExit callbackAfterMemberExit = TencentData.CallbackAfterMemberExit.toObject(
                 body);
 
@@ -119,7 +119,7 @@ public class UserController {
             callbackAfterMemberExit.setClientIP(clientIP);
             callbackAfterMemberExit.setOptPlatform(optPlatform);
             imLiveBroadcastRoomService.callbackAfterMemberExit(callbackAfterMemberExit);
-        }  else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERNEWMEMBERJOIN.name())) {
+        }  else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERNEWMEMBERJOIN.getCommand())) {
             TencentData.CallbackAfterNewMemberJoin callbackAfterNewMemberJoin = TencentData.CallbackAfterNewMemberJoin.toObject(
                 body);