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

变更数据



查看合并请求 !3269

@@ -85,8 +85,6 @@ class SyncFile extends Command
      */
      */
     public function synchronizationFile($path_name){
     public function synchronizationFile($path_name){
         //同步到大文件
         //同步到大文件
-        $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
-        $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
         $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
         $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
         return shell_exec($cmd);
         return shell_exec($cmd);
     }
     }
@@ -96,7 +94,7 @@ class SyncFile extends Command
         //同步到大文件
         //同步到大文件
         $file_path = config('filesystems.disks.s3')['cdn'].$path_name;
         $file_path = config('filesystems.disks.s3')['cdn'].$path_name;
         $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
         $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
-        $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
+        $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php';
         return shell_exec($cmd);
         return shell_exec($cmd);
     }
     }
 }
 }