bug fix

themis-admin/src/main/java/com/qmth/themis/admin/api/TBUserController.java

@@ -30,7 +30,6 @@ import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
@@ -185,7 +184,7 @@ public class TBUserController {
         //添加用户鉴权缓存
         AuthDto authDto = cacheService.addAccountAuthCache(user.getId());
         //生成token
-        String token = RandomStringUtils.randomAlphanumeric(32);
+        String token = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
         cacheService.addAccountCache(user.getId());
         Source source = null;
         if (Platform.WIN == platform || Platform.MAC == platform) {

themis-business/src/main/java/com/qmth/themis/business/cache/ExamRecordCacheUtil.java

@@ -34,15 +34,21 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setFirstStartTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.first_start_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.first_start_time.getCode(), date);
+        }
     }
 
     public static void setFirstPrepareTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.first_prepare_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.first_prepare_time.getCode(), date);
+        }
     }
 
     public static void setLastPrepareTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_prepare_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_prepare_time.getCode(), date);
+        }
     }
 
     public static void setStatus(Long recordId, ExamRecordStatusEnum status, Long timestamp) {
@@ -115,35 +121,51 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setReviewResult(Long recordId, ReviewResultEnum reviewResultEnum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.review_result.getCode(), reviewResultEnum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.review_result.getCode(), reviewResultEnum);
+        }
     }
 
     public static void setScoreStatus(Long recordId, ScoreStatusEnum scoreStatusEnum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.score_status.getCode(), scoreStatusEnum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.score_status.getCode(), scoreStatusEnum);
+        }
     }
 
     public static void setPaperStructPath(Long recordId, String paperStructPath) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_struct_path.getCode(), paperStructPath);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_struct_path.getCode(), paperStructPath);
+        }
     }
 
     public static void setPaperStructUpload(Long recordId, Integer paperStructUpload) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_struct_upload.getCode(), paperStructUpload);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_struct_upload.getCode(), paperStructUpload);
+        }
     }
 
     public static void setSerialNumber(Long recordId, Integer serialNumber) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.serial_number.getCode(), serialNumber);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.serial_number.getCode(), serialNumber);
+        }
     }
 
     public static void setEntryAuthenticationResult(Long recordId, VerifyExceptionEnum entryAuthenticationResult) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_result.getCode(), entryAuthenticationResult);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_result.getCode(), entryAuthenticationResult);
+        }
     }
 
     public static void setObjectiveScore(Long recordId, Double objectiveScore) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.objective_score.getCode(), objectiveScore);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.objective_score.getCode(), objectiveScore);
+        }
     }
 
     public static void setFinishTime(Long recordId, Long finishTime) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.finish_time.getCode(), finishTime);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.finish_time.getCode(), finishTime);
+        }
     }
 
     public static Long getFinishTime(Long recordId) {
@@ -151,11 +173,15 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setDurationSeconds(Long recordId, Integer durationSeconds) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.duration_seconds.getCode(), durationSeconds);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.duration_seconds.getCode(), durationSeconds);
+        }
     }
 
     public static void setFinishType(Long recordId, FinishTypeEnum finishType) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.finish_type.getCode(), finishType);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.finish_type.getCode(), finishType);
