gx

@@ -610,7 +610,6 @@ if (!function_exists('getFileUrl')) {
                 return $cdn2.$path;
                 return $cdn2.$path;
             }
             }
             if($location == 0){
             if($location == 0){
-                //v6-file.globalso.com
                 $cos = config('filesystems.disks.cos');
                 $cos = config('filesystems.disks.cos');
                 $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
                 $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
                 return $cosCdn.$path;
                 return $cosCdn.$path;

@@ -38,7 +38,7 @@ class SyncImageFileJob implements ShouldQueue
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $file_path = getImageUrl($this->param['path'].'/'.$this->param['name'], 0,$this->param['location']);
+        $file_path = $this->getUrl($this->param['path'].'/'.$this->param['name'], 0,$this->param['location']);
         $cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->param['path'].'" https://v6-file.globalso.com/upload.php';
         $cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->param['path'].'" https://v6-file.globalso.com/upload.php';
         $code = shell_exec($cmd);
         $code = shell_exec($cmd);
         if(200 != (int)$code){
         if(200 != (int)$code){
@@ -47,4 +47,40 @@ class SyncImageFileJob implements ShouldQueue
         }
         }
         return true;
         return true;
     }
     }
+
+    /**
+     * @remark :获取图片文件链接
+     * @name   :getUrl
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/22 11:53
+     */
+    public function getUrl($path,$storage_type,$location){
+        if(is_array($path)){
+            $url =[];
+            foreach ($path as $v){
+                $url[] = $this->getUrl($v,$storage_type,$location);
+            }
+        }else{
+            if(empty($path)){
+                return '';
+            }
+            if((strpos($path,'https://')!== false) || (strpos($path,'http://') !== false)){
+                return  $path;
+            }
+            if(substr($path,0,2) == '//'){
+                return 'https:'.$path;
+            }
+            if($location == 0){
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+                $url = $cosCdn.$path;
+            }else{
+                $s3 = config('filesystems.disks.s3');
+                $cdn = $s3['cdn'];
+                $url = $cdn.$path;
+            }
+        }
+        return $url;
+    }
 }
 }