文件存储服务商配置更改到系统参数配置中

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamControlController.java

@@ -52,10 +52,10 @@ import cn.com.qmth.examcloud.support.enums.HandInExamType;
 import cn.com.qmth.examcloud.support.examing.ExamFileAnswer;
 import cn.com.qmth.examcloud.support.examing.ExamRecordData;
 import cn.com.qmth.examcloud.support.examing.ExamingSession;
+import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.filestorage.FileStoragePathEnvInfo;
 import cn.com.qmth.examcloud.web.filestorage.FileStorageType;
-import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
 import cn.com.qmth.examcloud.web.helpers.SequenceLockHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
@@ -198,13 +198,10 @@ public class ExamControlController extends ControllerSupport {
     @PostMapping("/yunSignature")
     public YunSignatureInfo getYunSignature(@ModelAttribute @Valid GetYunSignatureReq req) {
         
-        if(FileStorageUtil.getFileStorageType()==null) {
-    		throw new StatusException("5001", "未配置当前云存储类型");
-    	}
-        if(FileStorageType.UPYUN.name().equals(FileStorageUtil.getFileStorageType())) {
+        if(FileStorageType.UPYUN.equals(FileStorageUtil.getFileStorageType())) {
         	return examControlService.getUpyunSignature(req);
         }
-        if(FileStorageType.ALIYUN.name().equals(FileStorageUtil.getFileStorageType())) {
+        if(FileStorageType.ALIYUN.equals(FileStorageUtil.getFileStorageType())) {
         	String fileSuffix = req.getFileSuffix();
             if (StringUtils.isNullOrEmpty(fileSuffix)) {
                 throw new StatusException("5002", "文件后缀名不允许为空");
@@ -355,13 +352,10 @@ public class ExamControlController extends ControllerSupport {
     @ApiOperation(value = "获取抓拍照片的云存储签名")
     @GetMapping("/getCapturePhotoYunSign")
     public GetYunSignDomain getCapturePhotoYunSign(GetYunSignDomainQuery query) {
-    	if(FileStorageUtil.getFileStorageType()==null) {
-    		throw new StatusException("3001", "未配置当前云存储类型");
-    	}
-        if(FileStorageType.UPYUN.name().equals(FileStorageUtil.getFileStorageType())) {
+        if(FileStorageType.UPYUN.equals(FileStorageUtil.getFileStorageType())) {
         	return getUpYunSign(query);
         }
-        if(FileStorageType.ALIYUN.name().equals(FileStorageUtil.getFileStorageType())) {
+        if(FileStorageType.ALIYUN.equals(FileStorageUtil.getFileStorageType())) {
         	return getAliYunSign(query);
         }
         throw new StatusException("3002", "未配置正确云存储类型");

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/FaceBiopsyServiceImpl.java

@@ -1,5 +1,17 @@
 package cn.com.qmth.examcloud.core.oe.student.service.impl;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.RandomUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.google.common.collect.Lists;
+
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.core.oe.student.base.utils.CommonUtil;
@@ -15,7 +27,6 @@ import cn.com.qmth.examcloud.core.oe.student.dao.entity.FaceBiopsyItemEntity;
 import cn.com.qmth.examcloud.core.oe.student.dao.entity.FaceBiopsyItemStepEntity;
 import cn.com.qmth.examcloud.core.oe.student.dao.enums.FaceBiopsyAction;
 import cn.com.qmth.examcloud.core.oe.student.dao.enums.FaceBiopsyType;
-import cn.com.qmth.examcloud.core.oe.student.service.ExamControlService;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordDataService;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamingSessionService;
 import cn.com.qmth.examcloud.core.oe.student.service.FaceBiopsyService;
@@ -29,20 +40,8 @@ import cn.com.qmth.examcloud.support.helper.ExamCacheTransferHelper;
 import cn.com.qmth.examcloud.support.helper.FaceBiopsyHelper;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
 import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
-import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.web.helpers.GlobalHelper;
 import cn.com.qmth.examcloud.web.redis.RedisClient;
-import com.google.common.collect.Lists;
-import com.mysql.cj.util.StringUtils;
-import org.apache.commons.lang3.RandomUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 人脸活体检测接口实现类

examcloud-core-oe-student-starter/src/main/java/cn/com/qmth/examcloud/core/oe/student/starter/OEStudentApp.java

@@ -17,8 +17,8 @@ import org.springframework.web.multipart.MultipartResolver;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import cn.com.qmth.examcloud.core.oe.student.dao.UniqueRuleHolder;
+import cn.com.qmth.examcloud.support.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.web.bootstrap.AppBootstrap;
-import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.web.jpa.DataIntegrityViolationTransverter;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;