+        }
     }
 
     public static FinishTypeEnum getFinishType(Long recordId) {
@@ -171,7 +197,9 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setAlreadyBreakCount(Long recordId, Integer alreadyBreakCount) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.already_break_count.getCode(), alreadyBreakCount);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.already_break_count.getCode(), alreadyBreakCount);
+        }
     }
 
     public static ExamStatusBean getStatusBean(Long recordId) {
@@ -196,7 +224,9 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setEntryAuthenticationId(Long recordId, Long entryAuthenticationId) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_id.getCode(), entryAuthenticationId);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_id.getCode(), entryAuthenticationId);
+        }
     }
 
     public static Long getExamActivityId(Long recordId) {
@@ -204,7 +234,9 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setWarningCount(Long recordId, Integer warningCount) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.warning_count.getCode(), warningCount);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.warning_count.getCode(), warningCount);
+        }
     }
 
     public static Integer getWarningCount(Long recordId) {
@@ -212,7 +244,9 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setBreachStatus(Long recordId, Integer breachStatus) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.breach_status.getCode(), breachStatus);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.breach_status.getCode(), breachStatus);
+        }
     }
 
     public static Integer getBreachStatus(Long recordId) {
@@ -220,7 +254,9 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setInProcessLivenessVerifyCount(Long recordId, Integer inProcessLivenessVerifyCount) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_verify_count.getCode(), inProcessLivenessVerifyCount);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_verify_count.getCode(), inProcessLivenessVerifyCount);
+        }
     }
 
     public static Integer getInProcessLivenessVerifyCount(Long recordId) {
@@ -228,7 +264,7 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setMonitorKey(Long recordId, String monitorKey) {
-        if (Objects.nonNull(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.id.getCode()))) {
+        if (Objects.nonNull(getId(recordId))) {
             redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.monitor_key.getCode(), monitorKey);
         }
     }
@@ -363,19 +399,27 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setClientCurrentIp(Long recordId, String ip) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_current_ip.getCode(), ip);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_current_ip.getCode(), ip);
+        }
     }
 
     public static void setClientWebsocketId(Long recordId, String id) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_websocket_id.getCode(), id);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_websocket_id.getCode(), id);
+        }
     }
 
     public static void setMobileFirstWebsocketId(Long recordId, String id) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_first_websocket_id.getCode(), id);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_first_websocket_id.getCode(), id);
+        }
     }
 
     public static void setMobileSecondWebsocketId(Long recordId, String id) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_second_websocket_id.getCode(), id);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_second_websocket_id.getCode(), id);
+        }
     }
 
     public static void setMobileFirstWebsocketStatus(Long recordId, WebsocketStatusEnum websocketStatusEnum, Long timestamp) {
@@ -409,27 +453,39 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setClientLastSyncTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_last_sync_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.client_last_sync_time.getCode(), date);
+        }
     }
 
     public static void setPaperDownload(Long recordId, Integer paperDownload) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_download.getCode(), paperDownload);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.paper_download.getCode(), paperDownload);
+        }
     }
 
     public static void setAnswerProgress(Long recordId, Double progress) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.answer_progress.getCode(), progress);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.answer_progress.getCode(), progress);
+        }
     }
 
     public static void setLastBreakId(Long recordId, Long breakId) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_break_id.getCode(), breakId);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_break_id.getCode(), breakId);
+        }
     }
 
     public static void setLastBreakTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_break_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_break_time.getCode(), date);
+        }
     }
 
     public static void setLastStartTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_start_time.getCode(), date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.last_start_time.getCode(), date);
+        }
     }
 
     public static Long getLastStartTime(Long recordId) {
@@ -465,35 +521,51 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setStartTime(Long recordId, Long startTime) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.start_time.getCode(), startTime);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.start_time.getCode(), startTime);
+        }
     }
 
     public static void setEndTime(Long recordId, Long endTime) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.end_time.getCode(), endTime);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.end_time.getCode(), endTime);
+        }
     }
 
     public static void setOpeningSeconds(Long recordId, Integer openingSeconds) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.opening_seconds.getCode(), openingSeconds);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.opening_seconds.getCode(), openingSeconds);
+        }
     }
 
     public static void setMinDurationSeconds(Long recordId, Integer minDurationSeconds) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.min_duration_seconds.getCode(), minDurationSeconds);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.min_duration_seconds.getCode(), minDurationSeconds);
+        }
     }
 
     public static void setMaxDurationSeconds(Long recordId, Integer maxDurationSeconds) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.max_duration_seconds.getCode(), maxDurationSeconds);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.max_duration_seconds.getCode(), maxDurationSeconds);
