From 36683f1aaacc4d7a45190565b5b0bb749cbe9d84 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Fri, 29 Mar 2024 15:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=ACOSS=E4=BA=91=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E7=9A=84=E5=8E=8B=E7=BC=A9=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/controller/FileController.java         | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
index ead64a7..a2d59fe 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java
@@ -261,12 +261,13 @@ public class FileController extends BaseController {
         String requestURL = config.getFileServer();
         for (FileRecord record : result.getList()) {
             if (StrUtil.isNotBlank(record.getPath())) {
+                record.setDownloadUrl(record.getPath());
                 if (FileServerUtil.isImage(record.getContentType())) {
                     record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
                     record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90");
-                    record.setUrl(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
+                    record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
                 }
-                record.setDownloadUrl(record.getPath());
+
             }
         }
         return success(result);
@@ -280,12 +281,12 @@ public class FileController extends BaseController {
         String requestURL = config.getFileServer();
         for (FileRecord record : records) {
             if (StrUtil.isNotBlank(record.getPath())) {
+                record.setDownloadUrl(record.getPath());
                 if (FileServerUtil.isImage(record.getContentType())) {
                   record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90");
                   record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90");
-                  record.setUrl(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
+                  record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90");
                 }
-                record.setDownloadUrl(record.getPath());
             }
         }
         return success(records);