浏览代码

remove upyun.downloadUrl

deason 5 年之前
父节点
当前提交
0848405b2f

+ 1 - 1
examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/QuestionAudioController.java

@@ -43,7 +43,7 @@ public class QuestionAudioController {
 
         if (questionAudio != null) {
             //补全路径
-            questionAudio.setFileUrl(upYunProperty.getDownloadUrl() + questionAudio.getFileUrl());
+            questionAudio.setFileUrl(upYunProperty.getDomain() + questionAudio.getFileUrl());
         }
 
         return new ResponseEntity<>(questionAudio, HttpStatus.OK);

+ 0 - 11
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/config/UpYunProperty.java

@@ -17,9 +17,6 @@ public class UpYunProperty {
     @Value("${$upyun.site.1.password}")
     protected String password;
 
-    @Value("${upyun.downloadUrl}")
-    protected String downloadUrl;
-
     @Value("${upyun.uploadUrl}")
     private String uploadPath;
 
@@ -70,14 +67,6 @@ public class UpYunProperty {
         this.password = password;
     }
 
-    public String getDownloadUrl() {
-        return downloadUrl;
-    }
-
-    public void setDownloadUrl(String downloadUrl) {
-        this.downloadUrl = downloadUrl;
-    }
-
     public String getUploadPath() {
         return uploadPath;
     }

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/ExportPaperAbstractService.java

@@ -984,7 +984,7 @@ public abstract class ExportPaperAbstractService {
                                     + "_2_" + option.getNumber() + oNum + "." + audio.getFileSuffixes();
                             oNum++;
                         }
-                        FileDisposeUtil.saveUrlAs(upYunProperty.getDownloadUrl() + audio.getFileUrl(), jsonDirectoryPath + File.separator + audioFileName);
+                        FileDisposeUtil.saveUrlAs(upYunProperty.getDomain() + audio.getFileUrl(), jsonDirectoryPath + File.separator + audioFileName);
                     }
                 }
             }

+ 1 - 1
examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigProviderServiceImpl.java

@@ -568,7 +568,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
                     String questionAudioId = matchAudioName(containAStr, "a", "id");
                     QuestionAudio questionAudio = questionAudioService.findAudioById(questionAudioId);
                     if (questionAudio != null) {
-                        String url = upYunProperty.getDownloadUrl() + questionAudio.getFileUrl();
+                        String url = upYunProperty.getDomain() + questionAudio.getFileUrl();
                         if (playTime != null) {
                             containAStr += " question-audio url=\"" + url + "\" playTime=\"" + playTime + "\"" + "></a>";
                         } else {

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

@@ -841,7 +841,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
                     String questionAudioId = matchAudioName(containAStr, "a", "id");
                     QuestionAudio questionAudio = questionAudioService.findAudioById(questionAudioId);
                     if (questionAudio != null) {
-                        String url = upYunProperty.getDownloadUrl() + questionAudio.getFileUrl();
+                        String url = upYunProperty.getDomain() + questionAudio.getFileUrl();
                         if (questionDto.getPlayTime() != null) {
                             containAStr += " question-audio url=\"" + url + "\" playTime=\"" + questionDto.getPlayTime() + "\"" + "></a>";
                         } else {