From 6eeb93f90b5547801c62dbfeb9d44459da2fe525 Mon Sep 17 00:00:00 2001
From: MAC <1162714483@qq.com>
Date: Tue, 8 Aug 2023 23:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=8F=8A?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qiwenshare/file/domain/FileBean.java |  2 +-
 .../com/qiwenshare/file/domain/RecoveryFile.java  |  4 +++-
 .../com/qiwenshare/file/domain/UploadTask.java    |  2 +-
 .../qiwenshare/file/domain/UploadTaskDetail.java  |  2 +-
 .../java/com/qiwenshare/file/io/QiwenFile.java    | 15 +++++++++------
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/domain/FileBean.java b/src/main/java/com/qiwenshare/file/domain/FileBean.java
index 63f85fe..3f0f6a0 100644
--- a/src/main/java/com/qiwenshare/file/domain/FileBean.java
+++ b/src/main/java/com/qiwenshare/file/domain/FileBean.java
@@ -39,7 +39,7 @@ public class FileBean {
     @Column(columnDefinition="int(1) comment '存储类型'")
     private Integer storageType;
 
-    @Column(columnDefinition="varchar(32) comment 'md5唯一标识'")
+    @Column(columnDefinition="varchar(200) comment 'md5唯一标识'")
     private String identifier;
 
     @Column(columnDefinition="varchar(25) comment '创建时间'")
diff --git a/src/main/java/com/qiwenshare/file/domain/RecoveryFile.java b/src/main/java/com/qiwenshare/file/domain/RecoveryFile.java
index e8d7d8a..dc0fd86 100644
--- a/src/main/java/com/qiwenshare/file/domain/RecoveryFile.java
+++ b/src/main/java/com/qiwenshare/file/domain/RecoveryFile.java
@@ -8,7 +8,9 @@ import lombok.Data;
 import javax.persistence.*;
 
 @Data
-@Table(name = "recoveryfile")
+@Table(name = "recoveryfile", uniqueConstraints = {
+        @UniqueConstraint(name = "user_file_id_index3", columnNames = {"userFileId"})
+})
 @Entity
 @TableName("recoveryfile")
 public class RecoveryFile {
diff --git a/src/main/java/com/qiwenshare/file/domain/UploadTask.java b/src/main/java/com/qiwenshare/file/domain/UploadTask.java
index ec2a349..79488ba 100644
--- a/src/main/java/com/qiwenshare/file/domain/UploadTask.java
+++ b/src/main/java/com/qiwenshare/file/domain/UploadTask.java
@@ -22,7 +22,7 @@ public class UploadTask {
     @Column(columnDefinition = "bigint(20) comment '用户id'")
     private String userId;
 
-    @Column(columnDefinition="varchar(32) comment 'md5唯一标识'")
+    @Column(columnDefinition="varchar(200) comment 'md5唯一标识'")
     private String identifier;
 
     @Column(columnDefinition="varchar(100) comment '文件名称'")
diff --git a/src/main/java/com/qiwenshare/file/domain/UploadTaskDetail.java b/src/main/java/com/qiwenshare/file/domain/UploadTaskDetail.java
index 7d3223e..c6bba8b 100644
--- a/src/main/java/com/qiwenshare/file/domain/UploadTaskDetail.java
+++ b/src/main/java/com/qiwenshare/file/domain/UploadTaskDetail.java
@@ -37,6 +37,6 @@ public class UploadTaskDetail {
     @Column(columnDefinition="bigint(10) comment '文件总大小'")
     private Integer totalSize;
 
-    @Column(columnDefinition="varchar(32) comment '文件md5唯一标识'")
+    @Column(columnDefinition="varchar(200) comment '文件md5唯一标识'")
     private String identifier;
 }
diff --git a/src/main/java/com/qiwenshare/file/io/QiwenFile.java b/src/main/java/com/qiwenshare/file/io/QiwenFile.java
index 53719da..90fd585 100644
--- a/src/main/java/com/qiwenshare/file/io/QiwenFile.java
+++ b/src/main/java/com/qiwenshare/file/io/QiwenFile.java
@@ -18,17 +18,17 @@ public class QiwenFile {
     private boolean isDirectory;
 
     public QiwenFile(String pathname, boolean isDirectory) {
-        if (StringUtils.isEmpty(pathname)) {
-            throw new QiwenException("file name format error，pathname:" + pathname);
-        }
+//        if (StringUtils.isEmpty(pathname)) {
+//            throw new QiwenException("file name format error，pathname:" + pathname);
+//        }
         this.path = formatPath(pathname);
         this.isDirectory = isDirectory;
     }
 
     public QiwenFile(String parent, String child, boolean isDirectory) {
-        if (StringUtils.isEmpty(child)) {
-            throw new QiwenException("file name format error，parent:" + parent +", child:" + child);
-        }
+//        if (StringUtils.isEmpty(child)) {
+//            throw new QiwenException("file name format error，parent:" + parent +", child:" + child);
+//        }
         if (parent != null) {
             String parentPath = separator.equals(formatPath(parent)) ? "" : formatPath(parent);
             String childPath = formatPath(child);
@@ -47,6 +47,9 @@ public class QiwenFile {
         if ("/".equals(path)) {
             return path;
         }
+        if (!path.startsWith(separator)) {
+            path = separator + path;
+        }
         if (path.endsWith("/")) {
             int length = path.length();
             return path.substring(0, length - 1);