Merge branch 'refs/heads/master' into stable

app/Http/Controllers/HomeController.php

@@ -59,16 +59,18 @@ class HomeController extends Controller
             $title = $folder->title;
         }
 
+
         foreach ($albums as $key => $album) {
             $cover = json_decode($album['cover']);
+
             foreach ($cover as $k => $v) {
-                if (strpos($v, 'http') === false && strpos($v, 'https') === false) {
-                    unset($cover[$k]);
-                }
+                $cover[$k] = ossUrl($v);
             }
+
             $cover = empty($cover) ? ['/static/images/noimg.jpg'] : $cover;
             $albums[$key]['cover'] = $cover;
         }
+
         // 面包屑导航
         $breadcrumb = getBreadcrumb($folder_id, $this->foldersTree);
         if ($breadcrumb) {

app/helpers.php

@@ -9,7 +9,7 @@ if (! function_exists('ossUrl')) {
         if (strpos($path, 'http') === 0 || strpos($path, 'https') === 0) {
             return $path;
         }
-        return env('OSS_HOST'). $path;
+        return env('OSS_HOST').'/'. $path;
     }
 }
 

resources/views/gallery-detail.blade.php

@@ -96,8 +96,8 @@
                                         </a>
                                     </td>
                                     <td>
-                                        <button data-src="{{$item['video_src']}}" class="video-btn">播放</button>
-                                        <a href="{{$item['video_src']}}" download class="download-btn" target="_blank"><button>下载</button></a>
+                                        <button data-src="{{ossUrl($item['video_src'])}}" class="video-btn">播放</button>
+                                        <a href="{{ossUrl($item['video_src'])}}" download class="download-btn" target="_blank"><button>下载</button></a>
                                     </td>
                                 </tr>
                                 @endforeach
@@ -121,7 +121,7 @@
                                             <td>{{$item['pdf_title']}}</td>
                                             <td>{{@$item['pdf_title_en']}}</td>
                                             <td>
-                                                <a href="{{$item['pdf_src']}}" download class="download-btn" target="_blank"><button>下载</button></a>
+                                                <a href="{{ossUrl($item['pdf_src'])}}" download class="download-btn" target="_blank"><button>下载</button></a>
                                             </td>
                                         </tr>
                                     @endforeach