Parcourir la source

server 用 temporaryUrl获取url

visuddhinanda il y a 2 ans
Parent
commit
4db5d53724

+ 5 - 1
app/Http/Api/StudioApi.php

@@ -39,7 +39,11 @@ class StudioApi{
         ];
         if($userInfo->avatar){
             $img = str_replace('.jpg','_s.jpg',$userInfo->avatar);
-            $data['avatar'] = Storage::url($img);
+            if (App::environment('local')) {
+                $data['avatar'] = Storage::url($img);
+            }else{
+                $data['avatar'] = Storage::temporaryUrl($img, now()->addDays(10));
+            }
         }
         return $data;
     }

+ 5 - 1
app/Http/Api/UserApi.php

@@ -50,7 +50,11 @@ class UserApi{
             ];
             if($user->avatar){
                 $img = str_replace('.jpg','_s.jpg',$user->avatar);
-                $data['avatar'] = Storage::url($img);
+                if (App::environment('local')) {
+                    $data['avatar'] = Storage::url($img);
+                }else{
+                    $data['avatar'] = Storage::temporaryUrl($img, now()->addDays(10));
+                }
             }
             return $data;
         }else{

+ 5 - 1
app/Http/Controllers/AuthController.php

@@ -109,7 +109,11 @@ class AuthController extends Controller
             ];
             if($userInfo->avatar){
                 $img = str_replace('.jpg','_s.jpg',$userInfo->avatar);
-                $user['avatar'] = Storage::url($img);
+                if (App::environment('local')) {
+                    $user['avatar'] = Storage::url($img);
+                }else{
+                    $user['avatar'] = Storage::temporaryUrl($img, now()->addDays(10));
+                }
             }
             return $this->ok($user);
         }else{

+ 9 - 3
app/Http/Resources/AttachmentResource.php

@@ -15,19 +15,25 @@ class AttachmentResource extends JsonResource
      */
     public function toArray($request)
     {
+        $filename = $this->bucket.'/'.$this->name;
         $data = [
             "id" => $this->id,
             "user_uid" => $this->user_uid,
-            "name" => $this->bucket.'/'.$this->name,
-            "filename" => $this->bucket.'/'.$this->name,
+            "name" => $filename,
+            "filename" => $filename,
             "title" => $this->title,
             "size" => $this->size,
             "content_type" => $this->content_type,
-            "url" => Storage::url($this->bucket.'/'.$this->name),
             "status" => $this->status,
             "created_at" => $this->created_at,
             "updated_at" => $this->updated_at,
         ];
+
+        if (App::environment('local')) {
+            $data['url'] = Storage::url($filename);
+        }else{
+            $data['url'] = Storage::temporaryUrl($filename, now()->addDays(10));
+        }
         return $data;
     }
 }

+ 5 - 1
app/Http/Resources/UserResource.php

@@ -25,7 +25,11 @@ class UserResource extends JsonResource
         if($this->avatar){
             $data['avatarName'] = $this->avatar;
             $img = str_replace('.jpg','_s.jpg',$this->avatar);
-            $data['avatar'] = Storage::url($img);
+            if (App::environment('local')) {
+                $data['avatar'] = Storage::url($img);
+            }else{
+                $data['avatar'] = Storage::temporaryUrl($img, now()->addDays(10));
+            }
         }
         return $data;
     }