update cache keys.

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/QuesController.java

@@ -20,7 +20,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_PREFIX_QUESTION;
+import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_KEY_QUESTION;
 
 /**
  * Created by songyue on 16/12/28.
@@ -162,7 +162,7 @@ public class QuesController extends ControllerSupport {
 
     private void clearQuestionCache(String questionId) {
         //清理与当前试题相关的缓存
-        final String patternKey = CACHE_PREFIX_QUESTION + "*" + questionId;
+        final String patternKey = CACHE_KEY_QUESTION + "*" + questionId;
         Set<String> keys = redisTemplate.keys(patternKey);
         if (CollectionUtils.isNotEmpty(keys)) {
             redisTemplate.delete(keys);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/cache/BasePaperCache.java

@@ -31,7 +31,7 @@ public class BasePaperCache extends RandomObjectRedisCache<BasePaperCacheBean> {
 
     @Override
     protected String getKeyPrefix() {
-        return "Q_BASE_PAPER:";
+        return "Q_PAPER:BASE_";
     }
 
     @Override

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/cache/Constants.java

@@ -2,10 +2,12 @@ package cn.com.qmth.examcloud.core.questions.service.cache;
 
 public interface Constants {
 
-    String CACHE_PREFIX_EXTRACT_EXAM_PAPER = "Q_EXTRACT_EXAM_PAPER:";
+    String CACHE_KEY_PAPER_FOR_DTO = "Q_PAPER:DTO_";
 
-    String CACHE_PREFIX_BASE_PAPER = "Q_BASE_PAPER:";
+    String CACHE_KEY_PAPER_FOR_BASE = "Q_PAPER:BASE_";
 
-    String CACHE_PREFIX_QUESTION = "Q_QUESTION:";
+    String CACHE_KEY_PAPER_FOR_DEFAULT = "Q_PAPER:DEFAULT_";
+
+    String CACHE_KEY_QUESTION = "Q_QUESTION:";
 
 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigServiceImpl.java

@@ -44,7 +44,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_PREFIX_EXTRACT_EXAM_PAPER;
+import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_KEY_PAPER_FOR_DTO;
 
 /**
  * @author chenken
@@ -251,7 +251,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     @Override
     public boolean checkIsAllQbjectiveQuestion(String paperId) {
         //优先从redis中获取缓存dto
-        PaperDto cachePaperDto = redisClient.get(CACHE_PREFIX_EXTRACT_EXAM_PAPER + paperId, PaperDto.class, 10 * 60);
+        PaperDto cachePaperDto = redisClient.get(CACHE_KEY_PAPER_FOR_DTO + paperId, PaperDto.class, 10 * 60);
         if (cachePaperDto != null) {
             return cachePaperDto.isAllQbjectiveQuestion();
         }
@@ -630,7 +630,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
         logger.info("单独组装paperDetailUnitDto耗时:" + (paperDetailUnitDtoEndTime - paperDetailDtoEndTime) + "ms");
 
         //将重新组装的dto放进缓存
-        redisClient.set(CACHE_PREFIX_EXTRACT_EXAM_PAPER + paperDto.getId(), paperDto, 10 * 60);
+        redisClient.set(CACHE_KEY_PAPER_FOR_DTO + paperDto.getId(), paperDto, 10 * 60);
         return paperDto;
     }
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperDetailUnitServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_PREFIX_QUESTION;
+import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_KEY_QUESTION;
 
 /**
  * @author chenken
@@ -336,7 +336,7 @@ public class PaperDetailUnitServiceImpl implements PaperDetailUnitService {
 
     private void clearQuestionCache(String questionId) {
         //清理与当前试题相关的缓存
-        final String patternKey = CACHE_PREFIX_QUESTION + "*" + questionId;
+        final String patternKey = CACHE_KEY_QUESTION + "*" + questionId;
         Set<String> keys = redisTemplate.keys(patternKey);
         if (CollectionUtils.isNotEmpty(keys)) {
             redisTemplate.delete(keys);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -59,7 +59,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_PREFIX_EXTRACT_EXAM_PAPER;
+import static cn.com.qmth.examcloud.core.questions.service.cache.Constants.CACHE_KEY_PAPER_FOR_DTO;
 
 /**
  * @author chenken
@@ -279,7 +279,7 @@ public class PaperServiceImpl implements PaperService {
         }
 
         //删除缓存
-        redisClient.delete(CACHE_PREFIX_EXTRACT_EXAM_PAPER + paperExp.getId());
+        redisClient.delete(CACHE_KEY_PAPER_FOR_DTO + paperExp.getId());
         basePaperCache.remove(paperExp.getId());
 
         return msgMap;
@@ -444,7 +444,7 @@ public class PaperServiceImpl implements PaperService {
 
         for (String paperId : paperIds) {
             //清除缓存
-            redisClient.delete(CACHE_PREFIX_EXTRACT_EXAM_PAPER + paperId);
+            redisClient.delete(CACHE_KEY_PAPER_FOR_DTO + paperId);
             basePaperCache.remove(paperId);
         }
 
@@ -805,7 +805,7 @@ public class PaperServiceImpl implements PaperService {
         paperRepo.save(paper);
 
         //清除缓存
-        redisClient.delete(CACHE_PREFIX_EXTRACT_EXAM_PAPER + paper.getId());
+        redisClient.delete(CACHE_KEY_PAPER_FOR_DTO + paper.getId());
         basePaperCache.remove(paper.getId());
     }