fix(media): clean decode task regularly

ProgramCX · ProgramCX · commit 18093043bf37 · 2026-02-16T21:21:10.000+08:00
diff --git a/src/main/java/cn/programcx/foxnaserver/api/media/CacheHLSCleanService.java b/src/main/java/cn/programcx/foxnaserver/api/media/CacheHLSCleanService.java
@@ -0,0 +1,57 @@
+package cn.programcx.foxnaserver.api.media;
+
+import cn.programcx.foxnaserver.entity.TranscodeJob;
+import cn.programcx.foxnaserver.service.media.TranscodeJobService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+
+@Service
+public class CacheHLSCleanService {
+
+    @Autowired
+    private TranscodeJobService transcodeJobService;
+
+    /**
+     * 检查任务是否过期，如果过期则删除任务记录和文件
+     *
+     * @param job 需要检验的任务
+     * @return 如果任务过期且清理成功则返回true，否则返回false
+     */
+    public boolean cleanIfExpired(TranscodeJob job) {
+        Long expireSecs = job.getExpireSecs();
+        LocalDateTime completedTime = job.getCompletedAt();
+        LocalDateTime updatedTime = job.getUpdatedAt();
+        LocalDateTime createTime = job.getCreatedAt();
+
+        if (completedTime != null) {
+            if (completedTime.isBefore(LocalDateTime.now().minusSeconds(expireSecs))) {
+                return cleanupJob(job);
+            }
+        } else if (updatedTime != null) {
+            if (updatedTime.isBefore(LocalDateTime.now().minusSeconds(expireSecs))) {
+                return  cleanupJob(job);
+            }
+        } else if (createTime != null) {
+            if (createTime.isBefore(LocalDateTime.now().minusSeconds(expireSecs))) {
+                return  cleanupJob(job);
+            }
+        }
+        return false;
+    }
+
+    public boolean cleanupJob(TranscodeJob job) {
+        if (job.getStatus().equals(TranscodeJob.Status.FAILED.name()) ||
+                job.getStatus().equals(TranscodeJob.Status.CANCELLED.name())) {
+            try {
+                transcodeJobService.cleanupJobFiles(job);
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        } else if (job.getStatus().equals(TranscodeJob.Status.PENDING.name())) {
+            return true;
+        }
+        return transcodeJobService.deleteJob(job.getJobId(), job.getCreatorId());
+    }
+}
diff --git a/src/main/java/cn/programcx/foxnaserver/api/media/MediaServiceController.java b/src/main/java/cn/programcx/foxnaserver/api/media/MediaServiceController.java
@@ -6,7 +6,6 @@
 import cn.programcx.foxnaserver.dto.media.MediaInfoDTO;
 import cn.programcx.foxnaserver.dto.media.SubtitleJobStatus;
 import cn.programcx.foxnaserver.dto.media.SubtitleTranscodeTask;
-import cn.programcx.foxnaserver.dto.media.TranscodeTask;
 import cn.programcx.foxnaserver.entity.TranscodeJob;
 import cn.programcx.foxnaserver.mapper.ResourceMapper;
 import cn.programcx.foxnaserver.service.media.DecodeMediaService;
@@ -32,7 +31,6 @@
 import org.springframework.web.bind.annotation.*;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDateTime;
@@ -46,7 +44,8 @@
 @Tag(name = "MediaServiceController", description = "提供流媒体相关的接口")
 public class MediaServiceController {
 
-    private final String tempDir = System.getProperty("java.io.tmpdir") +
+    private final String tempDir = System.getProperty("user.dir") +
+            File.separator + "temp" +
             File.separator + "foxnas" +
             File.separator + "transcode";
 
@@ -313,7 +312,7 @@ public ResponseEntity<Map<String, String>> submit(@RequestBody TranscodeRequest
             req.getAudioTrackIndex(),
             req.getSubtitleTrackIndex(),
             req.isImmediate(),
-            fingerprint
+            fingerprint, req.getExpireSecs()
         );
 
         boolean isReused = !job.getJobId().equals(req.getFingerprint()) && 
@@ -568,6 +567,7 @@ class TranscodeRequest {
     private int subtitleTrackIndex = -1;
     private boolean immediate = false; // true=立即观看（高优先级）
     private String fingerprint; // 可选，如果前端已计算指纹可直接传入
+    private Long expireSecs = 86400L; // 缓存过期时间，默认24小时
 }
 
 @Data
diff --git a/src/main/java/cn/programcx/foxnaserver/api/media/TranscodeJobController.java b/src/main/java/cn/programcx/foxnaserver/api/media/TranscodeJobController.java
@@ -74,7 +74,7 @@ public Result<TranscodeJob> createJob(@RequestBody CreateJobRequest request) {
                 request.getAudioTrackIndex(),
                 request.getSubtitleTrackIndex(),
                 request.isImmediate(),
-                fingerprint
+                fingerprint, request.getExpireSecs()
             );
             
             return Result.success(job);
@@ -337,6 +337,7 @@ public static class CreateJobRequest {
         private Integer subtitleTrackIndex = -1;
         private boolean immediate = false;
         private String fingerprint; // 可选
+        private Long expireSecs = 86400L; // 缓存过期时间，默认24小时
     }
 
     @Data
diff --git a/src/main/java/cn/programcx/foxnaserver/config/consumer/CleanupConsumer.java b/src/main/java/cn/programcx/foxnaserver/config/consumer/CleanupConsumer.java
@@ -1,13 +1,13 @@
-package cn.programcx.foxnaserver.config.oauth;
+package cn.programcx.foxnaserver.config.consumer;
 
 import cn.programcx.foxnaserver.dto.media.CleanupTask;
+import cn.programcx.foxnaserver.service.media.TranscodeJobService;
 import cn.programcx.foxnaserver.service.media.VideoFingerprintService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -20,6 +20,7 @@
 public class CleanupConsumer {
 
     private final VideoFingerprintService fingerprintService;
+    private final TranscodeJobService transcodeJobService;
 
     @RabbitListener(queues = "task.cleanup") // 延迟队列到期后路由到这里
     public void onCleanup(CleanupTask task) throws IOException {
diff --git a/src/main/java/cn/programcx/foxnaserver/config/consumer/DLQConsumer.java b/src/main/java/cn/programcx/foxnaserver/config/consumer/DLQConsumer.java
@@ -1,4 +1,4 @@
-package cn.programcx.foxnaserver.config.oauth;
+package cn.programcx.foxnaserver.config.consumer;
 
 import cn.programcx.foxnaserver.config.TranscodeRabbitMQConfig;
 import cn.programcx.foxnaserver.dto.media.JobStatus;
diff --git a/src/main/java/cn/programcx/foxnaserver/config/consumer/SubtitleTranscodeConsumer.java b/src/main/java/cn/programcx/foxnaserver/config/consumer/SubtitleTranscodeConsumer.java
@@ -1,4 +1,4 @@
-package cn.programcx.foxnaserver.config.oauth;
+package cn.programcx.foxnaserver.config.consumer;
 
 import cn.programcx.foxnaserver.config.TranscodeRabbitMQConfig;
 import cn.programcx.foxnaserver.dto.media.SubtitleJobStatus;
@@ -13,6 +13,7 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -32,7 +33,8 @@ public class SubtitleTranscodeConsumer {
     private final RedisTemplate<String, Object> redisTemplate;
     private final RabbitTemplate rabbitTemplate;
 
-    private static final String TEMP_DIR = System.getProperty("java.io.tmpdir") +
+    private static final String TEMP_DIR = System.getProperty("user.dir") +
+            File.separator + "temp" +
             java.io.File.separator + "foxnas" +
             java.io.File.separator + "transcode";
 
diff --git a/src/main/java/cn/programcx/foxnaserver/config/consumer/TranscodeConsumer.java b/src/main/java/cn/programcx/foxnaserver/config/consumer/TranscodeConsumer.java
@@ -1,4 +1,4 @@
-package cn.programcx.foxnaserver.config.oauth;
+package cn.programcx.foxnaserver.config.consumer;
 
 import cn.programcx.foxnaserver.config.TranscodeRabbitMQConfig;
 import cn.programcx.foxnaserver.dto.media.CleanupTask;
diff --git a/src/main/java/cn/programcx/foxnaserver/dto/media/FFmpegProcessManager.java b/src/main/java/cn/programcx/foxnaserver/dto/media/FFmpegProcessManager.java
@@ -18,7 +18,8 @@
 @Slf4j
 public class FFmpegProcessManager {
 
-    private final String tempDir = System.getProperty("java.io.tmpdir") +
+    private final String tempDir = System.getProperty("user.dir") +
+            File.separator + "temp" +
             File.separator + "foxnas" +
             File.separator + "transcode";
 
diff --git a/src/main/java/cn/programcx/foxnaserver/entity/TranscodeJob.java b/src/main/java/cn/programcx/foxnaserver/entity/TranscodeJob.java
@@ -129,6 +129,12 @@ public class TranscodeJob {
     @TableField("completed_at")
     private LocalDateTime completedAt;
 
+    /**
+     * 清理时间，单位秒，默认24小时
+     */
+    @TableField("expire_secs")
+    private Long expireSecs = 86400L; // 缓存过期时间，默认24小时
+
     /**
      * 任务状态枚举
      */
diff --git a/src/main/java/cn/programcx/foxnaserver/jobs/CleanHLSCacheJob.java b/src/main/java/cn/programcx/foxnaserver/jobs/CleanHLSCacheJob.java
@@ -0,0 +1,38 @@
+package cn.programcx.foxnaserver.jobs;
+
+
+import cn.programcx.foxnaserver.api.media.CacheHLSCleanService;
+import cn.programcx.foxnaserver.entity.TranscodeJob;
+import cn.programcx.foxnaserver.mapper.TranscodeJobMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Slf4j
+@Component
+public class CleanHLSCacheJob{
+
+    @Autowired
+    private CacheHLSCleanService cacheHLSCleanService;
+
+    @Autowired
+    private TranscodeJobMapper transcodeJobMapper;
+
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void scheduled()
+    {
+        log.info("正在清理过期任务...");
+        List<TranscodeJob> jobs = transcodeJobMapper.selectAllJob();
+
+        for(TranscodeJob job : jobs) {
+            if(cacheHLSCleanService.cleanIfExpired(job)) {
+               log.info("清理过期任务[{}], 任务路径: {}", job.getJobId(), job.getVideoPath());
+            }else{
+                log.info("任务[{}]未过期or清理失败, 任务路径: {}", job.getJobId(), job.getVideoPath());
+            }
+        }
+    }
+}
diff --git a/src/main/java/cn/programcx/foxnaserver/mapper/TranscodeJobMapper.java b/src/main/java/cn/programcx/foxnaserver/mapper/TranscodeJobMapper.java
@@ -17,6 +17,9 @@
 @Repository
 public interface TranscodeJobMapper extends BaseMapper<TranscodeJob> {
 
+    @Select("SELECT * FROM transcode_jobs")
+    List<TranscodeJob> selectAllJob();
+
     /**
      * 根据jobId查询任务
      */
diff --git a/src/main/java/cn/programcx/foxnaserver/security/OAuth2LoginSuccessHandler.java b/src/main/java/cn/programcx/foxnaserver/security/OAuth2LoginSuccessHandler.java
@@ -29,6 +29,7 @@
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Objects;
 
 @Slf4j
 @Component
@@ -89,7 +90,7 @@ boolean isBindRequest() {
     @Override
     public void onAuthenticationSuccess(HttpServletRequest request,
                                         HttpServletResponse response,
-                                        Authentication authentication) throws IOException, ServletException {
+                                        Authentication authentication) throws IOException {
 
         OAuth2AuthenticationToken auth = (OAuth2AuthenticationToken) authentication;
         String registrationId = auth.getAuthorizedClientRegistrationId();
@@ -189,15 +190,15 @@ private OAuthUserInfo extractOAuthUserInfo(OAuth2AuthenticationToken auth) {
     }
 
     private OAuthUserInfo extractGithubUserInfo(OAuth2User oAuth2User) {
-        String oauthId = oAuth2User.getAttribute("id").toString();
-        String username = oAuth2User.getAttribute("login").toString();
+        String oauthId = Objects.requireNonNull(oAuth2User.getAttribute("id")).toString();
+        String username = Objects.requireNonNull(oAuth2User.getAttribute("login")).toString();
         String email = getStringAttribute(oAuth2User, "email");
         return new OAuthUserInfo(oauthId, username, email);
     }
 
     private OAuthUserInfo extractQqUserInfo(OAuth2User oAuth2User) {
-        String oauthId = oAuth2User.getAttribute("openid").toString();
-        String username = oAuth2User.getAttribute("nickname").toString();
+        String oauthId = Objects.requireNonNull(oAuth2User.getAttribute("openid")).toString();
+        String username = Objects.requireNonNull(oAuth2User.getAttribute("nickname")).toString();
         String email = getStringAttribute(oAuth2User, "email");
         return new OAuthUserInfo(oauthId, username, email);
     }
@@ -286,7 +287,7 @@ private void handleBindToExistingUser(HttpServletResponse response,
     private void handleRegisterNewUser(HttpServletResponse response,
                                        String registrationId,
                                        OAuthUserInfo userInfo,
-                                       UserOAuth userOAuth) throws IOException {
+                                       UserOAuth userOAuth) {
         // 防止用户名冲突
         String baseUsername = userOAuthService.generateUsernameByOAuthProvider(registrationId, userInfo.username());
         String databaseUsername = generateUniqueUsername(baseUsername);
@@ -307,7 +308,7 @@ private void handleRegisterNewUser(HttpServletResponse response,
             String ticket = userOAuthService.generateActivateTicket();
             userOAuthService.saveTicketByProviderOAuthId(registrationId, userInfo.oauthId(), ticket);
             authenticationService.iniPermissionForNewUser(user);
-            response.sendRedirect(String.format("%s/oauth/activate?ticket=%s", frontendBaseUrl, ticket));
+            response.sendRedirect(String.format("%s/consumer/activate?ticket=%s", frontendBaseUrl, ticket));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -344,13 +345,13 @@ private void handleAbnormalUserState(HttpServletResponse response,
                                          String oauthId,
                                          User user) throws IOException {
         if ("disabled".equals(user.getState())) {
-            response.sendRedirect(String.format("%s/oauth/error?message=%s",
+            response.sendRedirect(String.format("%s/consumer/error?message=%s",
                     frontendBaseUrl, URLEncoder.encode("该用户已经被禁止登录！", StandardCharsets.UTF_8)));
         } else if ("pending".equals(user.getState())) {
             try {
                 String ticket = userOAuthService.generateActivateTicket();
                 userOAuthService.saveTicketByProviderOAuthId(registrationId, oauthId, ticket);
-                response.sendRedirect(String.format("%s/oauth/activate?ticket=%s", frontendBaseUrl, ticket));
+                response.sendRedirect(String.format("%s/consumer/activate?ticket=%s", frontendBaseUrl, ticket));
             } catch (Exception ex) {
                 throw new RuntimeException(ex);
             }
@@ -374,7 +375,7 @@ private void issueTokensAndRedirect(HttpServletResponse response,
         log.info("[{}]用户登录成功！UUID: {}", displayUsername, user.getId());
 
         String redirectUrl = String.format(
-                "%s/oauth/success?accessToken=%s&refreshToken=%s&username=%s&uuid=%s",
+                "%s/consumer/success?accessToken=%s&refreshToken=%s&username=%s&uuid=%s",
                 frontendBaseUrl, accessToken, refreshToken, user.getUserName(), user.getId());
 
         response.sendRedirect(redirectUrl);
diff --git a/src/main/java/cn/programcx/foxnaserver/service/auth/impl/OAuthBindStateServiceImpl.java b/src/main/java/cn/programcx/foxnaserver/service/auth/impl/OAuthBindStateServiceImpl.java
@@ -19,7 +19,7 @@
 @Service
 public class OAuthBindStateServiceImpl implements OAuthBindStateService {
 
-    private static final String REDIS_KEY_PREFIX = "oauth:bind:state:";
+    private static final String REDIS_KEY_PREFIX = "consumer:bind:state:";
     private static final long DEFAULT_EXPIRE_SECONDS = 600; // 默认 10 分钟过期
 
     @Autowired
diff --git a/src/main/java/cn/programcx/foxnaserver/service/media/HLSTranscodeService.java b/src/main/java/cn/programcx/foxnaserver/service/media/HLSTranscodeService.java
diff --git a/src/main/java/cn/programcx/foxnaserver/service/media/TranscodeJobService.java b/src/main/java/cn/programcx/foxnaserver/service/media/TranscodeJobService.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
diff --git a/src/main/resources/mapper/SysMainMetricsMapper.xml b/src/main/resources/mapper/SysMainMetricsMapper.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cn.programcx.foxnaserver.config.oauth;`
	`1`	`+package cn.programcx.foxnaserver.config.consumer;`
`2`	`2`
`3`	`3`	`import cn.programcx.foxnaserver.config.TranscodeRabbitMQConfig;`
`4`	`4`	`import cn.programcx.foxnaserver.dto.media.JobStatus;`