wangliang 4 년 전
부모
커밋
f14107eb1e

+ 6 - 3
themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -13,7 +13,6 @@ import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.cache.bean.ExamCourseCacheBean;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.domain.ClientDomain;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.business.dto.cache.TEStudentCacheDto;
@@ -26,7 +25,10 @@ import com.qmth.themis.business.entity.TEConfig;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.enums.*;
 import com.qmth.themis.business.service.*;
-import com.qmth.themis.business.util.*;
+import com.qmth.themis.business.util.OssUtil;
+import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
+import com.qmth.themis.business.util.SessionUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
@@ -163,7 +165,8 @@ public class TEStudentController {
         Long unFinishedRecordId = ExamingDataCacheUtil.getUnFinishedRecordId(user.getId());
         if (unFinishedRecordId != null) {
             WebsocketStatusEnum sta = ExamRecordCacheUtil.getClientWebsocketStatus(unFinishedRecordId);
-            if (WebsocketStatusEnum.ON_LINE.equals(sta)) {
+            ExamRecordStatusEnum status = ExamRecordCacheUtil.getStatus(unFinishedRecordId);
+            if (WebsocketStatusEnum.ON_LINE.equals(sta) && (Objects.nonNull(status) && !Objects.equals(status, ExamRecordStatusEnum.FIRST_PREPARE))) {
                 throw new BusinessException(ExceptionResultEnum.STUDENT_NOT_ALLOW_LOGIN);
             }
         }

+ 1 - 1
themis-exam/src/main/resources/application.properties

@@ -156,7 +156,7 @@ spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/MET
 prefix.url.exam=api/oe
 prefix.url.mobile=api/mobile
 
-wxapp.upload.url=https://mobile-test.online-exam.cn
+wxapp.upload.url=https://mobile.online-exam-test.cn
 
 client.config.version=1.0.0
 client.config.value=10