增加定时清理回收站文件

2026-04-03 22:27:43 +08:00
parent d47c60a5e0
commit 97f1482497
18 changed files with 220 additions and 59 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
        <outputRelativeToContentRoot value="true" />
+        <module name="system-pro" />
        <module name="file-system-backend" />
      </profile>
    </annotationProcessing>
@@ -14,6 +15,7 @@
  <component name="JavacSettings">
    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
      <module name="file-system-backend" options="-parameters" />
+      <module name="system-pro" options="-parameters" />
    </option>
  </component>
 </project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,13 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="91" name="Java" />
+      </Languages>
+    </inspection_tool>
+    <inspection_tool class="ExtractMethodRecommender" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="minLength" value="923" />
+    </inspection_tool>
+  </profile>
+</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="java-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="JDK17" project-jdk-type="JavaSDK" />
 </project>
--- a/src/main/java/com/filesystem/FileSystemApplication.java
+++ b/src/main/java/com/filesystem/FileSystemApplication.java
@@ -3,9 +3,11 @@ package com.filesystem;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;

@SpringBootApplication
@MapperScan("com.filesystem.mapper")
+@EnableScheduling
 public class FileSystemApplication {
    
    public static void main(String[] args) {
--- a/src/main/java/com/filesystem/config/SecurityConfig.java
+++ b/src/main/java/com/filesystem/config/SecurityConfig.java
@@ -47,6 +47,7 @@ public class SecurityConfig {
                // API 公开接口
                .requestMatchers("/api/auth/login", "/api/auth/register", "/api/auth/logout").permitAll()
                .requestMatchers("/api/files/test").permitAll()
+                .requestMatchers("/api/users/config").permitAll()
                // WebSocket
                .requestMatchers("/ws/**").permitAll()
                // 静态资源
--- a/src/main/java/com/filesystem/controller/AuthController.java
+++ b/src/main/java/com/filesystem/controller/AuthController.java
@@ -29,7 +29,7 @@ public class AuthController {

            // 精确重算存储空间
            long storageUsed = userService.recalculateStorage(user.getId());
-            long storageLimit = user.getStorageLimit() != null ? user.getStorageLimit() : 20L * 1024 * 1024 * 1024;
+            long storageLimit = user.getStorageLimit();

            Map<String, Object> userData = new HashMap<>();
            userData.put("id", user.getId());
@@ -91,19 +91,18 @@ public class AuthController {

        // 精确重算存储空间
        long storageUsed = userService.recalculateStorage(user.getId());
-        long storageLimit = user.getStorageLimit() != null ? user.getStorageLimit() : 20L * 1024 * 1024 * 1024;
+        long storageLimit = user.getStorageLimit();

        Map<String, Object> userData = new HashMap<>();
        userData.put("id", user.getId());
        userData.put("username", user.getUsername());
-        userData.put("nickname", user.getNickname() != null ? user.getNickname() : "");
-        userData.put("signature", user.getSignature() != null ? user.getSignature() : "");
-        userData.put("avatar", user.getAvatar() != null ? user.getAvatar() : "");
-        userData.put("email", user.getEmail() != null ? user.getEmail() : "");
-        userData.put("phone", user.getPhone() != null ? user.getPhone() : "");
+        userData.put("nickname", user.getNickname());
+        userData.put("signature", user.getSignature());
+        userData.put("avatar", user.getAvatar());
+        userData.put("email", user.getEmail());
+        userData.put("phone", user.getPhone());
        userData.put("storageUsed", storageUsed);
        userData.put("storageLimit", storageLimit);
-        
        Map<String, Object> body = new HashMap<>();
        body.put("data", userData);

--- a/src/main/java/com/filesystem/controller/UserController.java
+++ b/src/main/java/com/filesystem/controller/UserController.java
@@ -29,6 +29,22 @@ public class UserController {
    @Value("${file.storage.path:./uploads}")
    private String storagePath;
    
+    @Value("${file.user.storage-limit-gb:50}")
+    private int storageLimitGb;
+    
+    /**
+     * 获取系统配置（存储配额等）
+     */
+    @GetMapping("/config")
+    public ResponseEntity<?> getSystemConfig() {
+        return ResponseEntity.ok(Map.of(
+            "data", Map.of(
+                "storageLimitGb", storageLimitGb,
+                "storageLimitBytes", (long) storageLimitGb * 1024 * 1024 * 1024
+            )
+        ));
+    }
+    
    /**
     * 获取所有可用用户（用于文件共享等场景）
     */
@@ -41,7 +57,7 @@ public class UserController {
                Map<String, Object> m = new java.util.HashMap<>();
                m.put("id", u.getId());
                m.put("username", u.getUsername());
-                m.put("nickname", u.getNickname() != null ? u.getNickname() : u.getUsername());
+                m.put("nickname", u.getNickname());
                m.put("avatar", u.getAvatar());
                m.put("signature", u.getSignature());
                return m;
--- a/src/main/java/com/filesystem/service/FileService.java
+++ b/src/main/java/com/filesystem/service/FileService.java
@@ -714,4 +714,49 @@ public class FileService {
        }
        return tree;
    }
+    
+    /**
+     * 删除回收站中超过指定天数的文件
+     * @param retentionDays 保留天数
+     * @return 删除的文件数量
+     */
+    @Transactional
+    public int deleteExpiredTrashFiles(int retentionDays) {
+        LocalDateTime cutoffDate = LocalDateTime.now().minusDays(retentionDays);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        
+        // 查询所有在回收站且超过保留天数的文件
+        List<FileEntity> expiredFiles = fileMapper.selectList(
+            new LambdaQueryWrapper<FileEntity>()
+                .eq(FileEntity::getIsDeleted, 1)
+                .isNotNull(FileEntity::getDeletedAt)
+        );
+        
+        int deletedCount = 0;
+        for (FileEntity file : expiredFiles) {
+            try {
+                LocalDateTime deletedAt = LocalDateTime.parse(file.getDeletedAt(), formatter);
+                if (deletedAt.isBefore(cutoffDate)) {
+                    // 彻底删除
+                    if (file.getPath() != null && !file.getPath().isEmpty()) {
+                        try {
+                            Path filePath = Paths.get(storagePath).toAbsolutePath().resolve("files").resolve(file.getPath());
+                            Files.deleteIfExists(filePath);
+                        } catch (IOException e) {
+                            // ignore
+                        }
+                        if (file.getSize() != null && file.getSize() > 0) {
+                            userService.decreaseStorage(file.getUserId(), file.getSize());
+                        }
+                    }
+                    fileMapper.deleteById(file.getId());
+                    deletedCount++;
+                }
+            } catch (Exception e) {
+                // 日期解析失败，跳过
+            }
+        }
+        
+        return deletedCount;
+    }
 }
--- a/src/main/java/com/filesystem/service/UserService.java
+++ b/src/main/java/com/filesystem/service/UserService.java
@@ -7,6 +7,7 @@ import com.filesystem.mapper.FileMapper;
 import com.filesystem.mapper.UserMapper;
 import com.filesystem.security.JwtUtil;
 import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;

@@ -27,6 +28,9 @@ public class UserService {
    @Resource
    private BCryptPasswordEncoder passwordEncoder;
    
+    @Value("${file.user.storage-limit-gb:50}")
+    private int storageLimitGb;
+    
    public User findByUsername(String username) {
        return userMapper.selectOne(
            new LambdaQueryWrapper<User>().eq(User::getUsername, username)
@@ -59,7 +63,7 @@ public class UserService {
        user.setNickname(nickname);
        user.setStatus(1);
        user.setStorageUsed(0L);
-        user.setStorageLimit(20L * 1024 * 1024 * 1024); // 20GB
+        user.setStorageLimit((long) storageLimitGb * 1024 * 1024 * 1024);
        userMapper.insert(user);
        return user;
    }
@@ -84,9 +88,9 @@ public class UserService {
        User user = userMapper.selectById(userId);
        if (user != null) {
            user.setStorageUsed(total);
-            // 同步存储上限为 20GB（兼容老用户）
-            if (user.getStorageLimit() == null || user.getStorageLimit() < 20L * 1024 * 1024 * 1024) {
-                user.setStorageLimit(20L * 1024 * 1024 * 1024);
+            // 同步存储上限（兼容老用户）
+            if (user.getStorageLimit() == null || user.getStorageLimit() < (long) storageLimitGb * 1024 * 1024 * 1024) {
+                user.setStorageLimit((long) storageLimitGb * 1024 * 1024 * 1024);
            }
            userMapper.updateById(user);
        }
--- a/src/main/java/com/filesystem/task/TrashCleanupTask.java
+++ b/src/main/java/com/filesystem/task/TrashCleanupTask.java
@@ -0,0 +1,27 @@
+package com.filesystem.task;
+
+import com.filesystem.service.FileService;
+import jakarta.annotation.Resource;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TrashCleanupTask {
+    
+    @Resource
+    private FileService fileService;
+    
+    @Value("${file.trash.retention-days:30}")
+    private int retentionDays;
+    
+    /**
+     * 每天凌晨2点执行清理回收站任务
+     */
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void cleanupExpiredTrashFiles() {
+        System.out.println("[TrashCleanupTask] 开始清理回收站过期文件，保留天数: " + retentionDays);
+        int deletedCount = fileService.deleteExpiredTrashFiles(retentionDays);
+        System.out.println("[TrashCleanupTask] 清理完成，共删除 " + deletedCount + " 个文件");
+    }
+}
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,24 +3,24 @@ server:

 spring:
  datasource:
-    url: jdbc:mysql://127.0.0.1:13306/chat_app?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&createDatabaseIfNotExist=true
-    username: root
-    password: root_dream
+    url: jdbc:mysql://192.168.31.182:13306/system?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&createDatabaseIfNotExist=true
+    username: dream
+    password: info_dream
    driver-class-name: com.mysql.cj.jdbc.Driver

  data:
    redis:
-      host: 127.0.0.1
-      port: 6379
-      database: 0
+      host: 192.168.31.194
+      port: 16379
+      database: 9
      timeout: 10000ms
      password: admin
  
  servlet:
    multipart:
      enabled: true
-      max-file-size: 1024MB
-      max-request-size: 2048MB
+      max-file-size: 512MB
+      max-request-size: 1024MB
      file-size-threshold: 0

 mybatis-plus:
@@ -36,6 +36,10 @@ mybatis-plus:
 file:
  storage:
    path: /ogsapp/uploads
+  user:
+    storage-limit-gb: 200
+  trash:
+    retention-days: 30

 jwt:
  secret: mySecretKeyForJWTTokenGenerationThatIsLongEnough256BitsForHS256Algorithm
--- a/web-vue/package-lock.json
+++ b/web-vue/package-lock.json
@@ -886,7 +886,6 @@
      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.12.tgz",
      "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@types/lodash": "*"
      }
@@ -1422,15 +1421,13 @@
      "version": "4.17.23",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash-es": {
      "version": "4.17.23",
      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
    },
    "node_modules/lodash-unified": {
      "version": "1.0.3",
@@ -1637,7 +1634,6 @@
      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "esbuild": "^0.21.3",
        "postcss": "^8.4.43",
@@ -1697,7 +1693,6 @@
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.31.tgz",
      "integrity": "sha512-iV/sU9SzOlmA/0tygSmjkEN6Jbs3nPoIPFhCMLD2STrjgOU8DX7ZtzMhg4ahVwf5Rp9KoFzcXeB1ZrVbLBp5/Q==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@vue/compiler-dom": "3.5.31",
        "@vue/compiler-sfc": "3.5.31",
--- a/web-vue/src/api/request.js
+++ b/web-vue/src/api/request.js
@@ -2,7 +2,7 @@

 const request = axios.create({
  baseURL: '/api',
-  timeout: 300000
+  timeout: 0  // 不限制超时，大文件上传需要
 })

 request.interceptors.request.use(
--- a/web-vue/src/api/user.js
+++ b/web-vue/src/api/user.js
@@ -1,3 +1,5 @@
 import request from './request'

 export const getUsers = () => request.get('/users')
+
+export const getSystemConfig = () => request.get('/users/config')
--- a/web-vue/src/components/UploadDialog.vue
+++ b/web-vue/src/components/UploadDialog.vue
@@ -44,6 +44,7 @@
      <div class="file-list-footer">
        <span>共 {{ fileList.length }} 个文件，总大小：{{ formatSize(totalSize) }}</span>
        <span v-if="isOverLimit" class="warning-text">（超出剩余空间）</span>
+        <span v-if="isOverSizeLimit" class="warning-text">（单次上传不能超过500MB）</span>
      </div>
    </div>
    
@@ -52,7 +53,7 @@
        <el-icon><Close /></el-icon>
        <span style="margin-left: 4px">取消</span>
      </el-button>
-      <el-button type="primary" @click="handleUpload" :loading="uploading" :disabled="isOverLimit">
+      <el-button type="primary" @click="handleUpload" :loading="uploading" :disabled="isOverLimit || isOverSizeLimit">
        <el-icon><Upload /></el-icon>
        <span style="margin-left: 4px">开始上传</span>
      </el-button>
@@ -90,6 +91,12 @@ const isOverLimit = computed(() => {
  return totalSize.value > props.remainingStorage
 })

+// 是否超过500MB限制
+const MAX_UPLOAD_SIZE = 500 * 1024 * 1024 // 500MB
+const isOverSizeLimit = computed(() => {
+  return totalSize.value > MAX_UPLOAD_SIZE
+})
+
 const handleChange = (file, list) => {
  if (list.length > 10) {
    ElMessage.warning('最多一次上传10个文件')
@@ -124,6 +131,11 @@ const handleUpload = () => {
    return
  }
  
+  if (isOverSizeLimit.value) {
+    ElMessage.warning('单次上传总大小不能超过500MB')
+    return
+  }
+  
  emit('upload', fileList.value.map(f => f.raw))
 }

--- a/web-vue/src/store/user.js
+++ b/web-vue/src/store/user.js
@@ -1,5 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
+import { getSystemConfig } from '@/api/user'

 export const useUserStore = defineStore('user', () => {
  const token = ref(localStorage.getItem('token') || '')
@@ -11,7 +12,7 @@ export const useUserStore = defineStore('user', () => {
  const phone = ref(localStorage.getItem('phone') || '')
  const email = ref(localStorage.getItem('email') || '')
  const storageUsed = ref(Number(localStorage.getItem('storageUsed')) || 0)
-  const storageLimit = ref(Number(localStorage.getItem('storageLimit')) || 20 * 1024 * 1024 * 1024)
+  const storageLimit = ref(Number(localStorage.getItem('storageLimit')) || 0)

  const isLoggedIn = computed(() => !!token.value)

@@ -54,11 +55,23 @@ export const useUserStore = defineStore('user', () => {
      localStorage.setItem('storageUsed', storageUsed.value)
    }
    if (user.storageLimit !== undefined) {
-      storageLimit.value = Number(user.storageLimit) || 20 * 1024 * 1024 * 1024
+      storageLimit.value = Number(user.storageLimit) || 0
      localStorage.setItem('storageLimit', storageLimit.value)
    }
  }

+  const fetchStorageLimit = async () => {
+    try {
+      const res = await getSystemConfig()
+      if (res.data?.storageLimitBytes) {
+        storageLimit.value = res.data.storageLimitBytes
+        localStorage.setItem('storageLimit', storageLimit.value)
+      }
+    } catch (e) {
+      console.error('获取存储配额失败', e)
+    }
+  }
+
  const logout = () => {
    token.value = ''
    username.value = ''
@@ -69,7 +82,7 @@ export const useUserStore = defineStore('user', () => {
    phone.value = ''
    email.value = ''
    storageUsed.value = 0
-    storageLimit.value = 20 * 1024 * 1024 * 1024
+    storageLimit.value = 0
    localStorage.removeItem('token')
    localStorage.removeItem('username')
    localStorage.removeItem('userId')
@@ -82,5 +95,5 @@ export const useUserStore = defineStore('user', () => {
    localStorage.removeItem('storageLimit')
  }

-  return { token, username, userId, nickname, signature, avatar, phone, email, storageUsed, storageLimit, isLoggedIn, setToken, setUser, logout }
+  return { token, username, userId, nickname, signature, avatar, phone, email, storageUsed, storageLimit, isLoggedIn, setToken, setUser, fetchStorageLimit, logout }
 })
--- a/web-vue/src/views/files/index.vue
+++ b/web-vue/src/views/files/index.vue
@@ -225,7 +225,7 @@ const movableFolders = ref([])

 // 存储 —— 真实数据
 const storagePercent = computed(() => {
-  const limit = userStore.storageLimit || 20 * 1024 * 1024 * 1024
+  const limit = userStore.storageLimit || 0
  const used = userStore.storageUsed || 0
  if (limit <= 0) return 0
  return Math.min(Math.round((used / limit) * 100), 100)
@@ -237,13 +237,14 @@ const usedStorage = computed(() => {
    : (used / (1024 * 1024)).toFixed(2) + ' MB'
 })
 const totalStorage = computed(() => {
-  const limit = userStore.storageLimit || 20 * 1024 * 1024 * 1024
+  const limit = userStore.storageLimit || 0
+  if (limit <= 0) return '—'
  return (limit / (1024 * 1024 * 1024)).toFixed(0) + ' GB'
 })

 // 剩余存储空间（字节）
 const remainingStorage = computed(() => {
-  const limit = userStore.storageLimit || 20 * 1024 * 1024 * 1024
+  const limit = userStore.storageLimit || 0
  const used = userStore.storageUsed || 0
  return Math.max(0, limit - used)
 })
@@ -251,12 +252,14 @@ const remainingStorage = computed(() => {
 // 刷新存储数据（从后端精确重算）
 const refreshStorage = async () => {
  try {
+    // 先获取系统配置（存储配额）
+    await userStore.fetchStorageLimit()
+    // 再获取用户当前用量
    const res = await getCurrentUser()
    const data = res.data
    if (data) {
      userStore.setUser({
-        storageUsed: data.storageUsed ?? 0,
-        storageLimit: data.storageLimit ?? 20 * 1024 * 1024 * 1024
+        storageUsed: data.storageUsed ?? 0
      })
    }
  } catch (e) {
--- a/web-vue/src/views/login/index.vue
+++ b/web-vue/src/views/login/index.vue
@@ -17,7 +17,7 @@
        <div class="feature-list">
          <div class="feature-item">
            <el-icon><Check /></el-icon>
-            <span>20GB 超大存储空间</span>
+            <span>{{ storageLimitText }} 存储空间</span>
          </div>
          <div class="feature-item">
            <el-icon><Check /></el-icon>
@@ -58,17 +58,40 @@
 </template>

 <script setup>
-import { ref } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { FolderOpened, Check } from '@element-plus/icons-vue'
 import LoginForm from './LoginForm.vue'
 import RegisterForm from './RegisterForm.vue'
 import { useUserStore } from '@/store/user'
+import { getSystemConfig } from '@/api/user'

 const router = useRouter()
 const userStore = useUserStore()

 const isLogin = ref(true)
+const storageLimitGb = ref(50)
+
+const storageLimitText = computed(() => {
+  return storageLimitGb.value >= 1024 
+    ? (storageLimitGb.value / 1024).toFixed(1) + 'TB'
+    : storageLimitGb.value + 'GB'
+})
+
+const fetchConfig = async () => {
+  try {
+    const res = await getSystemConfig()
+    if (res.data?.storageLimitGb) {
+      storageLimitGb.value = res.data.storageLimitGb
+    }
+  } catch (e) {
+    // 使用默认值
+  }
+}
+
+onMounted(() => {
+  fetchConfig()
+})

 const toggleMode = () => {
  isLogin.value = !isLogin.value