sysProperty

examcloud-core-questions-api-provider/src/main/java/cn/com/qmth/examcloud/core/questions/api/PaperController.java

@@ -19,7 +19,7 @@ import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.paper.PreviewPaperHandler;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.web.support.Naked;
@@ -61,7 +61,7 @@ public class PaperController extends ControllerSupport {
     Gson gson;
 
     @Autowired
-    UpYunProperty sysProperty;
+    SysProperty sysProperty;
 
     @Autowired
     QuesService quesService;

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

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.questions.api;
 
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.web.support.Naked;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("${api_cqb}/")
 public class QuestionAudioController {
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Autowired
     private QuestionAudioService questionAudioService;
@@ -43,7 +43,7 @@ public class QuestionAudioController {
 
         if (questionAudio != null) {
             //补全路径
-            questionAudio.setFileUrl(upYunProperty.getDomain() + questionAudio.getFileUrl());
+            questionAudio.setFileUrl(sysProperty.getDomain() + questionAudio.getFileUrl());
         }
 
         return new ResponseEntity<>(questionAudio, HttpStatus.OK);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ClonePaperService.java

@@ -15,7 +15,7 @@ import cn.com.qmth.examcloud.core.questions.base.Model;
 import cn.com.qmth.examcloud.core.questions.base.exception.PaperException;
 import cn.com.qmth.examcloud.core.questions.dao.*;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
 import com.google.common.collect.Lists;
 import main.java.com.UpYun;
@@ -53,7 +53,7 @@ public class ClonePaperService {
     @Autowired
     private UpYunService upYunService;
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
     @Autowired
     private CourseService courseService;
 
@@ -247,7 +247,7 @@ public class ClonePaperService {
                     upYun.readFile(audio.getFileUrl(), audioFile);
 
                     //重新上传新的音频文件
-                    String newPath = upYunProperty.getRadioUploadPath() + newAudioFileName;
+                    String newPath = sysProperty.getRadioUploadPath() + newAudioFileName;
                     try {
                         upYun.writeFile(newPath, audioFile, true);
                         audio.setFileUrl(newPath);//设置新路径

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/ImportPaperService.java

@@ -14,7 +14,7 @@ import cn.com.qmth.examcloud.core.questions.base.question.enums.QuesStructType;
 import cn.com.qmth.examcloud.core.questions.base.word.DocxProcessUtil;
 import cn.com.qmth.examcloud.core.questions.dao.*;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
 import com.google.gson.Gson;
 import main.java.com.UpYun;
@@ -85,7 +85,7 @@ public class ImportPaperService {
     QuestionAudioService questionAudioService;
 
     @Autowired
-    UpYunProperty upYunProperty;
+    SysProperty sysProperty;
 
     public static final String TEMP_FILE_EXP = "docxExport/";
 
@@ -1824,7 +1824,7 @@ public class ImportPaperService {
                     int randomNumber = random.nextInt(1000);
                     //定义文件下载名称，下载音频文件
                     String newAudioFileName = newQuestion.getId() + "_" + randomNumber + "_" + oldAudio.getFileName();
-                    UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                    UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                     //下载音频
                     File audioFile = new File(copyAudioPath + File.separator + newAudioFileName);
                     try {
@@ -1834,11 +1834,11 @@ public class ImportPaperService {
                         throw new RuntimeException("下载音频失败");
                     }
                     //重新上传新的音频文件
-                    upyun.writeFile(upYunProperty.getRadioUploadPath() + newAudioFileName, audioFile, true);
+                    upyun.writeFile(sysProperty.getRadioUploadPath() + newAudioFileName, audioFile, true);
                     IoUtils.removeFile(audioFile);
 
                     //拷贝旧对象
-                    QuestionAudio newAudio = new QuestionAudio(newQuestion.getId(), oldAudio.getFileName(), upYunProperty.getRadioUploadPath() + newAudioFileName);
+                    QuestionAudio newAudio = new QuestionAudio(newQuestion.getId(), oldAudio.getFileName(), sysProperty.getRadioUploadPath() + newAudioFileName);
                     newAudio.setCreateTime(new Date());
                     newAudio.setCreateUser(user.getDisplayName());
                     questionAudioService.saveQuestionAudio(newAudio, user);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/UpYunService.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.service;
 
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import main.java.com.UpYun;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,10 +16,10 @@ public class UpYunService {
     public static final String TEMP_FILE_EXP = "docxExport/";
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     public UpYun getInstance() {
-        UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+        UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
         upyun.setDebug(true);
         upyun.setTimeout(15);
         upyun.setApiDomain(UpYun.ED_AUTO);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/config/UpYunProperty.java → examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/config/SysProperty.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
-public class UpYunProperty {
+public class SysProperty {
 
     @Value("${$upyun.site.1.domain}")
     protected String domain;

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

@@ -18,7 +18,7 @@ import cn.com.qmth.examcloud.core.questions.service.PaperDetailService;
 import cn.com.qmth.examcloud.core.questions.service.PaperService;
 import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import com.google.gson.Gson;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -94,7 +94,7 @@ public abstract class ExportPaperAbstractService {
     protected QuesPkgPathRepo quesPkgPathRepo;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     public static final String FILL_BLANK_QUESTION_FLAG = "###";
 
@@ -882,8 +882,8 @@ public abstract class ExportPaperAbstractService {
             FileDisposeUtil.fileToZip(jsonDirectoryPath, "docxExport", jsonDirectoryName);
             //上传zip压缩包到又拍云
             File zipFile = new File(TEMP_FILE_EXP + jsonDirectoryName + ZIP_SUFFIX);
-            String zipUpyunFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + jsonDirectoryName + ZIP_SUFFIX;
-            UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            String zipUpyunFilePath = sysProperty.getUploadPath() + extractConfig.getOrgId() + "/" + jsonDirectoryName + ZIP_SUFFIX;
+            UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upyun.writeFile(zipUpyunFilePath, zipFile, true);
             //保存数据库记录
             ExamFile examFile = new ExamFile(computerTestPaper, extractConfig, zipUpyunFilePath, ExamFileType.COMPUTERTEST_PACKAGE, ZIP_SUFFIX);
@@ -984,7 +984,7 @@ public abstract class ExportPaperAbstractService {
                                     + "_2_" + option.getNumber() + oNum + "." + audio.getFileSuffixes();
                             oNum++;
                         }
-                        FileDisposeUtil.saveUrlAs(upYunProperty.getDomain() + audio.getFileUrl(), jsonDirectoryPath + File.separator + audioFileName);
+                        FileDisposeUtil.saveUrlAs(sysProperty.getDomain() + audio.getFileUrl(), jsonDirectoryPath + File.separator + audioFileName);
                     }
                 }
             }
@@ -1001,8 +1001,8 @@ public abstract class ExportPaperAbstractService {
             DocxProcessUtil.exportWord(paperExp, paperFileName, template);
             DocxProcessUtil.processImage(paperFileName, getPkgList(paperExp.getId()));
             File file = new File(TEMP_FILE_EXP + paperFileName);
-            String paperFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + paperFileName;
-            UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            String paperFilePath = sysProperty.getUploadPath() + extractConfig.getOrgId() + "/" + paperFileName;
+            UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upyun.writeFile(paperFilePath, file, true);
             ExamFile examFile = new ExamFile(paperExp.getId(), extractConfig, paperFilePath, examFileType, DOCX_SUFFIX);
             examFile.setGroupCode(examPaper.getGroupCode());
@@ -1052,8 +1052,8 @@ public abstract class ExportPaperAbstractService {
             File file = new File(TEMP_FILE_EXP + objectiveFilename);
             FileOutputStream out = new FileOutputStream(file);
             objectiveExcelExporter.write(objectiveFilename, objectiveQuestionStructureList, out);
-            String objectiveFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + objectiveFilename;
-            UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            String objectiveFilePath = sysProperty.getUploadPath() + extractConfig.getOrgId() + "/" + objectiveFilename;
+            UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upyun.writeFile(objectiveFilePath, file, true);
             ExamFile examFile = new ExamFile(paperExp.getId(), extractConfig, objectiveFilePath, ExamFileType.PAPER_STRUCTURE_OBJECTIVE, EXCEL_SUFFIX);
             examFile.setGroupCode(examPaper.getGroupCode());
@@ -1090,8 +1090,8 @@ public abstract class ExportPaperAbstractService {
             File file = new File(TEMP_FILE_EXP + subjectiveFileName);
             FileOutputStream out = new FileOutputStream(file);
             subjectiveExcelExporter.write(subjectiveFileName, subjectiveQuestionStructureList, out);
-            String subjectiveFilePath = upYunProperty.getUploadPath() + extractConfig.getOrgId() + "/" + subjectiveFileName;
-            UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            String subjectiveFilePath = sysProperty.getUploadPath() + extractConfig.getOrgId() + "/" + subjectiveFileName;
+            UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upyun.writeFile(subjectiveFilePath, file, true);
             ExamFile examFile = new ExamFile(paperExp.getId(), extractConfig, subjectiveFilePath, ExamFileType.PAPER_STRUCTURE_SUBJECTIVE, EXCEL_SUFFIX);
             examFile.setGroupCode(examPaper.getGroupCode());
@@ -1373,7 +1373,7 @@ public abstract class ExportPaperAbstractService {
     public void downloadAudio(PaperExp paperExp, String zipFileName) {
         //先判断是否是音频试卷
         if (paperExp.getHasAudio() != null && paperExp.getHasAudio() == true) {
-            UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             //取到所有大题
             List<PaperDetailExp> paperDetailExps = paperExp.getPaperDetails();
             if (paperDetailExps != null && paperDetailExps.size() > 0) {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/export/InitPaperExpService.java

@@ -16,7 +16,7 @@ import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperDetailUnitExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.impl.CourseService;
 import org.apache.commons.lang3.StringUtils;
 import org.docx4j.XmlUtils;
@@ -73,7 +73,7 @@ public class InitPaperExpService {
     CourseService courseService;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     public static final String FILL_BLANK_QUESTION_FLAG = "###";
 

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExamFileServiceImpl.java

@@ -5,7 +5,7 @@ import cn.com.qmth.examcloud.core.questions.dao.ExamFileRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.ExamFile;
 import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.ExportPaperInfoModel;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import main.java.com.UpYun;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +34,7 @@ public class ExamFileServiceImpl implements ExamFileService {
     private MongoTemplate MongoTemplate;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public void saveExamFiles(List<ExamFile> examFileList, User accessUser) {
@@ -92,7 +92,7 @@ public class ExamFileServiceImpl implements ExamFileService {
         query.addCriteria(Criteria.where("examId").is(examFile.getExamId()));
         query.addCriteria(Criteria.where("courseId").is(examFile.getCourseId()));
         List<ExamFile> examFiles = MongoTemplate.find(query, ExamFile.class);
-        UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+        UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
         for (ExamFile examFile2 : examFiles) {
             //删除又拍云上的文件
             upyun.deleteFile(examFile2.getFilePath());

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportPaperServiceImpl.java

@@ -18,7 +18,7 @@ import cn.com.qmth.examcloud.core.questions.service.PaperService;
 import cn.com.qmth.examcloud.core.questions.service.PropertyService;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.PaperExp;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.QuestionDistributeDto;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.converter.PrintExamPaperService;
 import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
 import com.google.common.collect.Lists;
@@ -90,7 +90,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
     protected QuesPkgPathRepo quesPkgPathRepo;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public void exportPaperFile(String paperId, String serviceName, String exportContentList, HttpServletResponse response, String loginName, String examType, String psw) throws Exception {
@@ -204,7 +204,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
                                         String audioFileName = questionAudio.getId() + "_" +
                                                 detail.getNumber() + "_" + question.getNumber() +
                                                 "_1_" + bodyNum + "." + questionAudio.getFileSuffixes();
-                                        UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                                        UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                                         File file = new File(jsonDirectory + File.separator + audioFileName);
                                         upyun.readFile(questionAudio.getFileUrl(), file);
                                         bodyNum++;
@@ -231,7 +231,7 @@ public class ExportPaperServiceImpl implements ExportPaperService {
                                                     String audioFileName = questionAudio.getId() + "_" +
                                                             detail.getNumber() + "_" + question.getNumber() +
                                                             "_2_" + computerTestOption.getNumber() + "_" + optionNum + "." + questionAudio.getFileSuffixes();
-                                                    UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                                                    UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                                                     File file = new File(jsonDirectory + File.separator + audioFileName);
                                                     upyun.readFile(questionAudio.getFileUrl(), file);
                                                     optionNum++;

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExportStructureServiceImpl.java

@@ -12,7 +12,7 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.ExtractConfig;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionTypeNum;
 import cn.com.qmth.examcloud.core.questions.service.ExamFileService;
 import cn.com.qmth.examcloud.core.questions.service.ExportStructureService;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import main.java.com.UpYun;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +54,7 @@ public class ExportStructureServiceImpl implements ExportStructureService {
     private MongoTemplate mongoTemplate;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public void saveExportStructure(ExportStructure exportStructure, User user) {
@@ -147,7 +147,7 @@ public class ExportStructureServiceImpl implements ExportStructureService {
             List<ExamFile> list = examFileService.findExamFileListByExamFile(new ExamFile(exportStructure.getExamId(), exportStructure.getOrgId()));
             if (list.size() > 0) {
                 //根据 ExamFile 对象查询  filePath ，并删除又拍云上的文件 , 然后在删除表里面的数据
-                UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                 for (int i = 0; i < list.size(); i++) {
                     upyun.deleteFile(list.get(i).getFilePath());
                 }

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/ExtractConfigFileServiceImpl.java

@@ -15,7 +15,7 @@ import cn.com.qmth.examcloud.core.questions.dao.PaperRepo;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.converter.PrintExamPaperService;
 import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
 import cn.com.qmth.examcloud.core.questions.service.export.InitPaperExpService;
@@ -96,7 +96,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
     private ExamCloudService examCloudService;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public void saveExtractConfigAndBuildPaperFile(ExtractConfig extractConfig, Integer isbuildFile, User user) throws Exception {
@@ -181,8 +181,8 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
     @Override
     public void exportExamPaperInfo(ExportPaperInfoModel exportModel, HttpServletResponse response, String loginName, String orgName, String psw) throws Exception {
         String tempDir = loginName + System.currentTimeMillis();
-        String downloadDir = upYunProperty.getDownloadDirectory() + "/" + tempDir;
-        String downZipDir = upYunProperty.getZipDirectory() + "/" + tempDir;
+        String downloadDir = sysProperty.getDownloadDirectory() + "/" + tempDir;
+        String downZipDir = sysProperty.getZipDirectory() + "/" + tempDir;
         //创建试卷和压缩文件 文件夹
         FileDisposeUtil.createDirectory(downloadDir);
         //创建压缩文件的文件夹
@@ -228,7 +228,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
         if (examFiles != null && examFiles.size() > 0) {
             for (int i = 0; i < examFiles.size(); i++) {
                 ExamFile examFile = examFiles.get(i);
-                UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                 File file = new File(downloadDir + File.separator + examFile.getFileName());
                 upyun.readFile(examFile.getFilePath(), file);
 
@@ -301,7 +301,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
                             for (QuestionAudio audio : questionAudios) {
                                 String audioFileName = audio.getId() +
                                         "_" + exportPaperAbstractService.getAudioFileName(audio, unit, paperDetailExp);
-                                UpYun upyun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                                UpYun upyun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                                 File file = new File(downloadDir + File.separator + audioFileName);
                                 upyun.readFile(audio.getFileUrl(), file);
                             }

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

@@ -11,7 +11,7 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.extract.ExtractConfigPaper;
 import cn.com.qmth.examcloud.core.questions.service.cache.Constants;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultQuestionGroup;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultQuestionStructureWrapper;
@@ -73,7 +73,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
     private RedisClient redisClient;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public ExtractConfigPaper getDefaultPaper(Long examId, String courseCode, String groupCode) {
@@ -575,7 +575,7 @@ public class ExtractConfigProviderServiceImpl implements ExtractConfigProviderSe
                     String questionAudioId = matchAudioName(containAStr, "a", "id");
                     QuestionAudio questionAudio = questionAudioService.findAudioById(questionAudioId);
                     if (questionAudio != null) {
-                        String url = upYunProperty.getDomain() + questionAudio.getFileUrl();
+                        String url = sysProperty.getDomain() + questionAudio.getFileUrl();
                         if (playTime != null) {
                             containAStr += " question-audio url=\"" + url + "\" playTime=\"" + playTime + "\"" + "></a>";
                         } else {

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

@@ -15,7 +15,7 @@ import cn.com.qmth.examcloud.core.questions.service.ExtractConfigService;
 import cn.com.qmth.examcloud.core.questions.service.QuesService;
 import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
 import cn.com.qmth.examcloud.core.questions.service.bean.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamCourseRelationBean;
@@ -87,7 +87,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
     private CourseService courseService;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Autowired
     private PaperDtoAssembler paperDtoAssembler;
@@ -851,7 +851,7 @@ public class ExtractConfigServiceImpl implements ExtractConfigService {
                     String questionAudioId = matchAudioName(containAStr, "a", "id");
                     QuestionAudio questionAudio = questionAudioService.findAudioById(questionAudioId);
                     if (questionAudio != null) {
-                        String url = upYunProperty.getDomain() + questionAudio.getFileUrl();
+                        String url = sysProperty.getDomain() + questionAudio.getFileUrl();
                         if (questionDto.getPlayTime() != null) {
                             containAStr += " question-audio url=\"" + url + "\" playTime=\"" + questionDto.getPlayTime() + "\"" + "></a>";
                         } else {

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/PaperServiceImpl.java

@@ -19,7 +19,7 @@ import cn.com.qmth.examcloud.core.questions.dao.*;
 import cn.com.qmth.examcloud.core.questions.dao.entity.*;
 import cn.com.qmth.examcloud.core.questions.service.*;
 import cn.com.qmth.examcloud.core.questions.service.bean.dto.*;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import cn.com.qmth.examcloud.core.questions.service.export.ExportPaperAbstractService;
 import com.google.gson.Gson;
 import main.java.com.UpYun;
@@ -110,7 +110,7 @@ public class PaperServiceImpl implements PaperService {
     private ExportServiceManageRepo exportServiceManageRepo;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
@@ -1050,8 +1050,8 @@ public class PaperServiceImpl implements PaperService {
         for (String fileName : filesName) {
             String[] fileNames = fileName.split("\\.");
             String fileType = fileNames[fileNames.length - 1];
-            if (upYunProperty.getRadioType().indexOf(fileType) < 0) {
-                messageMap.put("errorMsg", fileName + ",文件格式不正确,当前支持格式:" + upYunProperty.getRadioType());
+            if (sysProperty.getRadioType().indexOf(fileType) < 0) {
+                messageMap.put("errorMsg", fileName + ",文件格式不正确,当前支持格式:" + sysProperty.getRadioType());
                 return messageMap;
             }
 
@@ -1159,7 +1159,7 @@ public class PaperServiceImpl implements PaperService {
         for (MultipartFile file : files) {
             //判断文件大小
             long fileSize = file.getSize();
-            int size = Integer.parseInt(upYunProperty.getAudioMaxsize());
+            int size = Integer.parseInt(sysProperty.getAudioMaxsize());
             if (fileSize > (size * 1048576L)) {
                 throw new StatusException("400", "音频文件过大，限制5M内！");
             }
@@ -1226,12 +1226,12 @@ public class PaperServiceImpl implements PaperService {
             }
 
             //上传到又拍云
-            UpYun upYun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
-            upYun.writeFile(upYunProperty.getRadioUploadPath() + mp3FileName, mp3File, true);
+            UpYun upYun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
+            upYun.writeFile(sysProperty.getRadioUploadPath() + mp3FileName, mp3File, true);
             IoUtils.removeFile(mp3File);
 
             //保存记录
-            QuestionAudio audio = new QuestionAudio(questionId, file.getOriginalFilename(), upYunProperty.getRadioUploadPath() + mp3FileName);
+            QuestionAudio audio = new QuestionAudio(questionId, file.getOriginalFilename(), sysProperty.getRadioUploadPath() + mp3FileName);
             questionAudioService.saveQuestionAudio(audio, user);
         } catch (Exception e) {
             log.error(e.getMessage(), e);

examcloud-core-questions-service/src/main/java/cn/com/qmth/examcloud/core/questions/service/impl/QuestionAudioServiceImpl.java

@@ -8,7 +8,7 @@ import cn.com.qmth.examcloud.core.questions.dao.entity.QuesOption;
 import cn.com.qmth.examcloud.core.questions.dao.entity.Question;
 import cn.com.qmth.examcloud.core.questions.dao.entity.QuestionAudio;
 import cn.com.qmth.examcloud.core.questions.service.QuestionAudioService;
-import cn.com.qmth.examcloud.core.questions.service.config.UpYunProperty;
+import cn.com.qmth.examcloud.core.questions.service.config.SysProperty;
 import main.java.com.UpYun;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,14 +35,14 @@ public class QuestionAudioServiceImpl implements QuestionAudioService {
     private QuesRepo quesRepo;
 
     @Autowired
-    private UpYunProperty upYunProperty;
+    private SysProperty sysProperty;
 
     @Override
     public void saveQuestionAudio(QuestionAudio questionAudio, User user) {
         QuestionAudio questionAudio2 = findByQuestionIdAndFileName(questionAudio.getQuestionId(), questionAudio.getFileName());
         if (questionAudio2 != null) {
             questionAudio.setId(questionAudio2.getId());
-            UpYun upYun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            UpYun upYun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upYun.deleteFile(questionAudio2.getFileUrl());
             questionAudioRepo.delete(questionAudio2);
         }
@@ -81,7 +81,7 @@ public class QuestionAudioServiceImpl implements QuestionAudioService {
             while (audioIterator.hasNext()) {
                 QuestionAudio audio = audioIterator.next();
                 if (!questionBodyAndOptionStr.contains(audio.getFileName())) {
-                    UpYun upYun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+                    UpYun upYun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
                     upYun.deleteFile(audio.getFileUrl());
                     questionAudioRepo.delete(audio);
                 }
@@ -167,7 +167,7 @@ public class QuestionAudioServiceImpl implements QuestionAudioService {
         Iterator<QuestionAudio> audioIterator = questionAudios.iterator();
         while (audioIterator.hasNext()) {
             QuestionAudio audio = audioIterator.next();
-            UpYun upYun = new UpYun(upYunProperty.getBucketName(), upYunProperty.getUserName(), upYunProperty.getPassword());
+            UpYun upYun = new UpYun(sysProperty.getBucketName(), sysProperty.getUserName(), sysProperty.getPassword());
             upYun.deleteFile(audio.getFileUrl());
         }
         questionAudioRepo.deleteAll(questionAudios);