Merge branch 'master-lyh-edit' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -33,11 +33,16 @@ class SyncFile extends Command
         $errorFileModel = new ErrorFile();
         $lists = $errorFileModel->list(['status'=>0]);//未同步成功的图片及文件
         foreach ($lists as $k => $v){
-            $code = $this->synchronizationFile($v['path']);
+            if(strpos($v['path'], '181') !== false ){
+                $code = $this->synchronizationFiles($v['path']);
+            }else{
+                $code = $this->synchronizationFile($v['path']);
+            }
             if((int)$code == 200){
                 echo date('Y-m-d H:i:s') . '编辑的path为:'. $v['path'] .',主键id：'. $v['id'] . PHP_EOL;
                 $errorFileModel->edit(['status'=>1],['id'=>$v['id']]);
             }
+
         }
         echo date('Y-m-d H:i:s') . '编辑的end为:' . PHP_EOL;
         return true;
@@ -57,4 +62,13 @@ class SyncFile extends Command
         $cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php';
         return shell_exec($cmd);
     }
+
+
+    public function synchronizationFiles($path_name){
+        //同步到大文件
+        $file_path = config('filesystems.disks.s3')['cdn'].$path_name;
+        $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
+        $cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php';
+        return shell_exec($cmd);
+    }
 }

@@ -51,7 +51,7 @@ return [
             'url' => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
-            'cdn'=>'https://v6-file.globalso.com'
+            'cdn'=>'https://globalso-v6.s3.us-west-2.amazonaws.com'
         ],
 
         'upload'    =>  [