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;