From 294a85abc5986594ba99fd92d7fba8e403a8ae17 Mon Sep 17 00:00:00 2001
From: jlzhou <12020042@qq.com>
Date: Thu, 14 Nov 2024 09:19:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A2=9E=E5=BC=BA=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=9B=BE=E7=89=87=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/auto/components/WImageUploader.vue    | 14 +---
 admin-ui/src/views/demo/file/index.vue        |  7 +-
 .../resources/application-local.yml.template  |  2 +-
 .../java/com/ruoyi/test/XFileStorageTest.java | 81 +++++++++++++------
 .../main/java/com/ruoyi/file/FileService.java | 63 +++++++++++++++
 .../com/ruoyi/file/impl/FileServiceImpl.java  | 31 +++++--
 6 files changed, 155 insertions(+), 43 deletions(-)

diff --git a/admin-ui/src/auto/components/WImageUploader.vue b/admin-ui/src/auto/components/WImageUploader.vue
index 2633830..a9555ea 100644
--- a/admin-ui/src/auto/components/WImageUploader.vue
+++ b/admin-ui/src/auto/components/WImageUploader.vue
@@ -38,7 +38,7 @@
               </svg>
             </div>
 
-            <div v-if="item.url && !props.disabled" @click.stop="item.remove()" class="btn">
+            <div v-if="item.url && !props.disabled" @click.stop="remove(item)" class="btn">
               <svg t="1729755512665" class="icon" viewBox="0 0 1024 1024" version="1.1"
                 xmlns="http://www.w3.org/2000/svg" p-id="2491" width="200" height="200">
                 <path
@@ -50,6 +50,7 @@
         </div>
       </slot>
     </div>
+    
     <el-image-viewer v-if="imgShow" @close="imgShow = false" ref="imgRef"
       :url-list="data.map(a => a.url ? getUrl(a.url) : a.preview)" />
   </div>
@@ -213,11 +214,6 @@ onMounted(async () => {
       data.value = mv.value.map(a => ({ url: a }))
     }
   }
-  for (let one of data.value) {
-    one.remove = () => {
-      remove(one)
-    }
-  }
   console.debug(proxy.$refs.imgRef)
 })
 
@@ -338,7 +334,7 @@ const uploadFiles = async () => {
     console.debug('end')
   }).finally(() => {
     data.value = data.value.filter(a => !a.error && !a.abort)
-    console.debug('finally')
+    console.debug('finally',data.value)
     doing.value = false
     uploading.value = false
   })
@@ -370,10 +366,6 @@ const uploadFile = async (index, retry = 0) => {
     one.uploading.controller.abort()
   }
 
-  one.remove = () => {
-    remove(one)
-  }
-
 
 
   let formData = new FormData()
