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

变更数据



查看合并请求 !3264

@@ -685,7 +685,20 @@ if (!function_exists('getImageUrl')) {
                 if ($image_cdn == 0) {//v6链接
                     $cosCdn = $cos['cdn2'];
                 } else {
-                    $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+                    switch ($storage_type) {
+                        case 0:
+                            $cosCdn = $cos['cdn'];
+                            break;
+                        case 1:
+                            $cosCdn = $cos['cdn1'];
+                            break;
+                        case 2:
+                            $cosCdn = $cos['cdn3'];
+                            break;
+                        default:
+                            $cosCdn = $cos['cdn2'];
+                            break;
+                    }
                 }
                 $url = $cosCdn . $path;
             } else {
@@ -731,7 +744,20 @@ if (!function_exists('getFileUrl')) {
             }
             if ($location == 0) {
                 $cos = config('filesystems.disks.cos');
-                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+                switch ($storage_type) {
+                    case 0:
+                        $cosCdn = $cos['cdn'];
+                        break;
+                    case 1:
+                        $cosCdn = $cos['cdn1'];
+                        break;
+                    case 2:
+                        $cosCdn = $cos['cdn3'];
+                        break;
+                    default:
+                        $cosCdn = $cos['cdn2'];
+                        break;
+                }
                 return $cosCdn . $path;
             } else {
                 $s3 = config('filesystems.disks.s3');