Merge branch 'dev' into release

# Conflicts:
#	themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -99,8 +99,8 @@ public class SystemConstant {
     public static final String REDIS_LOCK_WEBSOCKET_PREFIX = "lock:websocket:";
     public static final String REDIS_LOCK_REEXAM_AUDITING = "lock:reexam:";
     public static final long REDIS_LOCK_MQ_TIME_OUT = 60L;
-    public static final long REDIS_LOCK_WEBSOCKET_TIME_OUT = 1L;
-    public static final long REDIS_LOCK_REEXAM_TIME_OUT = 1L;
+    public static final long REDIS_LOCK_WEBSOCKET_TIME_OUT = 30L;
+    public static final long REDIS_LOCK_REEXAM_TIME_OUT = 30L;
     public static final long REDIS_CACHE_TIME_OUT = 30L;
     //学生锁
     public static final String REDIS_LOCK_STUDENT_PREFIX = "lock:student:student_id_";