update

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

@@ -102,7 +102,7 @@ public class ExtracurricularExercisesMessageServiceImpl extends BaseServiceImpl<
 			userMap.put(extracurricularExercises.getTeacherId(), extracurricularExercises.getTeacherId().toString());
 			SysUser user = teacherDao.getUser(extracurricularExercisesReply.getUserId());
 
-			String notifyUrl = "9?courseScheduleID=" + extracurricularExercisesReply.getId() +
+			String notifyUrl = "?courseScheduleID=" + extracurricularExercisesReply.getId() +
 					"&userId=" + extracurricularExercisesReply.getUserId() + "&studentCourseHomeworkId=" + extracurricularExercisesReply.getId()+ "&extra=1";
 			if (extracurricularExercisesMessage.getMsgType() != ImSendTypeEnum.TXT){
 				sysMessageService.batchSendImMessage(MessageTypeEnum.EXTRA_STUDENT_REPLY_IM,extracurricularExercisesReply.getUserId().toString(),"dayaedu"+notifyUrl,

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

@@ -97,7 +97,7 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		Map<Integer, String> userMap = new HashMap<>();
 		userMap.put(studentCourseHomework.getUserId(),studentCourseHomework.getUserId().toString());
 		SysUser user = teacherDao.get(courseSchedule.getActualTeacherId());
-		String notifyUrl = "3?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
+		String notifyUrl = "?courseScheduleID=" + courseSchedule.getId() + "&studentCourseHomeworkId=" + studentCourseHomework.getId() + "&extra=0";
 		String courseDate = DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy年MM月dd日");
 		String extra = "dayaedu" + notifyUrl + "&userId=" + studentCourseHomework.getUserId();
 		if (bean.getMsgType() != ImSendTypeEnum.TXT){
@@ -111,7 +111,7 @@ public class StudentCourseHomeworkReplyServiceImpl extends BaseServiceImpl<Long,
 		}
 
 		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.HOMEWORK_TEACHER_REPLY_PUSH,
-				userMap, null, 0, notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
+				userMap, null, 0, 3+notifyUrl, "STUDENT", user.getRealName(), courseSchedule.getName());
 		super.insert(bean);
 	}
 

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

@@ -145,20 +145,6 @@ public class RoomServiceImpl implements RoomService {
                 log.info("join error: roomId = {}, userName = {}, isAudience = {}", roomId, userName, isAudience);
                 throw new ApiException(ErrorEnum.ERR_OVER_MAX_COUNT);
             }
-            /*if (!isAudience) {
-                List<RoomMember> assistantList = roomMemberDao.findByRidAndRole(roomId, RoleEnum.RoleAssistant.getValue());
-                if (!assistantList.isEmpty()) {
-                    if (count == 1) {
-                        roleEnum = RoleEnum.RoleTeacher;
-                    } else {
-                        roleEnum = RoleEnum.RoleStudent;
-                    }
-                } else {
-                    roleEnum = RoleEnum.RoleAssistant;
-                }
-            } else {
-                roleEnum = RoleEnum.RoleAudience;
-            }*/
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
                 roleEnum = RoleEnum.RoleTeacher;
             }else {