+        }
     }
 
     public static void setForceFinish(Long recordId, Integer forceFinish) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.force_finish.getCode(), forceFinish);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.force_finish.getCode(), forceFinish);
+        }
     }
 
     public static void setLastPrepareTime(Long recordId, ScoreStatusEnum scoreStatusEnum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.score_status.getCode(), scoreStatusEnum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.score_status.getCode(), scoreStatusEnum);
+        }
     }
 
     public static void setExamFinalFinishTime(Long recordId, Long date) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "finalFinishTime", date);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "finalFinishTime", date);
+        }
     }
 
     public static Long getExamFinalFinishTime(Long recordId) {
@@ -501,43 +573,63 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setMultipleFaceCountErrorRandom(Long recordId, String multipleFaceCountErrorRandom) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "multipleFaceCountErrorRandom", multipleFaceCountErrorRandom);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "multipleFaceCountErrorRandom", multipleFaceCountErrorRandom);
+        }
     }
 
     public static void setRealnessErrorRandom(Long recordId, String realnessErrorRandom) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "realnessErrorRandom", realnessErrorRandom);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "realnessErrorRandom", realnessErrorRandom);
+        }
     }
 
     public static void setNoFaceCountErrorRandom(Long recordId, String noFaceCountErrorRandom) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "noFaceCountErrorRandom", noFaceCountErrorRandom);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "noFaceCountErrorRandom", noFaceCountErrorRandom);
+        }
     }
 
     public static void setFaceCompareErrorRandom(Long recordId, String faceCompareErrorRandom) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "faceCompareErrorRandom", faceCompareErrorRandom);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "faceCompareErrorRandom", faceCompareErrorRandom);
+        }
     }
 
     public static void setEyeCloseErrorRandom(Long recordId, String eyeCloseErrorRandom) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "eyeCloseErrorRandom", eyeCloseErrorRandom);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "eyeCloseErrorRandom", eyeCloseErrorRandom);
+        }
     }
 
     public static void setMultipleFaceCountErrorNum(Long recordId, Integer multipleFaceCountErrorNum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "multipleFaceCountErrorNum", multipleFaceCountErrorNum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "multipleFaceCountErrorNum", multipleFaceCountErrorNum);
+        }
     }
 
     public static void setNoFaceCountErrorNum(Long recordId, Integer noFaceCountErrorNum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "noFaceCountErrorNum", noFaceCountErrorNum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "noFaceCountErrorNum", noFaceCountErrorNum);
+        }
     }
 
     public static void setFaceCompareErrorNum(Long recordId, Integer faceCompareErrorNum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "faceCompareErrorNum", faceCompareErrorNum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "faceCompareErrorNum", faceCompareErrorNum);
+        }
     }
 
     public static void setEyeCloseErrorNum(Long recordId, Integer eyeCloseErrorNum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "eyeCloseErrorNum", eyeCloseErrorNum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "eyeCloseErrorNum", eyeCloseErrorNum);
+        }
     }
 
     public static void setRealnessErrorNum(Long recordId, Integer realnessErrorNum) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "realnessErrorNum", realnessErrorNum);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "realnessErrorNum", realnessErrorNum);
+        }
     }
 
     public static String getMultipleFaceCountErrorRandom(Long recordId) {
@@ -585,43 +677,63 @@ public class ExamRecordCacheUtil {
     }
 
     public static void setCameraPhotoUpload(Long recordId, Integer cameraPhotoUpload) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.camera_photo_upload.getCode(), cameraPhotoUpload);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.camera_photo_upload.getCode(), cameraPhotoUpload);
+        }
     }
 
     public static void setMobilePhotoUpload(Long recordId, Integer mobilePhotoUpload) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_photo_upload.getCode(), mobilePhotoUpload);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.mobile_photo_upload.getCode(), mobilePhotoUpload);
