Merge pull request #359 from jamebal/develop

jamebal · web-flow · commit 858a326a2173 · 2025-12-26T16:10:26.000+08:00
perf: 优化 GIF 图片的条件性缩放
diff --git a/src/main/java/com/jmal/clouddisk/dao/impl/jpa/repository/GroupRepository.java b/src/main/java/com/jmal/clouddisk/dao/impl/jpa/repository/GroupRepository.java
@@ -33,7 +33,7 @@ public interface GroupRepository extends JpaRepository<GroupDO, String>, JpaSpec
             nativeQuery = true)
     List<GroupDO> findAllByRoleIdList_MySQL(@Param("roleIdListAsJson") String roleIdListAsJson);
 
-    @Query(value = "SELECT DISTINCT * FROM user_groups g, json_each(g.roles) je WHERE je.value IN (:roleIdList)",
+    @Query(value = "SELECT DISTINCT g.* FROM user_groups g, json_each(g.roles) je WHERE je.value IN (:roleIdList)",
             nativeQuery = true)
     List<GroupDO> findAllByRoleIdList_SQLite(@Param("roleIdList") Collection<String> roleIdList);
 }
diff --git a/src/main/java/com/jmal/clouddisk/interceptor/FileInterceptor.java b/src/main/java/com/jmal/clouddisk/interceptor/FileInterceptor.java
@@ -89,11 +89,11 @@ public class FileInterceptor implements HandlerInterceptor {
 
     @Override
     public boolean preHandle(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response, @NotNull Object handler) throws IOException {
-        if (internalValid(request, response)) return true;
-
-        if (fileAuthError(request, response)) {
-            response.setStatus(HttpServletResponse.SC_FORBIDDEN);
-            return false;
+        if (!internalValid(request, response)) {
+            if (fileAuthError(request, response)) {
+                response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+                return false;
+            }
         }
         Path path = Paths.get(request.getRequestURI());
         String filename = getDownloadFilename(request, path);
@@ -177,18 +177,18 @@ public static void main(String[] args) {
         System.out.println(URLUtil.encode("未命名文件 副本.txt", StandardCharsets.UTF_8));
     }
 
+    /**
+     * 内部请求校验
+     */
     private boolean internalValid(@NotNull HttpServletRequest request, @NotNull HttpServletResponse response) {
         String requestId = (String) request.getAttribute("requestId");
         String internalToken = (String) request.getAttribute("internalToken");
 
         if (CharSequenceUtil.isNotBlank(requestId) && CharSequenceUtil.isNotBlank(internalToken)) {
             if (!PreFileInterceptor.isValidInternalTokenCache(requestId, internalToken)) {
                 response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+                return false;
             }
-            Path path = Paths.get(request.getRequestURI());
-            String filename = getDownloadFilename(request, path);
-            if (downloadOssFile(request, response, filename, path)) return false;
-            setHeader(request, response);
             return true;
         }
         return false;
@@ -366,7 +366,9 @@ private void handleCrop(HttpServletRequest request, HttpServletResponse response
         String w = request.getParameter("w");
         String h = request.getParameter("h");
         responseImageFileHeader(response, file.getName());
-        ImageMagickProcessor.cropImage(new FileInputStream(file), q, w, h, response.getOutputStream());
+        try (InputStream inputStream = new FileInputStream(file)) {
+            ImageMagickProcessor.cropImage(inputStream, q, w, h, response.getOutputStream());
+        }
     }
 
     private File getFileByRequest(HttpServletRequest request) {
diff --git a/src/main/java/com/jmal/clouddisk/media/ImageMagickProcessor.java b/src/main/java/com/jmal/clouddisk/media/ImageMagickProcessor.java
@@ -67,9 +67,15 @@ private String generateTempImagePath(String username) {
      * @param file   File
      */
     public void generateThumbnail(File file, FileDocument fileDocument) {
-        try {
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            cropImage(new FileInputStream(file), "1", "256", "256", byteArrayOutputStream);
+        try(FileInputStream fileInputStream = new FileInputStream(file);
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            String extName = FileUtil.extName(file);
+            if ("gif".equalsIgnoreCase(extName)) {
+                // GIF 图片单独处理，保持动画效果
+                cropImage(fileInputStream, "1", "256", "256", byteArrayOutputStream, "gif");
+            } else {
+                cropImage(fileInputStream, "1", "256", "256", byteArrayOutputStream, "png");
+            }
             if (dataSourceProperties.getType() == DataSourceType.mongodb) {
                 fileDocument.setContent(byteArrayOutputStream.toByteArray());
             } else {
@@ -155,6 +161,21 @@ public static void replaceWebp(File srcFile, File destFile, boolean deleteSrc) {
      * @param outputStream 输出流，用于接收处理后的 png 图片数据
      */
     public static void cropImage(InputStream inputStream, String q, String w, String h, OutputStream outputStream) {
+        cropImage(inputStream, q, w, h, outputStream, null);
+    }
+
+    /**
+     * 使用单一的 ImageMagick 命令，从 InputStream 对图片进行条件性缩放和质量调整。
+     * 只有当图片尺寸大于目标尺寸时，才会进行缩放。
+     *
+     * @param inputStream 源图片输入流
+     * @param q           质量 (字符串 "0.0" 到 "1.0", 默认 0.8)
+     * @param w           目标最大宽度 (字符串)
+     * @param h           目标最大高度 (字符串, 可选)
+     * @param outputStream 输出流，用于接收处理后的 png 图片数据
+     * @param outputFormat 输出格式 (png 和 gif)
+     */
+    public static void cropImage(InputStream inputStream, String q, String w, String h, OutputStream outputStream, String outputFormat) {
         // 1. 解析输入参数
         double quality = parseQuality(q);
         int targetWidth = parseDimension(w);
@@ -167,9 +188,17 @@ public static void cropImage(InputStream inputStream, String q, String w, String
             // IoUtil.copy(inputStream, outputStream);
             return;
         }
+        if (outputFormat == null) {
+            outputFormat = "png";
+        }
 
         // 2. 构建单一的、条件性的 ImageMagick 命令
-        CommandLine cmdLine = buildConditionalResizeCommand(targetWidth, targetHeight, quality);
+        CommandLine cmdLine;
+        if ("gif".equals(outputFormat)) {
+            cmdLine = buildConditionalResizeGIFCommand(targetWidth, targetHeight);
+        } else {
+            cmdLine = buildConditionalResizeCommand(targetWidth, targetHeight, quality);
+        }
 
         // 3. 执行命令，将输入流管道连接到命令的标准输入
         try {
@@ -217,6 +246,37 @@ private static CommandLine buildConditionalResizeCommand(int targetWidth, int ta
         return cmdLine;
     }
 
+    /**
+     * 构建一个使用条件缩放的 ImageMagick 命令行，专门用于处理 GIF 图片以保持动画效果。
+     * @param targetWidth 目标宽度
+     * @param targetHeight 目标高度 (如果<0则忽略)
+     * @return 构建好的命令行对象
+     */
+    private static CommandLine buildConditionalResizeGIFCommand(int targetWidth, int targetHeight) {
+        CommandLine cmdLine = new CommandLine("magick");
+
+        cmdLine.addArgument("-", false);
+
+        cmdLine.addArgument("-coalesce", false);
+        cmdLine.addArgument("-resize", false);
+
+        StringBuilder geometry = new StringBuilder();
+        geometry.append(targetWidth);
+        if (targetHeight > 0) {
+            geometry.append("x").append(targetHeight);
+        }
+        geometry.append(">");
+
+        cmdLine.addArgument(geometry.toString(), false);
+
+        cmdLine.addArgument("-layers", false);
+        cmdLine.addArgument("optimize", false);
+
+        cmdLine.addArgument("gif:-", false);
+
+        return cmdLine;
+    }
+
     /**
      * <p>获取图片尺寸</p>
      * 命令: identify -format "%w %h" image.jpg
@@ -225,18 +285,25 @@ private static CommandLine buildConditionalResizeCommand(int targetWidth, int ta
      * @return 一个包含 [width, height] 的数组，如果失败则返回 null
      */
     public static ImageFormat identifyFormat(File imageFile) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-
-        CommandLine cmdLine = new CommandLine("magick");
-        cmdLine.addArgument("identify", false);
-        cmdLine.addArgument("-format", false);
-        cmdLine.addArgument(ImageFormat.DEFAULT_FORMAT_PARAM, false);
-        cmdLine.addArgument(imageFile.getAbsolutePath(), false);
-        CommandUtil.execCommand(cmdLine, null, outputStream);
-
-        String output = IoUtil.toStr(outputStream, StandardCharsets.UTF_8);
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+            CommandLine cmdLine = new CommandLine("magick");
+            cmdLine.addArgument("identify", false);
+            cmdLine.addArgument("-format", false);
+            cmdLine.addArgument(ImageFormat.DEFAULT_FORMAT_PARAM, false);
+            cmdLine.addArgument(imageFile.getAbsolutePath(), false);
+            CommandUtil.execCommand(cmdLine, null, outputStream);
+
+            String output = IoUtil.toStr(outputStream, StandardCharsets.UTF_8);
+            if (CharSequenceUtil.isBlank(output)) {
+                log.error("ImageMagick identify command returned empty output for file: {}", imageFile.getAbsolutePath());
+                throw new CommonException(ExceptionType.SYSTEM_ERROR.getCode(), "获取图片信息失败: identify 命令返回为空");
+            }
+            return ImageFormat.getImageFormat(output);
+        } catch (IOException e) {
+            log.error("Failed to identify image format: {}", imageFile.getAbsolutePath(), e);
+            throw new CommonException(ExceptionType.SYSTEM_ERROR.getCode(), "获取图片信息失败");
+        }
 
-        return ImageFormat.getImageFormat(output);
     }
 
     @Builder
diff --git a/src/main/java/com/jmal/clouddisk/util/CommandUtil.java b/src/main/java/com/jmal/clouddisk/util/CommandUtil.java
@@ -35,28 +35,31 @@ public static void execCommand(CommandLine cmdLine, InputStream inputStream, Out
      */
     public static void execCommand(CommandLine cmdLine, InputStream inputStream, OutputStream outputStream, Duration timeout) {
         DefaultExecutor executor = DefaultExecutor.builder().get();
-        ByteArrayOutputStream stdErr = new ByteArrayOutputStream();
-        // 参数：标准输出、标准错误、标准输入
-        PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream, stdErr, inputStream);
-        executor.setStreamHandler(streamHandler);
-
-        ExecuteWatchdog watchdog = ExecuteWatchdog.builder().setTimeout(timeout).get();
-        executor.setWatchdog(watchdog);
-
-        try {
-            int exitValue = executor.execute(cmdLine);
-            log.debug("command exec success, command: {}", String.join(" ", cmdLine.toStrings()));
-            if (exitValue != 0) {
+        try(ByteArrayOutputStream stdErr = new ByteArrayOutputStream()) {
+            // 参数：标准输出、标准错误、标准输入
+            PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream, stdErr, inputStream);
+            executor.setStreamHandler(streamHandler);
+
+            ExecuteWatchdog watchdog = ExecuteWatchdog.builder().setTimeout(timeout).get();
+            executor.setWatchdog(watchdog);
+
+            try {
+                int exitValue = executor.execute(cmdLine);
+                log.debug("command exec success, command: {}", String.join(" ", cmdLine.toStrings()));
+                if (exitValue != 0) {
+                    String errMsg = stdErr.toString(StandardCharsets.UTF_8);
+                    log.error("command exec failed, command: {}, exit code: {}, stderr: {}", String.join(" ", cmdLine.toStrings()), exitValue, errMsg);
+                }
+            } catch (IOException e) {
                 String errMsg = stdErr.toString(StandardCharsets.UTF_8);
-                log.error("command exec failed, command: {}, exit code: {}, stderr: {}", String.join(" ", cmdLine.toStrings()), exitValue, errMsg);
+                if (watchdog.killedProcess()) {
+                    log.error("command exec timeout, command: {}, stderr: {}", String.join(" ", cmdLine.toStrings()), errMsg);
+                } else {
+                    log.error("command exec error, command: {}, stderr: {}, {}", String.join(" ", cmdLine.toStrings()), errMsg, e.getMessage());
+                }
             }
         } catch (IOException e) {
-            String errMsg = stdErr.toString(StandardCharsets.UTF_8);
-            if (watchdog.killedProcess()) {
-                log.error("command exec timeout, command: {}, stderr: {}", String.join(" ", cmdLine.toStrings()), errMsg);
-            } else {
-                log.error("command exec error, command: {}, stderr: {}, {}", String.join(" ", cmdLine.toStrings()), errMsg, e.getMessage());
-            }
+            log.error("command exec error, command: {}, {}", String.join(" ", cmdLine.toStrings()), e.getMessage());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public interface GroupRepository extends JpaRepository<GroupDO, String>, JpaSpec`
`33`	`33`	`nativeQuery = true)`
`34`	`34`	`List<GroupDO> findAllByRoleIdList_MySQL(@Param("roleIdListAsJson") String roleIdListAsJson);`
`35`	`35`
`36`		`- @Query(value = "SELECT DISTINCT * FROM user_groups g, json_each(g.roles) je WHERE je.value IN (:roleIdList)",`
	`36`	`+ @Query(value = "SELECT DISTINCT g.* FROM user_groups g, json_each(g.roles) je WHERE je.value IN (:roleIdList)",`
`37`	`37`	`nativeQuery = true)`
`38`	`38`	`List<GroupDO> findAllByRoleIdList_SQLite(@Param("roleIdList") Collection<String> roleIdList);`
`39`	`39`	`}`