From 8a03302e96e538c62022ed8a3d61114a1171f8aa Mon Sep 17 00:00:00 2001
From: zhizhi wu <2377881365@qq.com>
Date: Tue, 22 Sep 2020 10:36:31 +0800
Subject: [PATCH] sha1 and md5

---
 .../ccsens/filedeal/api/DebugController.java  | 19 +++++++++++++++++++
 .../ccsens/filedeal/api/FileController.java   |  2 --
 .../com/ccsens/filedeal/bean/vo/FileVo.java   |  8 ++------
 .../ccsens/filedeal/service/FileService.java  |  8 ++++++--
 4 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/ccsens/filedeal/api/DebugController.java

diff --git a/src/main/java/com/ccsens/filedeal/api/DebugController.java b/src/main/java/com/ccsens/filedeal/api/DebugController.java
new file mode 100644
index 0000000..701a789
--- /dev/null
+++ b/src/main/java/com/ccsens/filedeal/api/DebugController.java
@@ -0,0 +1,19 @@
+package com.ccsens.filedeal.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2020/9/22 10:25
+ */
+@RestController
+@RequestMapping("debug")
+public class DebugController {
+
+    @RequestMapping("/")
+    public String index(){
+        return "hello world";
+    }
+}
diff --git a/src/main/java/com/ccsens/filedeal/api/FileController.java b/src/main/java/com/ccsens/filedeal/api/FileController.java
index bd35912..f949971 100644
--- a/src/main/java/com/ccsens/filedeal/api/FileController.java
+++ b/src/main/java/com/ccsens/filedeal/api/FileController.java
@@ -47,8 +47,6 @@ public class FileController {
     @RequestMapping(value = "upload/bigFile", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<FileVo.BigFile> uploadBigFile(FileDto.MultipartFileUpload fileUpload) throws Exception {
         log.info("大文件上传:{}", fileUpload);
-
-        String dir = PropUtil.path + WebConstant.FILE_UPLOAD_DIR;
         FileVo.BigFile bigFile = fileService.uploadBigFile(fileUpload);
         log.info("大文件上传返回：{}", bigFile);
         return JsonResponse.newInstance().ok(bigFile);
diff --git a/src/main/java/com/ccsens/filedeal/bean/vo/FileVo.java b/src/main/java/com/ccsens/filedeal/bean/vo/FileVo.java
index 6860ebc..c788a18 100644
--- a/src/main/java/com/ccsens/filedeal/bean/vo/FileVo.java
+++ b/src/main/java/com/ccsens/filedeal/bean/vo/FileVo.java
@@ -57,12 +57,8 @@ public class FileVo {
         private int chunkNum;
         @ApiModelProperty("文件sha1字符串")
         private String sha1;
-//        @ApiModelProperty("上传文件id")
-//        private Long id;
-//        @ApiModelProperty("文件名")
-//        private String name;
-//        @ApiModelProperty("存储路径")
-//        private String path;
+        @ApiModelProperty("文件md5字符串")
+        private String md5;
     }
 
 
diff --git a/src/main/java/com/ccsens/filedeal/service/FileService.java b/src/main/java/com/ccsens/filedeal/service/FileService.java
index 5b1727a..d58a0ea 100644
--- a/src/main/java/com/ccsens/filedeal/service/FileService.java
+++ b/src/main/java/com/ccsens/filedeal/service/FileService.java
@@ -279,7 +279,9 @@ public class FileService extends AbstractRedisService implements IFileService {
                     log.info("文件块已上传");
                     bigFile.setResult(WebConstant.FileMsg.FILE_UPLOAD_READY);
                     //文件sha1
-                    bigFile.setSha1(Sha1Util.getFileSha1(new File(path)));
+                    File file1 = new File(path);
+                    bigFile.setSha1(Sha1Util.getFileSha1(file1));
+                    bigFile.setMd5(Md5Util.getFileMD5(file1));
                     return bigFile;
                 }
             }
@@ -337,7 +339,9 @@ public class FileService extends AbstractRedisService implements IFileService {
                 }
             }
         }
-        bigFile.setSha1(Sha1Util.getFileSha1(new File(path)));
+        File file1 = new File(path);
+        bigFile.setSha1(Sha1Util.getFileSha1(file1));
+        bigFile.setMd5(Md5Util.getFileMD5(file1));
         bigFile.setResult(WebConstant.FileMsg.FILE_UPLOAD_SUC);
         log.info("响应时间：{}", System.currentTimeMillis() - t1);
         return bigFile;