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 @@ -