周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 5db94ec4567794b86887cd9c6b561de616119edc 2 个父辈 f9619b75 b0f4162d

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

变更数据



查看合并请求 !3115
内嵌 并排对比
正在显示 5 个修改的文件 包含 11 行增加 和 11 行删除
@@ -60,7 +60,7 @@ class SyncFile extends Command @@ -60,7 +60,7 @@ class SyncFile extends Command
60 //同步到大文件 60 //同步到大文件
61 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name; 61 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
62 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 62 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
63 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 63 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
64 return shell_exec($cmd); 64 return shell_exec($cmd);
65 } 65 }
66 66
@@ -69,7 +69,7 @@ class SyncFile extends Command @@ -69,7 +69,7 @@ class SyncFile extends Command
69 //同步到大文件 69 //同步到大文件
70 $file_path = config('filesystems.disks.s3')['cdn'].$path_name; 70 $file_path = config('filesystems.disks.s3')['cdn'].$path_name;
71 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 71 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
72 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 72 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
73 return shell_exec($cmd); 73 return shell_exec($cmd);
74 } 74 }
75 } 75 }
@@ -59,7 +59,7 @@ class SyncProjectFile extends Command @@ -59,7 +59,7 @@ class SyncProjectFile extends Command
59 //同步到大文件 59 //同步到大文件
60 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name; 60 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
61 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 61 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
62 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 62 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
63 return shell_exec($cmd); 63 return shell_exec($cmd);
64 } 64 }
65 65
@@ -68,7 +68,7 @@ class SyncProjectFile extends Command @@ -68,7 +68,7 @@ class SyncProjectFile extends Command
68 //同步到大文件 68 //同步到大文件
69 $file_path = config('filesystems.disks.s3')['cdn'].$path_name; 69 $file_path = config('filesystems.disks.s3')['cdn'].$path_name;
70 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 70 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
71 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 71 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
72 return shell_exec($cmd); 72 return shell_exec($cmd);
73 } 73 }
74 } 74 }
@@ -33,8 +33,8 @@ class SyncTimeFiles extends Command @@ -33,8 +33,8 @@ class SyncTimeFiles extends Command
33 { 33 {
34 // $fileModel = new File(); 34 // $fileModel = new File();
35 $imagesModel = new Image(); 35 $imagesModel = new Image();
36 - $start = '2025-08-28 00:00:00';  
37 - $end = '2025-08-29 23:59:59'; 36 + $start = '2025-10-1 00:00:00';
  37 + $end = '2025-10-31 23:59:59';
38 $lists = $imagesModel->list(['created_at'=>['between',[$start,$end]]]); 38 $lists = $imagesModel->list(['created_at'=>['between',[$start,$end]]]);
39 foreach ($lists as $v){ 39 foreach ($lists as $v){
40 $path = $v['path']; 40 $path = $v['path'];
@@ -52,9 +52,9 @@ class SyncTimeFiles extends Command @@ -52,9 +52,9 @@ class SyncTimeFiles extends Command
52 52
53 public function synchronizationFile($path_name){ 53 public function synchronizationFile($path_name){
54 //同步到大文件 54 //同步到大文件
55 - $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;  
56 - $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);  
57 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 55 +// $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
  56 +// $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
  57 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
58 return shell_exec($cmd); 58 return shell_exec($cmd);
59 } 59 }
60 60
@@ -66,7 +66,7 @@ class SyncTimeMinuteFile extends Command @@ -66,7 +66,7 @@ class SyncTimeMinuteFile extends Command
66 //同步到大文件 66 //同步到大文件
67 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name; 67 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
68 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 68 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
69 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 69 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
70 return shell_exec($cmd); 70 return shell_exec($cmd);
71 } 71 }
72 72
@@ -44,7 +44,7 @@ class SyncVideo extends Command @@ -44,7 +44,7 @@ class SyncVideo extends Command
44 //同步到大文件 44 //同步到大文件
45 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name; 45 $file_path = config('filesystems.disks.cos')['cdn1'].$path_name;
46 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME); 46 $directoryPath = pathinfo($path_name, PATHINFO_DIRNAME);
47 - $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$directoryPath.'" https://v6-file.globalso.com/upload.php'; 47 + $cmd = 'curl -k -F "file_path='.$path_name.'" -F "save_path=/www/wwwroot/cos'.$path_name.'" https://v6-file.globalso.com/upload.php';
48 return shell_exec($cmd); 48 return shell_exec($cmd);
49 } 49 }
50 50