From c1979da1af60f29a2b733861631718b73e616c80 Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Wed, 6 Aug 2025 11:56:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8E=E5=8F=B0=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=84=E5=AF=BC=E5=87=BA=E5=9B=BE=E7=89=87=E7=AD=89?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=9C=B0=E5=9D=80=E6=8B=BC=E6=8E=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/v1/Article.php    |  4 ++--
 app/admin/controller/v1/BannerItem.php | 16 ++++++++++------
 app/admin/controller/v1/Video.php      | 13 +++----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/admin/controller/v1/Article.php b/app/admin/controller/v1/Article.php
index 4c4adf55..53ba5430 100644
--- a/app/admin/controller/v1/Article.php
+++ b/app/admin/controller/v1/Article.php
@@ -228,7 +228,7 @@ class Article
     private function getExportArticleData()
     {
         $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . config('filesystem.disks.public.url') . '/';
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
         $param = request()->param(['title', 'category_id', 'release_time']);
         $data = ArticleModel::field([
                 '*',
@@ -253,7 +253,7 @@ class Article
             ])
             ->bindAttr('category', ['category_name' => 'name'])
             ->each(function ($item) use($image_host) {
-                $item->image = !empty($item->image) ? $image_host . $item->image : '';
+                $item->image = !empty($item->image) ? url_join($image_host, $item->image) : '';
                 return $item;
             });
 
diff --git a/app/admin/controller/v1/BannerItem.php b/app/admin/controller/v1/BannerItem.php
index b1936dcc..3b196d14 100644
--- a/app/admin/controller/v1/BannerItem.php
+++ b/app/admin/controller/v1/BannerItem.php
@@ -262,11 +262,9 @@ class BannerItem
     // 获取导出数据
     private function getBannerExportData()
     {
-        $param = request()->param([
-            'title',
-            'banner_id',
-            'created_at'
-        ]);
+        $server = request()->server();
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
+        $param = request()->param(['title', 'banner_id', 'created_at']);
         return SysBannerItemModel::alias('item')
             ->field([
                 'item.id',
@@ -311,7 +309,13 @@ class BannerItem
                 }
             })
             ->order(['item.sort' => 'asc', 'item.id' => 'desc'])
-            ->select();
+            ->select()
+            ->each(function($item) use($image_host) {
+                $item->image       = !empty($item->image) ? url_join($image_host, $item->image) : '';
+                $item->extra_image = !empty($item->extra_image) ? url_join($image_host, $item->extra_image) : '';
+                $item->video       = !empty($item->video) ? url_join($image_host, $item->video) : '';
+                return $item;
+            });
     }
 
     // 删除
diff --git a/app/admin/controller/v1/Video.php b/app/admin/controller/v1/Video.php
index 6ec0586b..c392424f 100644
--- a/app/admin/controller/v1/Video.php
+++ b/app/admin/controller/v1/Video.php
@@ -209,9 +209,6 @@ class Video
         ]);
 
         $domain     = request()->domain();
-        $image_path = Config::get('filesystem.disks.image.url');
-        $video_path = Config::get('filesystem.disks.video.url');
-
         return  VideoModel::withoutField([
                 'language_id',
                 'updated_at',
@@ -230,13 +227,9 @@ class Video
             ->select()
             ->bindAttr('category', ['category_name' => 'name'])
             ->hidden(['category_id', 'category'])
-            ->each(function ($item) use($domain, $image_path, $video_path) {
-                if (!empty($item->image)) {
-                    $item->image = $domain . $image_path . '/' . $item->image;
-                }
-                if (!empty($item->video)) {
-                    $item->video = $domain . $video_path . '/' . $item->video;
-                }
+            ->each(function ($item) use($domain) {
+                $item->image     = !empty($item->image) ? url_join($domain, $item->image) : '';
+                $item->video     = !empty($item->video) ? url_join($domain, $item->video) : '';
                 $item->recommend = $item->recommend == 1 ? '是' : '否';
                 $item->status    = $item->status    == 1 ? '启用' : '禁用';
                 return $item;