字段修改

themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java

@@ -10,6 +10,7 @@ import com.qmth.themis.business.service.TBOrgService;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
+import com.qmth.themis.exam.config.DictionaryConfig;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +32,9 @@ public class SysController {
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
     @ApiOperation(value = "获取环境接口")
     @RequestMapping(value = "/env", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
@@ -58,7 +62,14 @@ public class SysController {
         v.setValue(12);
         v.setUrl("xxxxxx");
         env.setVersion(v);
-        env.setDenyList("http://192.168.10.36:6002/client/denyList.json");
+        boolean oss = dictionaryConfig.sysDomain().isOss();
+        String url = null;
+        if (oss) {
+            url = dictionaryConfig.aliYunOssDomain().getUrl() + "/client/denyList.json";
+        } else {
+            url = "http://" + dictionaryConfig.sysDomain().getFileHost() + "/client/denyList.json";
+        }
+        env.setDenyList(url);
         return ResultUtil.ok(env);
     }
 }

themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -67,7 +67,7 @@ public class TEExamController {
     @ApiOperation(value = "验证考试口令接口")
     @RequestMapping(value = "/short_code", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TEExam.class)})
-    public Result shortCode(@ApiJsonObject(name = "loginAccount", value = {
+    public Result shortCode(@ApiJsonObject(name = "shortCode", value = {
             @ApiJsonProperty(key = "shortCode", description = "考试口令"),
     }) @ApiParam(value = "考试口令", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("shortCode")) || Objects.equals(mapParameter.get("shortCode"), "")) {

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

@@ -91,7 +91,7 @@ public class TEStudentController {
     @ApiOperation(value = "学生登录接口")
     @RequestMapping(value = "/login", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学生信息", response = TEExamResultDto.class)})
-    public Result login(@ApiJsonObject(name = "loginAccount", value = {
+    public Result login(@ApiJsonObject(name = "loginStudent", value = {
             @ApiJsonProperty(key = "identity", description = "证件号"),
             @ApiJsonProperty(key = "password", description = "密码"),
             @ApiJsonProperty(key = "orgId", type = "long", example = "1", description = "机构id")
@@ -218,7 +218,7 @@ public class TEStudentController {
             //获取剩余断点次数
             Integer leftBreakResumeCount = Objects.isNull(ExamRecordCacheUtil.getLeftBreakResumeCount(recordId)) ? 0 : ExamRecordCacheUtil.getLeftBreakResumeCount(recordId);
             //如果断点时间大于整体断点时间，则强制交卷
-            if (Objects.equals(status, ExamRecordStatusEnum.ANSWERING.name())) {
+            if (Objects.equals(status, ExamRecordStatusEnum.ANSWERING.name()) || Objects.equals(status, ExamRecordStatusEnum.bREAK_OFF.name())) {
                 if (Objects.nonNull(clientLastSyncTime) && (System.currentTimeMillis() - clientLastSyncTime.getTime() / 1000) > ec.getBreakExpireSeconds()) {
                     teExamService.finish(teStudentCacheDto.getId(), recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
                     List<TEExamDto> list = teExamService.getWaitingExam(teStudent.getId(), examId, orgId);