diff --git a/src/main/java/com/alist/api/modules/file/FileController.java b/src/main/java/com/alist/api/modules/tusFile/FileController.java similarity index 98% rename from src/main/java/com/alist/api/modules/file/FileController.java rename to src/main/java/com/alist/api/modules/tusFile/FileController.java index 620b9d7..ef3acb9 100644 --- a/src/main/java/com/alist/api/modules/file/FileController.java +++ b/src/main/java/com/alist/api/modules/tusFile/FileController.java @@ -1,11 +1,11 @@ -package com.alist.api.modules.file; +package com.alist.api.modules.tusFile; import com.alist.api.common.response.ApiResponse; import com.alist.api.common.response.ApiResponseCode; import com.alist.api.common.utils.SecurityUtil; -import com.alist.api.modules.file.dto.*; -import com.alist.api.modules.file.form.*; -import com.alist.api.modules.file.service.FileService; +import com.alist.api.modules.tusFile.dto.*; +import com.alist.api.modules.tusFile.form.*; +import com.alist.api.modules.tusFile.service.FileService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileDeleteDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileDeleteDto.java similarity index 77% rename from src/main/java/com/alist/api/modules/file/dto/FileDeleteDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileDeleteDto.java index 59a9700..39e5a5a 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileDeleteDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileDeleteDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileDownloadDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadDto.java similarity index 93% rename from src/main/java/com/alist/api/modules/file/dto/FileDownloadDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadDto.java index d0f836a..a455e1f 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileDownloadDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileDownloadItemDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadItemDto.java similarity index 88% rename from src/main/java/com/alist/api/modules/file/dto/FileDownloadItemDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadItemDto.java index 6d61038..add6d5a 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileDownloadItemDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadItemDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileDownloadListDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadListDto.java similarity index 87% rename from src/main/java/com/alist/api/modules/file/dto/FileDownloadListDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadListDto.java index fd5c755..6a1e24f 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileDownloadListDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileDownloadListDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileMoveTaskDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileMoveTaskDto.java similarity index 93% rename from src/main/java/com/alist/api/modules/file/dto/FileMoveTaskDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileMoveTaskDto.java index 85e6297..67f06b4 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileMoveTaskDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileMoveTaskDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileUploadDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadDto.java similarity index 92% rename from src/main/java/com/alist/api/modules/file/dto/FileUploadDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileUploadDto.java index f263654..c7b8518 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileUploadDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileUploadItemDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadItemDto.java similarity index 91% rename from src/main/java/com/alist/api/modules/file/dto/FileUploadItemDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileUploadItemDto.java index ea6c8fe..24f8876 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileUploadItemDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadItemDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/dto/FileUploadMetaDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadMetaDto.java similarity index 86% rename from src/main/java/com/alist/api/modules/file/dto/FileUploadMetaDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/FileUploadMetaDto.java index 750d7a8..ea0c886 100644 --- a/src/main/java/com/alist/api/modules/file/dto/FileUploadMetaDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/FileUploadMetaDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/TusHookDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/TusHookDto.java similarity index 88% rename from src/main/java/com/alist/api/modules/file/dto/TusHookDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/TusHookDto.java index 3521d6b..e5f4369 100644 --- a/src/main/java/com/alist/api/modules/file/dto/TusHookDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/TusHookDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/UploadCancelDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/UploadCancelDto.java similarity index 83% rename from src/main/java/com/alist/api/modules/file/dto/UploadCancelDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/UploadCancelDto.java index adace4b..dcf6dc6 100644 --- a/src/main/java/com/alist/api/modules/file/dto/UploadCancelDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/UploadCancelDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/UploadStatusDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/UploadStatusDto.java similarity index 87% rename from src/main/java/com/alist/api/modules/file/dto/UploadStatusDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/UploadStatusDto.java index 3eed6cf..c4a9540 100644 --- a/src/main/java/com/alist/api/modules/file/dto/UploadStatusDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/UploadStatusDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/dto/UploadTokenDto.java b/src/main/java/com/alist/api/modules/tusFile/dto/UploadTokenDto.java similarity index 91% rename from src/main/java/com/alist/api/modules/file/dto/UploadTokenDto.java rename to src/main/java/com/alist/api/modules/tusFile/dto/UploadTokenDto.java index e1a71c8..2eba098 100644 --- a/src/main/java/com/alist/api/modules/file/dto/UploadTokenDto.java +++ b/src/main/java/com/alist/api/modules/tusFile/dto/UploadTokenDto.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.dto; +package com.alist.api.modules.tusFile.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/form/FileDeleteForm.java b/src/main/java/com/alist/api/modules/tusFile/form/FileDeleteForm.java similarity index 78% rename from src/main/java/com/alist/api/modules/file/form/FileDeleteForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/FileDeleteForm.java index 9c90f7e..8b7ea5e 100644 --- a/src/main/java/com/alist/api/modules/file/form/FileDeleteForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/FileDeleteForm.java @@ -1,6 +1,6 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; -import com.alist.api.modules.file.dto.FileDeleteDto; +import com.alist.api.modules.tusFile.dto.FileDeleteDto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/form/FileUploadForm.java b/src/main/java/com/alist/api/modules/tusFile/form/FileUploadForm.java similarity index 89% rename from src/main/java/com/alist/api/modules/file/form/FileUploadForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/FileUploadForm.java index 3c5103b..ea02521 100644 --- a/src/main/java/com/alist/api/modules/file/form/FileUploadForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/FileUploadForm.java @@ -1,7 +1,7 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; -import com.alist.api.modules.file.dto.FileUploadDto; -import com.alist.api.modules.file.dto.FileUploadItemDto; +import com.alist.api.modules.tusFile.dto.FileUploadDto; +import com.alist.api.modules.tusFile.dto.FileUploadItemDto; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; diff --git a/src/main/java/com/alist/api/modules/file/form/FileUploadItemForm.java b/src/main/java/com/alist/api/modules/tusFile/form/FileUploadItemForm.java similarity index 89% rename from src/main/java/com/alist/api/modules/file/form/FileUploadItemForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/FileUploadItemForm.java index 4f5a804..84d1b19 100644 --- a/src/main/java/com/alist/api/modules/file/form/FileUploadItemForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/FileUploadItemForm.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/alist/api/modules/file/form/TusHookEventForm.java b/src/main/java/com/alist/api/modules/tusFile/form/TusHookEventForm.java similarity index 88% rename from src/main/java/com/alist/api/modules/file/form/TusHookEventForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/TusHookEventForm.java index b354c95..f096776 100644 --- a/src/main/java/com/alist/api/modules/file/form/TusHookEventForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/TusHookEventForm.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/alist/api/modules/file/form/TusHookForm.java b/src/main/java/com/alist/api/modules/tusFile/form/TusHookForm.java similarity index 92% rename from src/main/java/com/alist/api/modules/file/form/TusHookForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/TusHookForm.java index 76df398..2921e50 100644 --- a/src/main/java/com/alist/api/modules/file/form/TusHookForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/TusHookForm.java @@ -1,6 +1,6 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; -import com.alist.api.modules.file.dto.TusHookDto; +import com.alist.api.modules.tusFile.dto.TusHookDto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/form/TusHookUploadForm.java b/src/main/java/com/alist/api/modules/tusFile/form/TusHookUploadForm.java similarity index 91% rename from src/main/java/com/alist/api/modules/file/form/TusHookUploadForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/TusHookUploadForm.java index 9184784..3124290 100644 --- a/src/main/java/com/alist/api/modules/file/form/TusHookUploadForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/TusHookUploadForm.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/alist/api/modules/file/form/UploadCancelForm.java b/src/main/java/com/alist/api/modules/tusFile/form/UploadCancelForm.java similarity index 80% rename from src/main/java/com/alist/api/modules/file/form/UploadCancelForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/UploadCancelForm.java index 2fa491a..a47ddbd 100644 --- a/src/main/java/com/alist/api/modules/file/form/UploadCancelForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/UploadCancelForm.java @@ -1,4 +1,4 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; import jakarta.validation.constraints.NotBlank; import lombok.Getter; diff --git a/src/main/java/com/alist/api/modules/file/form/UploadStatusForm.java b/src/main/java/com/alist/api/modules/tusFile/form/UploadStatusForm.java similarity index 80% rename from src/main/java/com/alist/api/modules/file/form/UploadStatusForm.java rename to src/main/java/com/alist/api/modules/tusFile/form/UploadStatusForm.java index 6cf8177..17f1836 100644 --- a/src/main/java/com/alist/api/modules/file/form/UploadStatusForm.java +++ b/src/main/java/com/alist/api/modules/tusFile/form/UploadStatusForm.java @@ -1,6 +1,6 @@ -package com.alist.api.modules.file.form; +package com.alist.api.modules.tusFile.form; -import com.alist.api.modules.file.dto.UploadStatusDto; +import com.alist.api.modules.tusFile.dto.UploadStatusDto; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/alist/api/modules/file/mapper/FileMapper.java b/src/main/java/com/alist/api/modules/tusFile/mapper/FileMapper.java similarity index 94% rename from src/main/java/com/alist/api/modules/file/mapper/FileMapper.java rename to src/main/java/com/alist/api/modules/tusFile/mapper/FileMapper.java index 68eb7a2..62dd729 100644 --- a/src/main/java/com/alist/api/modules/file/mapper/FileMapper.java +++ b/src/main/java/com/alist/api/modules/tusFile/mapper/FileMapper.java @@ -1,6 +1,6 @@ -package com.alist.api.modules.file.mapper; +package com.alist.api.modules.tusFile.mapper; -import com.alist.api.modules.file.dto.*; +import com.alist.api.modules.tusFile.dto.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/alist/api/modules/file/service/FileService.java b/src/main/java/com/alist/api/modules/tusFile/service/FileService.java similarity index 99% rename from src/main/java/com/alist/api/modules/file/service/FileService.java rename to src/main/java/com/alist/api/modules/tusFile/service/FileService.java index 86cdea1..ffcccc0 100644 --- a/src/main/java/com/alist/api/modules/file/service/FileService.java +++ b/src/main/java/com/alist/api/modules/tusFile/service/FileService.java @@ -1,9 +1,9 @@ -package com.alist.api.modules.file.service; +package com.alist.api.modules.tusFile.service; import com.alist.api.common.utils.SecurityUtil; import com.alist.api.config.jwt.JwtTokenProvider; -import com.alist.api.modules.file.dto.*; -import com.alist.api.modules.file.mapper.FileMapper; +import com.alist.api.modules.tusFile.dto.*; +import com.alist.api.modules.tusFile.mapper.FileMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.HashOperations; diff --git a/src/main/resources/mapper/auth/LoginMapper.xml b/src/main/resources/mapper/auth/LoginMapper.xml index 5590cf4..1e5b193 100644 --- a/src/main/resources/mapper/auth/LoginMapper.xml +++ b/src/main/resources/mapper/auth/LoginMapper.xml @@ -13,12 +13,15 @@ - /*FileMapper.selectFileUploadMetaByFileUuid*/ SELECT FILE_UUID, ORIGIN_NAME, SIZE_BYTES, CONTENT_TYPE, TUS_UPLOAD_ID, STATUS FROM ALISTLMS.FILE_DETAIL @@ -186,7 +186,7 @@ AND LFD.STATUS IN (0,1,2) - /*FileMapper.selectUploadProgressByFileUuid*/ SELECT LFD.FILE_UUID , COALESCE(LFD.UPLOADED_BYTES, 0) AS UPLOADED_BYTES @@ -200,7 +200,7 @@ LIMIT 1 - /*FileMapper.selectMoveTaskByFileUuid*/ SELECT LFD.FILE_DETAIL_IDX , LFD.FILE_MASTER_IDX @@ -226,7 +226,7 @@ LIMIT 1 - /*FileMapper.selectFileDownloadListByFileMasterIdx*/ SELECT LFD.FILE_DETAIL_IDX , LFD.FILE_MASTER_IDX @@ -248,7 +248,7 @@ ORDER BY LFD.FILE_SEQ ASC, LFD.FILE_DETAIL_IDX ASC - /*FileMapper.selectFileDetailByFileUuid*/ SELECT LFD.FILE_DETAIL_IDX , LFD.FILE_MASTER_IDX @@ -272,7 +272,7 @@ LIMIT 1 - + /*FileMapper.updateFileMoveSuccess*/ UPDATE ALISTLMS.FILE_DETAIL SET SAVE_NAME = #{saveName} @@ -288,7 +288,7 @@ AND DEL_YN = 'N' - + /*FileMapper.updateFileMovePendingByFileUuid*/ UPDATE ALISTLMS.FILE_DETAIL SET MOVE_YN = 'N'