diff --git a/admin-ui/src/views/demo/file/index.vue b/admin-ui/src/views/demo/file/index.vue
index 667de97..e9cb509 100644
--- a/admin-ui/src/views/demo/file/index.vue
+++ b/admin-ui/src/views/demo/file/index.vue
@@ -36,7 +36,12 @@ const getUploadKey =async () => {
               <li>属性（saveSrc）：是否保存图片原文件，如果true，则下载时下载原图zip文件，否则下载大图片，默认：false </li>
               <li>属性（saveMin）：是否保存缩略图，如果true，则列表时显示缩略图，否则显示大图，默认：true </li>
               <li>属性（watermark）：是否添加水印，默认：true </li>
+              <li>属性（noEffect）：是否无效果，本质设置css属性，默认：false </li>
               <li>css属性（--image-size）：图片显示大小，默认： 10em </li>
+              <li>css属性（--image-border-radius）：图片显示圆角，默认： .4em</li>
+              <li>css属性（--image-margin）：图片外边距，默认： .5em .5em 0 0</li>
+              <li>css属性（--image-border）：图片边框，默认： #FFF solid 2px </li>
+              <li>css属性（--image-box-shadow）：图片阴影，默认： 0 0 .2em #0005</li>
               <li>插槽（button）：上传按钮插槽</li>
               <li>插槽（default）：图片列表插槽，作用域：list，不建议定义</li>
               <li>事件（change）：modelValue发送了变化</li>
@@ -146,7 +151,7 @@ const { proxy } = getCurrentInstance()
 const data = ref(['/files/default/2024/10/24/2nhdirb2ujey/5mb.txt'])
 const uploading = ref(false)
 
-const imgs = ref(['/files/default/2024/10/24/f99pkzpyc0bt.webp'])
+const imgs = ref(['/files/default/2024/10/24/d0wt3m3j4tud.webp'])
 const imging = ref(false)
 </script>
 <style lang="scss" scoped>
diff --git a/ruoyi-admin/src/main/resources/application-local.yml.template b/ruoyi-admin/src/main/resources/application-local.yml.template
index 01962e2..34bb80b 100644
--- a/ruoyi-admin/src/main/resources/application-local.yml.template
+++ b/ruoyi-admin/src/main/resources/application-local.yml.template
@@ -25,7 +25,7 @@ ruoyi:
         enable-storage: true  # 启用存储
         access-key: ${ruoyi.name}
         secret-key: ${ruoyi.name}1415926
-        end-point: http://192.168.3.222:9000/files
+        end-point: http://192.168.3.222:9000
         bucket-name: files
         domain: "/files/" # 访问域名，注意“/”结尾，例如：http://minio.abc.com/abc/
         base-path: "" # 基础路径
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/XFileStorageTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/XFileStorageTest.java
index 9360921..6b24e07 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/test/XFileStorageTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/test/XFileStorageTest.java
@@ -7,6 +7,7 @@ import com.ruoyi.TestSuper;
 import com.ruoyi.file.FileService;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
+import org.dromara.x.file.storage.core.Downloader;
 import org.dromara.x.file.storage.core.FileInfo;
 import org.dromara.x.file.storage.core.FileStorageService;
 import org.dromara.x.file.storage.core.tika.TikaFactory;
@@ -41,35 +42,65 @@ public class XFileStorageTest extends TestSuper {
         return this.getClass().getResourceAsStream("/test.png");
     }
 
-    @Test
-    @DisplayName("分片上传")
-    @Disabled
-    @SneakyThrows
-    public void testMultipartUpload() {
-        File file = new File("D:\\test.mp4");
-        String uploadId = fileService.setPlatform("aliyun").setUri("/test.mp4").multipartUploadInit();
-        try (
-                InputStream in = new FileInputStream(file);
-        ) {
-            byte[] bs = new byte[5 * 1024 * 1024];//每一片5MB
-            int len = 0;
-            int partNumber = 0;
-            try {
-                while ((len = in.read(bs)) > 0) {
-                    partNumber++;
-                    ByteArrayInputStream bin = new ByteArrayInputStream(bs, 0, len);
-                    fileService.multipartUpload(uploadId, partNumber, bin);
-                    out("上传分片成功：" + partNumber + " len:" + len);
 
-                }
-                out("分片上传成功：" + fileService.multipartUploadComplete(uploadId));
-            } catch (Exception e) {
-                out("分片上传失败", e);
-                fileService.multipartUploadAbort(uploadId);
-            }
+  @Test
+  @DisplayName("上传获取hash值")
+  @Disabled
+  @SneakyThrows
+  public void testUploadAndHash() {
+    out("保存随机文件名:" + fileService.setMd5().setSha256().setFilename("test.png").save(getInstream()));
+    out("md5:"+fileService.getMd5());//7edbdf71867c45ca4f15b4025fc6a5dc
+    out("sha256:"+fileService.getSha256());//29f57210ca91b193272e4695adefe356a2f1586b07d3845c85afbf7708134a0a
+  }
+
+  @Test
+  @DisplayName("下载获取hash值")
+  @Disabled
+  @SneakyThrows
+  public void testDownloadAndHash() {
+    Downloader downloader = fileService.setMd5().setSha256().download("/files/default/2024/11/13/u6h22sja9w9p.png");
+    downloader.file(File.createTempFile("aaaa","bbbbb"));//必须先下载完成
+    out("md5:"+downloader.getHashCalculatorManager().getHashInfo().getMd5());//d41d8cd98f00b204e9800998ecf8427e
+    out("sha256:"+downloader.getHashCalculatorManager().getHashInfo().getSha256());//e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+  }
+
+
+  @Test
+  @DisplayName("分片上传获取hash值")
+  @Disabled
+  @SneakyThrows
+  public void testMultipartUploadAndHash() {
+   out("分片上传不能获取hash值");
+  }
+  @Test
+  @DisplayName("分片上传")
+  @Disabled
+  @SneakyThrows
+  public void testMultipartUpload() {
+    File file = new File("D:\\test.mp4");
+    String uploadId = fileService.setPlatform("aliyun").setUri("/test.mp4").multipartUploadInit();
+    try (
+      InputStream in = new FileInputStream(file);
+    ) {
+      byte[] bs = new byte[5 * 1024 * 1024];//每一片5MB
+      int len = 0;
+      int partNumber = 0;
+      try {
+        while ((len = in.read(bs)) > 0) {
+          partNumber++;
+          ByteArrayInputStream bin = new ByteArrayInputStream(bs, 0, len);
+          fileService.multipartUpload(uploadId, partNumber, bin);
+          out("上传分片成功：" + partNumber + " len:" + len);
 
         }
+        out("分片上传成功：" + fileService.multipartUploadComplete(uploadId));
+      } catch (Exception e) {
+        out("分片上传失败", e);
+        fileService.multipartUploadAbort(uploadId);
+      }
+
     }
+  }
 
 
     @Test
diff --git a/ruoyi-system-file/src/main/java/com/ruoyi/file/FileService.java b/ruoyi-system-file/src/main/java/com/ruoyi/file/FileService.java
index b017e28..ef793d7 100644
--- a/ruoyi-system-file/src/main/java/com/ruoyi/file/FileService.java
+++ b/ruoyi-system-file/src/main/java/com/ruoyi/file/FileService.java
@@ -8,12 +8,14 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.SymmetricAlgorithm;
 import cn.hutool.crypto.symmetric.SymmetricCrypto;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.utils.IdUtils;
 import lombok.Data;
 import lombok.SneakyThrows;
 import org.apache.tika.Tika;
 import org.dromara.x.file.storage.core.Downloader;
 import org.dromara.x.file.storage.core.FileInfo;
+import org.dromara.x.file.storage.core.hash.HashInfo;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.imageio.ImageIO;
@@ -71,8 +73,24 @@ public interface FileService {
 
 
   ThreadLocal<Param> paramThreadLocal = ThreadLocal.withInitial(() -> new Param());
+  ThreadLocal<HashInfo> hashInfoThreadLocal = new ThreadLocal<>();
 
 
+  /**
+   * 获取文件上传完成后计算的md5值
+   * @return
+   */
+  default  String getMd5() {
+    return hashInfoThreadLocal.get()==null?null:hashInfoThreadLocal.get().getMd5();
+  }
+  /**
+   * 获取文件上传完成后计算的sha256值
+   * @return
+   */
+  default  String getSha256() {
+    return hashInfoThreadLocal.get()==null?null:hashInfoThreadLocal.get().getSha256();
+  }
+
   /**
    * 初始化分片上传
    *
@@ -157,6 +175,45 @@ public interface FileService {
     return this;
   }
 
+  /**
+   * 设置计算md5
+   * @return
+   */
+  default  FileService setMd5() {
+    paramThreadLocal.get().setMd5(true);
+    return this;
+  }
+
+  /**
+   * 设置是否计算md5
+   * @param md5
+   * @return
+   */
+  default  FileService setMd5(boolean md5) {
+    paramThreadLocal.get().setMd5(md5);
+    return this;
+  }
+
+  /**
+   * 设置计算Sha256
+   * @return
+   */
+  default  FileService setSha256() {
+    paramThreadLocal.get().setSha256(true);
+    return this;
+  }
+
+  /**
+   * 设置是否计算Sha256
+   * @return
+   */
+  default  FileService setSha256(boolean sha256) {
+    paramThreadLocal.get().setSha256(sha256);
+    return this;
+  }
+
+
+
   /**
    * 在保存方法之前执行
    * 设置路径前缀
@@ -175,6 +232,7 @@ public interface FileService {
     return this;
   }
 
+
   /**
    * 在保存方法之前执行
    * 设置文件名
@@ -647,9 +705,14 @@ public interface FileService {
     private String uri;
     private int maxWidth = 0;
     private int maxHeight = 0;
+    @JsonIgnore
     private BufferedImage watermark;
     private int thWidth = 0;
     private int thHeight = 0;
 
+    private boolean md5 = false;
+
+    private boolean sha256 = false;
+
   }
 }
diff --git a/ruoyi-system-file/src/main/java/com/ruoyi/file/impl/FileServiceImpl.java b/ruoyi-system-file/src/main/java/com/ruoyi/file/impl/FileServiceImpl.java
index 7b95183..fdab0b0 100644
--- a/ruoyi-system-file/src/main/java/com/ruoyi/file/impl/FileServiceImpl.java
+++ b/ruoyi-system-file/src/main/java/com/ruoyi/file/impl/FileServiceImpl.java
@@ -69,6 +69,7 @@ public class FileServiceImpl implements FileService {
         .setPath(p.getPath())
         .setSaveFilename(p.getSaveFilename())
         .putMetadata(isUpyunUss, "X-Upyun-Multi-Part-Size", String.valueOf(5 * 1024 * 1024))// 设置 Metadata，不需要可以不写
+
         .init();
 
       String uploadId = UUID.fastUUID().toString(true);
@@ -85,6 +86,7 @@ public class FileServiceImpl implements FileService {
     if (fileInfo == null) {
       throw new RuntimeException("未初始化分片上传");
     }
+
     service.uploadPart(fileInfo, partNumber, inputStream).upload();
   }
 
@@ -95,7 +97,9 @@ public class FileServiceImpl implements FileService {
     if (fileInfo == null) {
       throw new RuntimeException("未初始化分片上传");
     }
-    service.completeMultipartUpload(fileInfo).complete();
+     service.completeMultipartUpload(fileInfo).complete();
+
+
     RedisUtils.deleteObject(CACHE_KEY_PREFIX + uploadId);
     return fileInfo.getUrl();
   }
@@ -131,7 +135,8 @@ public class FileServiceImpl implements FileService {
   public Downloader download(String url) {
     try {
       FileInfo fileInfo = getFileInfoByURL(url);
-      return service.download(fileInfo);
+      Param param = paramThreadLocal.get();
+      return service.download(fileInfo).setHashCalculatorMd5(param.isMd5()).setHashCalculatorSha256(param.isSha256());
     } finally {
       paramThreadLocal.remove();
     }
@@ -147,7 +152,7 @@ public class FileServiceImpl implements FileService {
 
       if (fileStorage.isSupportPresignedUrl()) {
         url = generatePresignedUrlInner(url, null, fileInfo, fileStorage);
-        log.debug("跳转："+url);
+        log.debug("跳转：" + url);
         response.reset();
         response.setStatus(HttpServletResponse.SC_FOUND);
         response.setHeader("Location", url);
@@ -238,7 +243,11 @@ public class FileServiceImpl implements FileService {
       UploadPretreatment p = service.of(in);
       Param param = paramThreadLocal.get();
       initUploadPretreatment(p, param);
-      return p.upload().getUrl();
+      FileInfo fileInfo = p.upload();
+      if (param.isSha256() || param.isMd5()) {
+        hashInfoThreadLocal.set(fileInfo.getHashInfo());
+      }
+      return fileInfo.getUrl();
     } finally {
       paramThreadLocal.remove();
     }
@@ -257,7 +266,11 @@ public class FileServiceImpl implements FileService {
       param.setFilename(FileService.DEFAULT_IMAGE_FILENAME);
       UploadPretreatment p = service.of(formatImage(image, param.getMaxWidth(), param.getMaxHeight(), param.getWatermark()));
       initUploadPretreatment(p, param);
-      String url = p.upload().getUrl();
+      FileInfo fileInfo = p.upload();
+      if (param.isSha256() || param.isMd5()) {
+        hashInfoThreadLocal.set(fileInfo.getHashInfo());
+      }
+      String url = fileInfo.getUrl();
       if (param.getThHeight() > 0 && param.getThWidth() > 0) {
         UploadPretreatment p1 = service.of(formatImage(image, param.getThWidth(), param.getThHeight(), null));
         String platform = param.getPlatform();
@@ -346,6 +359,14 @@ public class FileServiceImpl implements FileService {
     } else {
       p = p.setPlatform(service.getFileStorage().getPlatform());
     }
+
+    if (param.isMd5()) {
+      p = p.setHashCalculatorMd5();
+    }
+    if (param.isSha256()) {
+      p = p.setHashCalculatorSha256();
+    }
+
     String uri = param.getUri();
     if (StrUtil.isBlank(uri)) {
       String rule = param.getRule();