[위치이동] file 위치이동

src/main/java/com/alist/api/modules/file/FileController.java

@@ -1,13 +1,13 @@
-package com.alist.api.common.modules.file;
+package com.alist.api.modules.file;
 
-import com.alist.api.common.modules.file.dto.*;
-import com.alist.api.common.modules.file.form.FileUploadForm;
-import com.alist.api.common.modules.file.form.TusHookForm;
-import com.alist.api.common.modules.file.form.UploadCancelForm;
-import com.alist.api.common.modules.file.form.UploadStatusForm;
+import com.alist.api.modules.file.dto.*;
+import com.alist.api.modules.file.form.FileUploadForm;
+import com.alist.api.modules.file.form.TusHookForm;
+import com.alist.api.modules.file.form.UploadCancelForm;
+import com.alist.api.modules.file.form.UploadStatusForm;
 import com.alist.api.common.response.ApiResponse;
 import com.alist.api.common.response.ApiResponseCode;
-import com.alist.api.common.modules.file.service.FileService;
+import com.alist.api.modules.file.service.FileService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -20,7 +20,6 @@ import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/com/alist/api/modules/file/dto/FileDownloadDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/dto/FileDownloadItemDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/FileDownloadListDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/dto/FileMoveTaskDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/FileUploadDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/dto/FileUploadItemDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/dto/FileUploadMetaDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/TusHookDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/UploadCancelDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/UploadStatusDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/dto/UploadTokenDto.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.dto;
+package com.alist.api.modules.file.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/form/FileUploadForm.java

@@ -1,7 +1,7 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
-import com.alist.api.common.modules.file.dto.FileUploadDto;
-import com.alist.api.common.modules.file.dto.FileUploadItemDto;
+import com.alist.api.modules.file.dto.FileUploadDto;
+import com.alist.api.modules.file.dto.FileUploadItemDto;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;

src/main/java/com/alist/api/modules/file/form/FileUploadItemForm.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/com/alist/api/modules/file/form/TusHookEventForm.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/alist/api/modules/file/form/TusHookForm.java

@@ -1,6 +1,6 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
-import com.alist.api.common.modules.file.dto.TusHookDto;
+import com.alist.api.modules.file.dto.TusHookDto;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/form/TusHookUploadForm.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;

src/main/java/com/alist/api/modules/file/form/UploadCancelForm.java

@@ -1,4 +1,4 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;

src/main/java/com/alist/api/modules/file/form/UploadStatusForm.java

@@ -1,6 +1,6 @@
-package com.alist.api.common.modules.file.form;
+package com.alist.api.modules.file.form;
 
-import com.alist.api.common.modules.file.dto.UploadStatusDto;
+import com.alist.api.modules.file.dto.UploadStatusDto;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/alist/api/modules/file/mapper/FileMapper.java

@@ -1,6 +1,6 @@
-package com.alist.api.common.modules.file.mapper;
+package com.alist.api.modules.file.mapper;
 
-import com.alist.api.common.modules.file.dto.*;
+import com.alist.api.modules.file.dto.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/alist/api/modules/file/service/FileService.java

@@ -1,9 +1,8 @@
-package com.alist.api.common.modules.file.service;
+package com.alist.api.modules.file.service;
 
-import com.alist.api.common.modules.file.dto.*;
-import com.alist.api.common.modules.file.mapper.FileMapper;
+import com.alist.api.modules.file.dto.*;
+import com.alist.api.modules.file.mapper.FileMapper;
 import com.alist.api.config.jwt.JwtTokenProvider;
-import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.HashOperations;

src/main/resources/application.yaml

@@ -28,4 +28,7 @@ management:
         include: health,info,metrics
   endpoint:
     health:
-      show-details: always
+      show-details: always
+  health:
+    db:
+      enabled: false

src/main/resources/mapper/file/FileMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.alist.api.common.modules.file.mapper.FileMapper">
+<mapper namespace="com.alist.api.modules.file.mapper.FileMapper">
 
     <insert id="insertFileMasterInit" useGeneratedKeys="true" keyProperty="fileMasterIdx">
         /*FileMapper.insertFileMasterInit*/
