From 930cb4bf1df7c7f32c5fcda29186dc18e8e33127 Mon Sep 17 00:00:00 2001 From: "HESU\\HESU" <1696136552@qq.com> Date: Mon, 26 May 2025 17:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/VehicleController.php | 4 ++-- .../app/controller/VehicleController.php | 17 +++++++++++++--- plugin/admin/app/view/vehicle/detail.html | 12 +++++------ plugin/admin/app/view/vehicle/index.html | 4 ++-- plugin/admin/app/view/vehicle/insert.html | 20 +++++++++---------- plugin/admin/app/view/vehicle/update.html | 20 +++++++++---------- .../app/view/vehicle/updateLogistics.html | 20 +++++++++---------- 7 files changed, 54 insertions(+), 43 deletions(-) diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php index d4a94d8..a7cf408 100644 --- a/app/controller/VehicleController.php +++ b/app/controller/VehicleController.php @@ -118,14 +118,14 @@ class VehicleController $vehicle->status = $this->status[$lang][$vehicle->status]??$this->status[$lang][0]; } if(!str_starts_with($vehicle['img_url'], 'http')){ - $img_url = Cache::get('img_dibai_'.$vehicle->id); + $img_url = Cache::get('img_dib_'.$vehicle->id); if ($img_url) { $vehicle['img_url'] = $img_url; } else { $ossservice = empty($ossservice)?new OssService():$ossservice; $img_url = $ossservice->generatePrivateUrl($vehicle['img_url'],86400); $vehicle['img_url'] = $img_url; - Cache::set('img_dibai_'.$vehicle->id, $img_url, 86390); + Cache::set('img_dib_'.$vehicle->id, $img_url, 86390); } } } diff --git a/plugin/admin/app/controller/VehicleController.php b/plugin/admin/app/controller/VehicleController.php index 271fe0b..28d0cb6 100644 --- a/plugin/admin/app/controller/VehicleController.php +++ b/plugin/admin/app/controller/VehicleController.php @@ -493,6 +493,16 @@ class VehicleController extends Crud if (!$data) { return json(['code' => 1, 'msg' => $translations['data_not_found'] ?? '数据不存在']); } + + $img_url = Cache::get('img_dib_'.$data->id); + if ($img_url) { + $item['img_url'] = $img_url; + } else { + $ossservice = empty($ossservice)?new OssService():$ossservice; + $img_url = $ossservice->generatePrivateUrl($data['img_url'],86400); + $item['img_url'] = $img_url; + Cache::set('img_dib_'.$data->id, $img_url, 86390); + } return view('vehicle/detail', [ 'data' => $data, @@ -530,7 +540,7 @@ class VehicleController extends Crud break; } - $ossservice = new OssService(); + $ossservice = null; foreach ($items as &$item) { $item = $vehicle::find($item['id']); $location = $hz::find($item->locations_id); @@ -553,13 +563,14 @@ class VehicleController extends Crud $item->fbo_location_name = $location ? $location->name : ''; try { - $img_url = Cache::get('img_dibai_'.$item->id); + $img_url = Cache::get('img_dib_'.$item->id); if ($img_url) { $item['img_url'] = $img_url; } else { + $ossservice = empty($ossservice)?new OssService():$ossservice; $img_url = $ossservice->generatePrivateUrl($item['img_url'],86400); $item['img_url'] = $img_url; - Cache::set('img_dibai_'.$item->id, $img_url, 86390); + Cache::set('img_dib_'.$item->id, $img_url, 86390); } // $ossservice = new OssService(); diff --git a/plugin/admin/app/view/vehicle/detail.html b/plugin/admin/app/view/vehicle/detail.html index 931e12c..9ab454d 100644 --- a/plugin/admin/app/view/vehicle/detail.html +++ b/plugin/admin/app/view/vehicle/detail.html @@ -22,12 +22,12 @@ -
- -
-
-
-
+ + + + + +
diff --git a/plugin/admin/app/view/vehicle/index.html b/plugin/admin/app/view/vehicle/index.html index fa175a9..d8ada6f 100644 --- a/plugin/admin/app/view/vehicle/index.html +++ b/plugin/admin/app/view/vehicle/index.html @@ -103,9 +103,9 @@ // {title: translations.img_url, align: "center", field: "img_url"}, { title: "translations.img_url", - field: "url", + field: "img_url", templet: function (d) { - return ''; + return ''; } }, {title: translations.status, align: "center", field: "status_txt"}, diff --git a/plugin/admin/app/view/vehicle/insert.html b/plugin/admin/app/view/vehicle/insert.html index cfd0a62..ce652f1 100644 --- a/plugin/admin/app/view/vehicle/insert.html +++ b/plugin/admin/app/view/vehicle/insert.html @@ -21,16 +21,16 @@
-
- -
- -
-
+ + + + + + + + + +
diff --git a/plugin/admin/app/view/vehicle/update.html b/plugin/admin/app/view/vehicle/update.html index 6a8b5d8..3fb389c 100644 --- a/plugin/admin/app/view/vehicle/update.html +++ b/plugin/admin/app/view/vehicle/update.html @@ -22,16 +22,16 @@
-
- -
- -
-
+ + + + + + + + + +
diff --git a/plugin/admin/app/view/vehicle/updateLogistics.html b/plugin/admin/app/view/vehicle/updateLogistics.html index 6e6dcb1..40e2ea4 100644 --- a/plugin/admin/app/view/vehicle/updateLogistics.html +++ b/plugin/admin/app/view/vehicle/updateLogistics.html @@ -29,16 +29,16 @@
-
- -
- -
-
+ + + + + + + + + +