zouxuan 5 년 전
부모
커밋
68f28cfab4
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 1
      mec-im/src/main/java/com/ym/pojo/RoomResult.java
  2. 3 3
      mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

+ 2 - 1
mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -3,6 +3,7 @@ package com.ym.pojo;
 import lombok.Data;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
+import org.apache.commons.lang.StringEscapeUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
@@ -49,7 +50,7 @@ public class RoomResult {
             result.setMicrophone(member.isMic());
             result.setMicrophone(member.isMic());
             result.setCamera(member.isCamera());
             result.setCamera(member.isCamera());
             result.setUserName(member.getName());
             result.setUserName(member.getName());
-            result.setPlayMidiJson(member.getPlayMidiJson());
+            result.setPlayMidiJson(StringEscapeUtils.unescapeJavaScript(member.getPlayMidiJson()));
             members.add(result);
             members.add(result);
         }
         }
     }
     }

+ 3 - 3
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -197,7 +197,7 @@ public class RoomServiceImpl implements RoomService {
 //            roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
 //            roomMemberDao.updateCameraByRidAndUid(roomId, userId, !isDisableCamera);
             userResult.setCamera(roomMember.isCamera());
             userResult.setCamera(roomMember.isCamera());
             userResult.setJoinTime(roomMember.getJoinDt());
             userResult.setJoinTime(roomMember.getJoinDt());
-            userResult.setPlayMidiJson(roomMember.getPlayMidiJson());
+            userResult.setPlayMidiJson(StringEscapeUtils.unescapeJavaScript(roomMember.getPlayMidiJson()));
 
 
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
             log.info("user exist in the room: roomId={} , userId={}, use the last role={}", roomId, userId, roleEnum);
         }
         }
@@ -1399,9 +1399,9 @@ public class RoomServiceImpl implements RoomService {
         //记录节拍器消息
         //记录节拍器消息
         String userId = playMidiMessageData.getUserId();
         String userId = playMidiMessageData.getUserId();
         if(StringUtils.isEmpty(userId)){
         if(StringUtils.isEmpty(userId)){
-            roomMemberDao.updatePlayMidiJsonByRidAndRole(playMidiMessageData.getRoomId(),RoleEnum.RoleStudent.getValue(), StringEscapeUtils.unescapeJavaScript(playMidiMessageData.getContent()));
+            roomMemberDao.updatePlayMidiJsonByRidAndRole(playMidiMessageData.getRoomId(),RoleEnum.RoleStudent.getValue(), playMidiMessageData.getContent());
         }else {
         }else {
-            roomMemberDao.updatePlayMidiJsonByRidAndUid(playMidiMessageData.getRoomId(),userId,StringEscapeUtils.unescapeJavaScript(playMidiMessageData.getContent()));
+            roomMemberDao.updatePlayMidiJsonByRidAndUid(playMidiMessageData.getRoomId(),userId,playMidiMessageData.getContent());
         }
         }
     }
     }