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

@@ -258,6 +258,7 @@ class FileController
             'mime'=>$mime,
             'project_id'=>$this->cache['project_id'] ?? 0,
             'name'=>$name,
+            'en_name'=>$fileName
         ];
         $rs = $fileModel->add($data);
         if ($rs === false) {

@@ -289,6 +289,7 @@ class ImageController extends Controller
             'mime'=>$mime,
             'project_id'=>$this->cache['project_id'] ?? 0,
             'name'=>$name,
+            'en_name'=>$fileName
         ];
         $rs = $imageModel->add($data);
         if ($rs === false) {

@@ -39,20 +39,22 @@ class CopyImageFileJob implements ShouldQueue
     {
         $imageModel = new ImageModel();
         //获取当前项目的所有图片
-        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
+        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size','name']);
         if(!empty($imageList)){
             $amazonS3Service = new AmazonS3Service();
             foreach ($imageList as $k => $v){
+                echo date('Y-m-d H:i:s') . '执行图片的数据id:' . $v['id'] . '名称：'.$v['name'] . PHP_EOL;
                 $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
                 $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
             }
         }
 
         $fileModel = new FileModel();
-        $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos']);
+        $fileList = $fileModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','name']);
         if(!empty($fileList)){
             $amazonS3Service = new AmazonS3Service();
             foreach ($fileList as $k => $v){
+                echo date('Y-m-d H:i:s') . '执行文件的数据id:' . $v['id'] . '名称：'.$v['name'] . PHP_EOL;
                 $amazonS3Service->syncImageFiles(getFileUrl($v['path']));
                 $fileModel->edit(['is_cos'=>0],['id'=>$v['id']]);
             }