Explorar o código

upgrade fss api...

deason hai 11 meses
pai
achega
841fe5239d

+ 3 - 3
src/main/java/cn/com/qmth/examcloud/app/controller/OfflineExamController.java

@@ -10,7 +10,7 @@ package cn.com.qmth.examcloud.app.controller;
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.CoreOeService;
 import cn.com.qmth.examcloud.app.service.CoreOeService;
 import cn.com.qmth.examcloud.app.service.CoreQuestionService;
 import cn.com.qmth.examcloud.app.service.CoreQuestionService;
-import cn.com.qmth.examcloud.app.service.UpYunService;
+import cn.com.qmth.examcloud.app.service.FileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
@@ -46,7 +46,7 @@ public class OfflineExamController {
     @Autowired
     @Autowired
     private CoreQuestionService questionService;
     private CoreQuestionService questionService;
     @Autowired
     @Autowired
-    private UpYunService upYunService;
+    private FileService fileService;
 
 
     @ResponseBody
     @ResponseBody
     @ApiOperation(value = "获取当前用户参加的离线课程列表接口")
     @ApiOperation(value = "获取当前用户参加的离线课程列表接口")
@@ -111,7 +111,7 @@ public class OfflineExamController {
     @ApiOperation(value = "下载已上传的“作答文件”接口")
     @ApiOperation(value = "下载已上传的“作答文件”接口")
     @RequestMapping(value = "/paper/answer/download", method = {RequestMethod.GET})
     @RequestMapping(value = "/paper/answer/download", method = {RequestMethod.GET})
     public String downloadPaperAnswer(@RequestParam String filePath) throws Exception {
     public String downloadPaperAnswer(@RequestParam String filePath) throws Exception {
-        String requestUrl = "redirect:" + upYunService.downloadPaperAnswer(filePath);
+        String requestUrl = "redirect:" + fileService.downloadPaperAnswer(filePath);
         LOG.debug(requestUrl);
         LOG.debug(requestUrl);
         return requestUrl;
         return requestUrl;
     }
     }

+ 0 - 11
src/main/java/cn/com/qmth/examcloud/app/core/SysProperty.java

@@ -21,23 +21,12 @@ public class SysProperty {
     @Autowired
     @Autowired
     private CloudDiscoveryClient discoveryClient;
     private CloudDiscoveryClient discoveryClient;
 
 
-    @Value("${$aliyun.site.1.domain}")
-    private String fileDomain;
-
     @Value("${examcloud.api.domain}")
     @Value("${examcloud.api.domain}")
     private String apiDomain;
     private String apiDomain;
 
 
     @Value("${examcloud.api.device.record.active:false}")
     @Value("${examcloud.api.device.record.active:false}")
     private Boolean deviceRecordActive;
     private Boolean deviceRecordActive;
 
 
-    public String getFileDomain() {
-        return fileDomain;
-    }
-
-    public void setFileDomain(String fileDomain) {
-        this.fileDomain = fileDomain;
-    }
-
     public String getApiDomain() {
     public String getApiDomain() {
         return apiDomain;
         return apiDomain;
     }
     }

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/app/service/UpYunService.java → src/main/java/cn/com/qmth/examcloud/app/service/FileService.java

@@ -8,12 +8,12 @@
 package cn.com.qmth.examcloud.app.service;
 package cn.com.qmth.examcloud.app.service;
 
 
 /**
 /**
- * 又拍云文件服务接口
+ * 文件服务接口
  *
  *
  * @author: QMTH
  * @author: QMTH
  * @since: 2018/7/31
  * @since: 2018/7/31
  */
  */
-public interface UpYunService {
+public interface FileService {
 
 
     /**
     /**
      * 下载已上传的“作答文件”
      * 下载已上传的“作答文件”

+ 8 - 9
src/main/java/cn/com/qmth/examcloud/app/service/impl/UpYunServiceImpl.java → src/main/java/cn/com/qmth/examcloud/app/service/impl/FileServiceImpl.java

@@ -7,31 +7,30 @@
 
 
 package cn.com.qmth.examcloud.app.service.impl;
 package cn.com.qmth.examcloud.app.service.impl;
 
 
-import cn.com.qmth.examcloud.app.core.SysProperty;
-import cn.com.qmth.examcloud.app.service.UpYunService;
+import cn.com.qmth.examcloud.app.service.FileService;
+import cn.com.qmth.examcloud.support.fss.FssProperty;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 /**
 /**
- * 又拍云文件服务接口
+ * 文件服务接口
  *
  *
  * @author: QMTH
  * @author: QMTH
  * @since: 2018/7/16
  * @since: 2018/7/16
  */
  */
 @Service
 @Service
-public class UpYunServiceImpl implements UpYunService {
+public class FileServiceImpl implements FileService {
 
 
-    private static final Logger log = LoggerFactory.getLogger(UpYunServiceImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(FileServiceImpl.class);
 
 
-    @Autowired
-    private SysProperty sysProperty;
+    // @Autowired
+    // private SysProperty sysProperty;
 
 
     @Override
     @Override
     public String downloadPaperAnswer(String filePath) throws Exception {
     public String downloadPaperAnswer(String filePath) throws Exception {
         //封装请求参数
         //封装请求参数
-        return String.format("%s/%s", sysProperty.getFileDomain(), filePath);
+        return String.format("%s/%s", FssProperty.FSS_URL_PREFIX, filePath);
     }
     }
 
 
 }
 }