+        }
     }
 
     public static void setEntryAuthenticationPolicy(Long recordId, String entryAuthenticationPolicy) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_policy.getCode(), entryAuthenticationPolicy);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.entry_authentication_policy.getCode(), entryAuthenticationPolicy);
+        }
     }
 
     public static void setInProcessFaceStrangerIgnore(Long recordId, Integer inProcessFaceStrangerIgnore) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_face_stranger_ignore.getCode(), inProcessFaceStrangerIgnore);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_face_stranger_ignore.getCode(), inProcessFaceStrangerIgnore);
+        }
     }
 
     public static void setInProcessLivenessFixedRange(Long recordId, String inProcessLivenessFixedRange) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_fixed_range.getCode(), inProcessLivenessFixedRange);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_fixed_range.getCode(), inProcessLivenessFixedRange);
+        }
     }
 
     public static void setInProcessLivenessJudgePolicy(Long recordId, String inProcessLivenessJudgePolicy) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_judge_policy.getCode(), inProcessLivenessJudgePolicy);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_judge_policy.getCode(), inProcessLivenessJudgePolicy);
+        }
     }
 
     public static void setMonitorVideoSource(Long recordId, String monitorVideoSource) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.monitor_video_source.getCode(), monitorVideoSource);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.monitor_video_source.getCode(), monitorVideoSource);
+        }
     }
 
     public static void setInProcessRealnessVerifyStatus(Long recordId, Integer inProcessRealnessVerifyStatus) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_realness_verify_status.getCode(), inProcessRealnessVerifyStatus);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_realness_verify_status.getCode(), inProcessRealnessVerifyStatus);
+        }
     }
 
     public static void setInProcessLivenessVerifyStatus(Long recordId, Integer inProcessLivenessVerifyStatus) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_verify_status.getCode(), inProcessLivenessVerifyStatus);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_liveness_verify_status.getCode(), inProcessLivenessVerifyStatus);
+        }
     }
 
     public static void setInProcessFaceVerifyStatus(Long recordId, Integer inProcessFaceVerifyStatus) {
-        redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_face_verify_status.getCode(), inProcessFaceVerifyStatus);
+        if (Objects.nonNull(getId(recordId))) {
+            redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), ExamRecordFieldEnum.in_process_face_verify_status.getCode(), inProcessFaceVerifyStatus);
+        }
     }
 
     public static Integer getCameraPhotoUpload(Long recordId) {

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEMobileServiceImpl.java

@@ -25,12 +25,12 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
 import com.qmth.themis.common.enums.Source;
 import com.qmth.themis.common.exception.BusinessException;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.security.NoSuchAlgorithmException;
 import java.util.Objects;
+import java.util.UUID;
 
 @Service
 public class TEMobileServiceImpl implements TEMobileService {
@@ -99,7 +99,7 @@ public class TEMobileServiceImpl implements TEMobileService {
         String deviceId = ServletUtil.getRequestDeviceId();
         AuthDto authDto = cacheService.addStudentAuthCache(es.getStudentId());
         // 生成token
-        String token = RandomStringUtils.randomAlphanumeric(32);
+        String token = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
         String sessionId = ret.getSessionId();
         ExpireTimeDTO expireBean = SystemConstant.getExpireTime(source, platform);
         TBSession tbSession = new TBSession(sessionId, String.valueOf(es.getStudentId()),

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

@@ -38,7 +38,6 @@ import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
 import com.qmth.themis.exam.config.ExamConstant;
 import io.swagger.annotations.*;
-import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,10 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.io.File;
 import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * @Description: 考生 前端控制器
@@ -197,7 +193,7 @@ public class TEStudentController {
         //添加用户鉴权缓存
         AuthDto authDto = cacheService.addStudentAuthCache(teStudent.getId());
         //生成token
-        String token = RandomStringUtils.randomAlphanumeric(32);
+        String token = String.valueOf(UUID.randomUUID()).replaceAll("-", "");
         cacheService.addStudentAccountCache(teStudent.getId());
         //判断会话来源
         Source source = null;