@@ -115,7 +115,7 @@
                             END
             , LFM.UPDATE_DATE = NOW()
     </update>
-    <update id="updateTusUploadIdIfNull" parameterType="com.alist.api.common.modules.file.dto.FileUploadMetaDto">
+    <update id="updateTusUploadIdIfNull" parameterType="com.alist.api.modules.file.dto.FileUploadMetaDto">
         /*FileMapper.updateTusUploadIdIfNull*/
         UPDATE ALISTLMS.FILE_DETAIL
         SET TUS_UPLOAD_ID = #{tusUploadId}
@@ -165,7 +165,7 @@
             )
     </select>
 
-    <select id="selectFileUploadMetaByFileUuid" resultType="com.alist.api.common.modules.file.dto.FileUploadMetaDto">
+    <select id="selectFileUploadMetaByFileUuid" resultType="com.alist.api.modules.file.dto.FileUploadMetaDto">
         /*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)
     </select>
 
-    <select id="selectUploadProgressByFileUuid" resultType="com.alist.api.common.modules.file.dto.UploadCancelDto">
+    <select id="selectUploadProgressByFileUuid" resultType="com.alist.api.modules.file.dto.UploadCancelDto">
         /*FileMapper.selectUploadProgressByFileUuid*/
         SELECT LFD.FILE_UUID
             , COALESCE(LFD.UPLOADED_BYTES, 0) AS UPLOADED_BYTES
@@ -200,7 +200,7 @@
         LIMIT 1
     </select>
 
-    <select id="selectMoveTaskByFileUuid" resultType="com.alist.api.common.modules.file.dto.FileMoveTaskDto">
+    <select id="selectMoveTaskByFileUuid" resultType="com.alist.api.modules.file.dto.FileMoveTaskDto">
         /*FileMapper.selectMoveTaskByFileUuid*/
         SELECT LFD.FILE_DETAIL_IDX
             , LFD.FILE_MASTER_IDX
@@ -226,7 +226,7 @@
         LIMIT 1
     </select>
 
-    <select id="selectFileDownloadListByFileMasterIdx" resultType="com.alist.api.common.modules.file.dto.FileDownloadItemDto">
+    <select id="selectFileDownloadListByFileMasterIdx" resultType="com.alist.api.modules.file.dto.FileDownloadItemDto">
         /*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
     </select>
 
-    <select id="selectFileDetailByFileUuid" resultType="com.alist.api.common.modules.file.dto.FileDownloadDto">
+    <select id="selectFileDetailByFileUuid" resultType="com.alist.api.modules.file.dto.FileDownloadDto">
         /*FileMapper.selectFileDetailByFileUuid*/
         SELECT LFD.FILE_DETAIL_IDX
             , LFD.FILE_MASTER_IDX
@@ -272,7 +272,7 @@
         LIMIT 1
     </select>
 
-    <update id="updateFileMoveSuccess" parameterType="com.alist.api.common.modules.file.dto.FileMoveTaskDto">
+    <update id="updateFileMoveSuccess" parameterType="com.alist.api.modules.file.dto.FileMoveTaskDto">
         /*FileMapper.updateFileMoveSuccess*/
         UPDATE ALISTLMS.FILE_DETAIL
         SET SAVE_NAME = #{saveName}
@@ -288,7 +288,7 @@
             AND DEL_YN = 'N'
     </update>
 
-    <update id="updateFileMovePendingByFileUuid" parameterType="com.alist.api.common.modules.file.dto.FileMoveTaskDto">
+    <update id="updateFileMovePendingByFileUuid" parameterType="com.alist.api.modules.file.dto.FileMoveTaskDto">
         /*FileMapper.updateFileMovePendingByFileUuid*/
         UPDATE ALISTLMS.FILE_DETAIL
         SET MOVE_YN = 'N'