bug后端修改

examcloud-core-questions-base/src/main/java/cn/com/qmth/examcloud/core/questions/base/FileDisposeUtil.java

@@ -113,7 +113,7 @@ public class FileDisposeUtil {
 	        //获取目标文件的绝对路径  
 	        //读取文件  
 			in = new FileInputStream(fullFilePath);
-			out = response.getOutputStream();  
+			out = response.getOutputStream();
 	        //写文件  
 	        byte[] buffer = new byte[4096];
 			int count = 0;

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

@@ -346,7 +346,7 @@ public class ImportPaperService {
             }else{
             	String errorMsg = pText.length()>10?pText.substring(0, 10):pText;
             	if(pText.startsWith(ImportPaperMsg.left_bracket)){
-            		throw new PaperException(errorMsg + "，标签格式不正确！正确标签格式：[小题分数]、[答案]、[难度]、[一级属性]、[二级属性]、[公开度]、[小题型]");
+            		throw new PaperException(errorMsg + "，标签格式不正确！正确标签格式：[套题]、[套题分数]、[小题分数]、[答案]、[难度]、[一级属性]、[二级属性]、[公开度]、[小题型]");
             	}
                 throw new PaperException(importPaperCheck.getQuesName()+"：“"+ errorMsg +"”"+ImportPaperMsg.errMsg_12);
             }

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

@@ -44,6 +44,8 @@ public class TjdxExportPaperService extends ExportPaperAbstractService {
 				DocxProcessUtil.exportWordNew(paperExp, file,TJDX_TEMPLATE_PAPER);
 			}
 			DocxProcessUtil.processImage(zipFileName+File.separator+paperfileName,getPkgList(paperId));
+			//下载音频
+			super.downloadAudio(paperExp, zipFileName);
 		}
     }
 	

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

@@ -194,7 +194,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 		FileDisposeUtil.createDirectory(downloadDir);
 		//创建压缩文件的文件夹
 		FileDisposeUtil.createDirectory(downZipDir);
-		/*ExportStructure exportStructure = exportStructureService.findStructureByExamId(exportModel.getExamId()+"");
+		ExportStructure exportStructure = exportStructureService.findStructureByExamId(exportModel.getExamId()+"");
 		if(exportStructure==null){
 			exportStructure = new ExportStructure();
 			exportStructure.setExportType(ExportType.NORMAL);
@@ -207,7 +207,7 @@ public class ExtractConfigFileServiceImpl implements ExtractConfigFileService {
 					makePaperStructure(downloadDir,exportStructure.getExamName(),paperIds,exportStructure);
 				}
 			}
-		}*/
+		}
 		//根据条件获取到文件下载路径,下载文件到服务器的downloadDirectory文件夹
 		List<ExamFile> examFiles = examFileService.findExamFileListByExportPaperInfoModel(exportModel);
 		if(examFiles!=null&&examFiles.size()>0){

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

@@ -1207,7 +1207,7 @@ public class PaperServiceImpl implements PaperService{
 			UpYun upYun = new UpYun(bucketName, userName, password);
 			upYun.writeFile(upyunRadioPath+mp3FileNameString, mp3File,true);
 			mp3File.delete();
-			//保存记录
+			//保存记录 
 			questionAudioService.saveQuestionAudio(new QuestionAudio(questionId,file.getOriginalFilename(),upyunRadioPath+mp3FileNameString),user);
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -1416,6 +1416,6 @@ public class PaperServiceImpl implements PaperService{
 		}
 		return newObjs;
 	}
-		
+
 }
 

examcloud-core-questions-starter/src/main/java/cn/com/qmth/examcloud/core/questions/starter/config/DefaultWebMvcConfigurerAdapter.java

@@ -133,6 +133,8 @@ public class DefaultWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
 		
 		String[] exclusions = new String[]{
 				".*/export/.*",
+				".*/exportSingleExamPaperInfo/.*",
+				".*/exportBatchExamPaperInfo/.*",
 //				".*/importPaper/.*",
 //				"^.*/import.*$",/extractQues/
 				".*/ecs_ques/extract/.*",

examcloud-core-questions-starter/src/main/resources/application-dev.properties

@@ -3,12 +3,12 @@ spring.data.mongodb.uri=mongodb://192.168.10.30:27017/comm-ques-bank
 spring.data.mongodb.grid-fs-database=comm-ques-bank
 spring.data.mongodb.database=comm-ques-bank
 eureka.client.serviceUrl.defaultZone=http://192.168.10.30:1111/eureka/
-spring.application.name=weiwenhai-ExamCloud-service-question
+spring.application.name=ExamCloud-service-question
 
 spring.redis.host=192.168.10.30
 spring.redis.port=6379
 
-upyun.bucketName=exam-cloud-test 
+upyun.bucketName=exam-cloud-test
 upyun.userName=examcloud
 upyun.password=examcloud123456
 upyun.uploadUrl=/comm-ques-bank/dev/exam-paper-file/