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

Lyh server



查看合并请求 !2662

@@ -32,8 +32,8 @@ class SyncTimeFiles extends Command
     {
     {
         $fileModel = new File();
         $fileModel = new File();
 //        $imagesModel = new Image();
 //        $imagesModel = new Image();
-        $start = '2024-11-07 15:00:00';
-        $end = '2024-11-07 15:25:00';
+        $start = '2025-08-28 00:00:00';
+        $end = '2025-08-28 23:00:00';
         $lists = $fileModel->list(['created_at'=>['between',[$start,$end]]]);
         $lists = $fileModel->list(['created_at'=>['between',[$start,$end]]]);
         foreach ($lists as $v){
         foreach ($lists as $v){
             $path = $v['path'];
             $path = $v['path'];

@@ -47,10 +47,10 @@ class SyncTimeMinuteFile extends Command
         }
         }
         foreach ($lists as $v){
         foreach ($lists as $v){
             $path = $v['path'];
             $path = $v['path'];
-            if (file_exists($dir.$path)) {
-                echo date('Y-m-d H:i:s') . ' | file_ok：' . $dir.$path . PHP_EOL;
-                continue;
-            }
+//            if (file_exists($dir.$path)) {
+//                echo date('Y-m-d H:i:s') . ' | file_ok：' . $dir.$path . PHP_EOL;
+//                continue;
+//            }
             $code = $this->synchronizationFile($path);
             $code = $this->synchronizationFile($path);
             if(200 != (int)$code){
             if(200 != (int)$code){
                 echo date('Y-m-d H:i:s') . ' | 错误状态：' . $code . PHP_EOL;
                 echo date('Y-m-d H:i:s') . ' | 错误状态：' . $code . PHP_EOL;

@@ -132,7 +132,7 @@ class FileController
             $amazonS3Service->uploadFiles($files,$this->path,$fileName);
             $amazonS3Service->uploadFiles($files,$this->path,$fileName);
         }
         }
         $this->saveMysql($fileModel,$files->getSize(),$files->getClientOriginalExtension(),$fileName,$hash,$this->upload_location,$files->getMimeType(),$name);
         $this->saveMysql($fileModel,$files->getSize(),$files->getClientOriginalExtension(),$fileName,$hash,$this->upload_location,$files->getMimeType(),$name);
-//        $this->synchronizationFile($fileName,$this->upload_location);
+        $this->synchronizationFile($fileName,$this->upload_location);
         $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
         $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
     }
     }
 
 
@@ -306,7 +306,7 @@ class FileController
             $mime = $file->getMimeType();
             $mime = $file->getMimeType();
             $this->saveMysql($fileModel,$size,$file_type,$fileName,$hash,$this->upload_location,$mime,$name);
             $this->saveMysql($fileModel,$size,$file_type,$fileName,$hash,$this->upload_location,$mime,$name);
             $data[] = $this->responseData($this->path.'/'.$fileName, $name);
             $data[] = $this->responseData($this->path.'/'.$fileName, $name);
-//            $this->synchronizationFile($fileName,$this->upload_location);
+            $this->synchronizationFile($fileName,$this->upload_location);
         }
         }
         $this->response('资源',Code::SUCCESS,$data);
         $this->response('资源',Code::SUCCESS,$data);
     }
     }