缓存超时时间，上传图片权限验证

src/main/java/org/rcisoft/business/bchapter/controller/BChapterController.java

@@ -105,7 +105,7 @@ public class BChapterController extends PaginationController<BChapter> {
 
     @ApiOperation(value="上传图片", notes="上传任务书所需图片")
     @ApiImplicitParam(name = "image", value = "图片文件", required = true, dataType = "MultipartFile")
-    @PreAuthorize("hasRole('ROLE_1002')")
+    @PreAuthorize("hasAnyRole('ROLE_1002','ROLE_1001')")
     @PostMapping(value = "/uploadMdFileWithoutAuth")
     public Map<String, Object> uploadMdFile(MultipartFile image) {
         String path = global.getMD_FILE_LOCATION();

src/main/java/org/rcisoft/business/tquestion/service/impl/TQuestionServiceImpl.java

@@ -10,6 +10,7 @@ import org.rcisoft.business.tpaperchapter.dao.TPaperChapterRepository;
 import org.rcisoft.business.tquestion.dto.QuestionListAndNumDto;
 import org.rcisoft.business.tquestion.dao.TQuestionOptionsRepository;
 import org.rcisoft.business.tquestion.entity.TQuestionOptions;
+import org.rcisoft.common.component.Global;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.service.RcRedisService;
@@ -70,6 +71,9 @@ public class TQuestionServiceImpl implements TQuestionService {
     @Autowired
     private RcRedisService rcRedisServiceImpl;
 
+    @Autowired
+    private Global global;
+
     /**
     * 保存 tQuestion
     * @param tQuestion
@@ -294,7 +298,9 @@ public class TQuestionServiceImpl implements TQuestionService {
         questionListAndNum.setNumOfMultiSelect(tQuestionRepository.queryNumByType("2",chapterId));
         questionListAndNum.setNumOfJudgment(tQuestionRepository.queryNumByType("3",chapterId));
         //将数据放入缓存中
-        rcRedisServiceImpl.setBytes(userId + "_" + chapterId,SerializationUtils.serializer(questionListAndNum));
+        rcRedisServiceImpl.setBytes(userId + "_" + chapterId,
+                                    SerializationUtils.serializer(questionListAndNum),
+                                    global.getREDIS_TIMEOUT());
         return questionListAndNum;
     }
 

src/main/java/org/rcisoft/common/component/Global.java

@@ -249,4 +249,8 @@ public class Global {
     /*openOffice安装路径*/
     @Value("${global.other.open_office_home}")
     private String OPEN_OFFICE_HOME;
+
+    /*redis缓存超时时间*/
+    @Value("${spring.redis.timeout}")
+    private Integer REDIS_TIMEOUT;
 }

src/main/resources/application-dev.yml

@@ -63,6 +63,7 @@ spring:
       max-wait: -1
     database: 0
     password: ''
+    timeout: 3600
   freemarker:
     charset: UTF-8
     suffix: .ftl

src/main/resources/application-prod.yml

@@ -63,6 +63,7 @@ spring:
       max-wait: -1
     database: 0
     password: ''
+    timeout: 3600
   freemarker:
     charset: UTF-8
     suffix: .ftl