Fix: failed unit test / Feat: support TTL in redis cache

pkg/filesystem/archive.go

@@ -85,7 +85,7 @@ func (fs *FileSystem) doCompress(ctx context.Context, file *model.File, folder *
 
 		// 创建压缩文件头
 		header := &zip.FileHeader{
-			Name:               file.Name,
+			Name:               filepath.Join(file.Position, file.Name),
 			Modified:           file.UpdatedAt,
 			UncompressedSize64: file.Size,
 		}
@@ -103,5 +103,22 @@ func (fs *FileSystem) doCompress(ctx context.Context, file *model.File, folder *
 		}
 
 		_, err = io.Copy(writer, fileToZip)
+	} else if folder != nil {
+		// 对象是目录
+		// 获取子文件
+		subFiles, err := folder.GetChildFiles()
+		if err == nil && len(subFiles) > 0 {
+			for i := 0; i < len(subFiles); i++ {
+				fs.doCompress(ctx, &subFiles[i], nil, zipWriter, isArchive)
+			}
+
+		}
+		// 获取子目录，继续递归遍历
+		subFolders, err := folder.GetChildFolder()
+		if err == nil && len(subFolders) > 0 {
+			for i := 0; i < len(subFolders); i++ {
+				fs.doCompress(ctx, nil, &subFolders[i], zipWriter, isArchive)
+			}
+		}
 	}
 }

pkg/filesystem/file_test.go

@@ -52,6 +52,7 @@ func TestFileSystem_AddFile(t *testing.T) {
 	f, err := fs.AddFile(ctx, &folder)
 
 	asserts.NoError(err)
+	asserts.NoError(mock.ExpectationsWereMet())
 	asserts.Equal("/Uploads/1_sad.txt", f.SourceName)
 }
 
@@ -146,6 +147,7 @@ func TestFileSystem_GetDownloadContent(t *testing.T) {
 	_, err = fs.GetDownloadContent(ctx, "/TestFileSystem_GetDownloadContent.txt")
 	asserts.NoError(err)
 	asserts.NoError(mock.ExpectationsWereMet())
+	fs.CleanTargets()
 
 	// 有限速
 	mock.ExpectQuery("SELECT(.+)").
@@ -302,6 +304,7 @@ func TestFileSystem_GetSource(t *testing.T) {
 		asserts.NoError(mock.ExpectationsWereMet())
 		asserts.NoError(err)
 		asserts.NotEmpty(sourceURL)
+		fs.CleanTargets()
 	}
 
 	// 文件不存在
@@ -321,6 +324,7 @@ func TestFileSystem_GetSource(t *testing.T) {
 		asserts.Error(err)
 		asserts.Equal(ErrObjectNotExist.Code, err.(serializer.AppError).Code)
 		asserts.Empty(sourceURL)
+		fs.CleanTargets()
 	}
 
 	// 未知上传策略
@@ -346,6 +350,7 @@ func TestFileSystem_GetSource(t *testing.T) {
 		asserts.NoError(mock.ExpectationsWereMet())
 		asserts.Error(err)
 		asserts.Empty(sourceURL)
+		fs.CleanTargets()
 	}
 
 	// 不允许获取外链
@@ -372,5 +377,6 @@ func TestFileSystem_GetSource(t *testing.T) {
 		asserts.Error(err)
 		asserts.Equal(serializer.CodePolicyNotAllowed, err.(serializer.AppError).Code)
 		asserts.Empty(sourceURL)
+		fs.CleanTargets()
 	}
 }