Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rpc.git

examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeStudentExamRecordCloudServiceClient.java

@@ -27,9 +27,4 @@ public class OeStudentExamRecordCloudServiceClient extends AbstractCloudClientSu
 		return post("examRecord/getQrCode",req,String.class);
 	}
 
-	@Override
-	public void deleteExamAudioAnswerTemp(DeleteExamAudioAnswerTempReq req) {
-		post("examRecord/deleteAudioAnswerUploadQueue",req);
-	}
-
 }

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/OeStudentExamRecordCloudService.java

@@ -1,7 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.student.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.oe.student.api.request.DeleteExamAudioAnswerTempReq;
 import cn.com.qmth.examcloud.core.oe.student.api.request.GetQrCodeReq;
 
 public interface OeStudentExamRecordCloudService extends CloudService{
@@ -12,9 +11,4 @@ public interface OeStudentExamRecordCloudService extends CloudService{
 	 * @return
 	 */
 	public String getQrCode(GetQrCodeReq req);
-	/**
-	 * 删除音频上传结果队列中的数据
-	 * @param req
-	 */
-	public void deleteExamAudioAnswerTemp(DeleteExamAudioAnswerTempReq req);
 }

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/request/GetQrCodeReq.java

@@ -4,10 +4,11 @@ import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 
 public class GetQrCodeReq extends BaseRequest {
 
+	
 	/**
 	 * 
 	 */
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = -380529987476309162L;
 
 	private Long examRecordDataId;
 

examcloud-core-oe-websocket-api/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/enums/WebSocketEventType.java

@@ -21,5 +21,9 @@ public enum WebSocketEventType {
 	/**
 	 * 扫描二维码
 	 */
-	SCAN_QR_CODE
+	SCAN_QR_CODE,
+	/**
+	 *系统错误
+	 */
+	SYSTEM_ERROR
 }