合并分支 'master-server' 到 'master'

gx脚本



查看合并请求 !1255

@@ -639,9 +639,9 @@ if (!function_exists('getImageUrl')) {
                 return 'https:'.$path;
                 return 'https:'.$path;
             }
             }
             if($location == 0){
             if($location == 0){
-//                $cos = config('filesystems.disks.cos');
-//                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
-                $cosCdn = 'https://file.globalso.com';//TODO::暂时使用
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+//                $cosCdn = 'https://file.globalso.com';//TODO::暂时使用
                 $url = $cosCdn.$path;
                 $url = $cosCdn.$path;
             }else{
             }else{
                 $s3 = config('filesystems.disks.s3');
                 $s3 = config('filesystems.disks.s3');