fix bugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/InspectedServiceImpl.java

@@ -137,7 +137,8 @@ public class InspectedServiceImpl extends BaseQueryService<ExamStudent> implemen
 
     @Override
     public void releaseByUserId(Integer examId, String subjectCode, Integer userId) {
-        TaskLock taskLock = TaskLockUtil.getInspectedStudentTask(examId + '_' + subjectCode);
+        String key = examId + "_" + subjectCode;
+        TaskLock taskLock = TaskLockUtil.getInspectedStudentTask(key);
         taskLock.clear(userId);
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -163,7 +163,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
 
     @Override
     public void releaseByLibrary(MarkLibrary library) {
-        TaskLock taskLock = TaskLockUtil.getInspectedStudentTask(getGroupKey(library));
+        TaskLock taskLock = TaskLockUtil.getInspectedLibraryTask(getGroupKey(library));
         taskLock.remove(library.getId(), 1);
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/utils/TaskLockUtil.java

@@ -27,6 +27,9 @@ public class TaskLockUtil {
         for (TaskLock taskLock : inspectedStudentMap.values()) {
             taskLock.expire(timeoutMinute);
         }
+        for (TaskLock taskLock : inspectedLibraryMap.values()) {
+            taskLock.expire(timeoutMinute);
+        }
     }
 
     public static TaskLock getTrialTask(String key) {
@@ -68,4 +71,5 @@ public class TaskLockUtil {
         }
         return taskLock;
     }
+
 }

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/LoginController.java

@@ -104,7 +104,6 @@ public class LoginController {
                 u.refreshAccessToken();
                 userService.save(u);
                 WebUser wu = new WebUser(u);
-                wu.setLogoutUrl(MARK_LOGIN);
                 session.saveWebUser(wu);
                 sessionService.put(request, response, session);
                 return new ModelAndView("redirect:/mark/reset");
@@ -114,7 +113,6 @@ public class LoginController {
             u.refreshAccessToken();
             u = userService.save(u);
             WebUser wu = new WebUser(u);
-            wu.setLogoutUrl(MARK_LOGIN);
             session.saveWebUser(wu);
             sessionService.put(request, response, session);
             return new ModelAndView("redirect:/mark/subject-select");
@@ -159,7 +157,6 @@ public class LoginController {
             u.refreshAccessToken();
             userService.save(u);
             WebUser wu = new WebUser(u);
-            wu.setLogoutUrl(MARK_LOGIN);
             session.saveWebUser(wu);
             sessionService.put(request, response, session);
             return new ModelAndView("redirect:/mark/reset");

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -357,7 +357,7 @@ public class MarkController extends BaseController {
             }
             if (task == null) {
                 task = new Task();
-                task.setMessage("mark.control.task.null");
+                task.setMessage("当前无评卷任务");
             }
         } catch (Exception e) {
             log.error("get task error", e);
@@ -450,7 +450,7 @@ public class MarkController extends BaseController {
         result.accumulate("success", success);
         // result.accumulate("status", status(request));
         if (!success) {
-            result.accumulate("message", "mark.control.task.error");
+            result.accumulate("message", "评卷任务提交失败，请刷新页面");
         }
         return result;
     }