文件云存储代码修改

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

@@ -271,15 +271,14 @@ public class ExamControlController extends ControllerSupport {
         examFileAnswerService.saveFileAnswer(fileAnswerId, examFileAnswer);
 
         try {
-            String upyunFileUrl = PropertyHolder.getString("$upyun.site.1.domain");
             String fileUrl = "";
             if (req.getFilePath().indexOf(",") > -1) {
                 for (String url : req.getFilePath().split(",")) {
-                    fileUrl += upyunFileUrl + url + ",";
+                    fileUrl += FileStorageUtil.realPath(url)+ ",";
                 }
                 fileUrl = fileUrl.substring(0, fileUrl.length() - 1);
             } else {
-                fileUrl = upyunFileUrl + req.getFilePath();
+                fileUrl = FileStorageUtil.realPath(req.getFilePath());
             }
             examControlService.sendFileAnswerToWebSocket(req.getExamRecordDataId(), req.getOrder(),
                     fileUrl, req.getTransferFileType(), user.getUserId(), user.getRootOrgId());

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

@@ -29,6 +29,7 @@ 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;
@@ -284,7 +285,7 @@ public class FaceBiopsyServiceImpl implements FaceBiopsyService {
                     filter(p -> p.getId().equals(stepInfo.getStepId())).findFirst().get();
             faceBiopsyItemStepEntity.setErrorMsg(stepInfo.getErrorMsg());
             faceBiopsyItemStepEntity.setResourceType(stepInfo.getResourceType());
-            faceBiopsyItemStepEntity.setResourceRelativePath(getRelativePath(stepInfo.getResourceUrl()));
+            faceBiopsyItemStepEntity.setResourceRelativePath(stepInfo.getResourceUrl());
             faceBiopsyItemStepEntity.setExt1(stepInfo.getResultJson());//存储动作执行结果
             faceBiopsyItemStepEntity.setResult(stepInfo.getResult());
 
@@ -486,26 +487,6 @@ public class FaceBiopsyServiceImpl implements FaceBiopsyService {
         return faceBiopsy.getVerifiedTimes();
     }
 
-    /**
-     * 根据完整路径获取相对路径
-     *
-     * @param resourceUrl
-     * @return
-     */
-    private String getRelativePath(String resourceUrl) {
-        if (!StringUtils.isNullOrEmpty(resourceUrl)) {
-            String domain = PropertyHolder.getString("$upyun.site.1.domain");
-            String backupDomain = PropertyHolder.getString("$upyun.site.1.domain.backup");
-            if (!StringUtils.isNullOrEmpty(domain)) {
-                resourceUrl = resourceUrl.replace(domain, "");
-            }
-            if (!StringUtils.isNullOrEmpty(backupDomain)) {
-                resourceUrl = resourceUrl.replace(backupDomain, "");
-            }
-        }
-        return resourceUrl;
-    }
-
     /**
      * 第一次添加人脸活体检测结果
      *