Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -473,8 +473,8 @@ if (!function_exists('getImageUrl')) {
                 return 'https:'.$path;
             }
             if($location == 0){
-                $cos = ($storage_type == 0) ? config('filesystems.disks.cos') : config('filesystems.disks.cos1');
-                $cosCdn = $cos['cdn'];
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
                 $url = $cosCdn.$path;
             }else{
                 $url = url($path);
@@ -509,8 +509,8 @@ if (!function_exists('getFileUrl')) {
                 return 'https:'.$path;
             }
             if($location == 0){
-                $cos = ($storage_type == 0) ? config('filesystems.disks.cos') : config('filesystems.disks.cos1');
-                $cosCdn = $cos['cdn'];
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
                 $url = $cosCdn.$path;
             }else{
                 $url = url($path);