瀏覽代碼

3.3.0 fix

xiaofei 1 年之前
父節點
當前提交
8c6ba06dd0

+ 1 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java

@@ -122,6 +122,7 @@ public class SysUserController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
+        Long upUserId = sysUserService.saveUser(userSaveParams);
         return ResultUtil.ok();
     }
 

+ 4 - 3
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/utils/FileStoreUtils.java

@@ -278,7 +278,8 @@ public class FileStoreUtils {
 
     public String uploadFile(InputStream inputStream, String md5, UploadFileEnum uploadFileEnum, String path) {
         try {
-            String fileMd5 = DigestUtils.md5Hex(inputStream);
+            InputStream md5InputStream = inputStream;
+            String fileMd5 = DigestUtils.md5Hex(md5InputStream);
             if (!Objects.equals(fileMd5, md5)) {
                 throw ExceptionResultEnum.MD5_EQUALS_FALSE.exception();
             }
@@ -288,12 +289,12 @@ public class FileStoreUtils {
             String type;
             //上传至oss
             if (oss || fssDomain.getConfig().startsWith(SystemConstant.START_PARENT)) {
-                this.ossUpload(fileName, inputStream, fileMd5, uploadFileEnum.getFssType());
+                this.ossUpload(fileName, inputStream, md5, uploadFileEnum.getFssType());
                 type = SystemConstant.OSS;
             }
             // 上传本地服务器
             else {
-                this.localUpload(fileName, inputStream, fileMd5, uploadFileEnum.getFssType());
+                this.localUpload(fileName, inputStream, md5, uploadFileEnum.getFssType());
                 type = SystemConstant.LOCAL;
             }
             return JSON.toJSONString(new FilePathVo(fileName, uploadFileEnum, type));

+ 2 - 1
teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -146,8 +146,9 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                     if (jsonFile.exists()) {
                         InputStream inputStream = null;
                         try {
+                            File file = jsonFile;
                             inputStream = new FileInputStream(jsonFile);
-                            String md5 = DigestUtils.md5Hex(inputStream);
+                            String md5 = DigestUtils.md5Hex(new FileInputStream(file));
                             Integer number = scanAnswerCardService.findMaxCardNumberByExamId(dto.getExamId());
                             String path = markFileService.getAnswerCardUri(dto.getExamId(), dto.getCoursePaperId(), number);
                             String uploadPath = fileStoreUtils.uploadFile(inputStream, md5, UploadFileEnum.CARD, path);