Browse Source

标答文件不加密

xiatian 4 years ago
parent
commit
a3371c5078

+ 4 - 3
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamPaperServiceImpl.java

@@ -138,10 +138,11 @@ public class TEExamPaperServiceImpl extends ServiceImpl<TEExamPaperMapper, TEExa
             dfile.mkdirs();
             File structFile = new File(dir + "struct.json");
             FileUtil.saveUrlAsFile(structUrl, structFile);
-            File answerEncryptFile = new File(dir + "answer_encrypt_file.json");
-            FileUtil.saveUrlAsFile(answerUrl, answerEncryptFile);
+//            File answerEncryptFile = new File(dir + "answer_encrypt_file.json");
+//            FileUtil.saveUrlAsFile(answerUrl, answerEncryptFile);
             File answerFile = new File(dir + "answer_file.json");
-            FileUtil.decryptFile(answerEncryptFile, answerFile, ep.getDecryptSecret(), ep.getDecryptVector());
+            FileUtil.saveUrlAsFile(answerUrl, answerFile);
+//            FileUtil.decryptFile(answerEncryptFile, answerFile, ep.getDecryptSecret(), ep.getDecryptVector());
             String structJson = FileUtil.readFileContent(structFile);
             String answerjson = FileUtil.readFileContent(answerFile);
             return buildCache(structJson, answerjson);

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -289,12 +289,12 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
         if (answerFile == null) {
             return;
         }
-        File encryptFile = new File(rootDir + uuid() + ".json");
-        FileUtil.encryptFile(answerFile, encryptFile, paper.getDecryptSecret(), paper.getDecryptVector());
+//        File encryptFile = new File(rootDir + uuid() + ".json");
+//        FileUtil.encryptFile(answerFile, encryptFile, paper.getDecryptSecret(), paper.getDecryptVector());
         String filePath = sdf.format(new Date()) + "/" + uuid() + ".json";
         paper.setAnswerPath(filePath);
         SystemConfig systemConfig = SpringContextHolder.getBean(SystemConfig.class);
-        OssUtil.ossUpload(systemConfig.getOssEnv(3), filePath, encryptFile);
+        OssUtil.ossUpload(systemConfig.getOssEnv(3), filePath, answerFile);
     }
 
     private void addResult(StringBuilder result, String msg) {