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

@@ -8,12 +8,17 @@
 namespace App\Console\Commands\Test;
 
 
+use App\Models\Com\KeywordVideoTask;
 use App\Models\File\File;
 use App\Models\File\File as FileModel;
 use App\Models\File\Image;
 use App\Models\File\Image as ImageModel;
+use App\Models\Product\Keyword;
+use App\Models\Project\Project;
 use App\Services\AmazonS3Service;
+use App\Services\ProjectServer;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
 
 
 class Demo extends Command
@@ -33,25 +38,25 @@ class Demo extends Command
     protected $description = 'demo';
 
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $this->param['project_id'] = 181;
-        $imageModel = new ImageModel();
-        //获取当前项目的所有图片
-        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
-        if(!empty($imageList)){
-            $amazonS3Service = new AmazonS3Service();
-            foreach ($imageList as $k => $v){
-                $amazonS3Service->syncImageFiles(getImageUrl($v['path']));
-                $imageModel->edit(['is_cos'=>0],['id'=>$v['id']]);
-            }
-        }
-
+//    /**
+//     * Execute the job.
+//     *
+//     * @return void
+//     */
+//    public function handle()
+//    {
+//        $this->param['project_id'] = 181;
+//        $imageModel = new ImageModel();
+//        //获取当前项目的所有图片
+//        $imageList = $imageModel->list(['project_id'=>$this->param['project_id'],'is_cos'=>1],'id',['id','path','is_cos','size']);
+//        if(!empty($imageList)){
+//            $amazonS3Service = new AmazonS3Service();
+//            foreach ($imageList as $k => $v){
+//                $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','name']);
 //        if(!empty($fileList)){
@@ -63,7 +68,35 @@ class Demo extends Command
 //                gc_collect_cycles();
 //            }
 //        }
-        return true;
+//        return true;
+//    }
+
+    public function handle(){
+        $keywordVideoModel = new KeywordVideoTask();
+        $project_id_arr = $keywordVideoModel::where('id','>',0)->pluck('project_id')->toArray();
+        $projectModel = new Project();
+        $list = $projectModel->list(['type'=>['!=',0],'delete_status'=>0,'id'=>['in',$project_id_arr]]);
+        $data = [];
+        foreach ($list as $v){
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+            ProjectServer::useProject($v['id']);
+            $this->saveKeyword();
+            DB::disconnect('custom_mysql');
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
 
+    /**
+     * @remark :关键字有视频的改为1
+     * @name   :getProductKeywordInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/31 9:54
+     */
+    public function saveKeyword(){
+        $keywordModel = new Keyword();
+        $rs = $keywordModel->edit(['is_video_keyword'=>1],['video'=>['!=',null]]);
+        echo date('Y-m-d H:i:s') . 'end'.$rs . PHP_EOL;
+        return true;
+    }
 }

@@ -96,6 +96,7 @@ class FileManageController extends BaseController
         $cosService = new CosService();
         $cosService->uploadFile($file,$path,$fileName);
         $data['project_id'] = $this->user['project_id'];
+        $data['en_name'] = $fileName;
         $data['path'] = $path.'/'.$fileName;
         $rs = $fileManage->add($data);
         if ($rs === false) {
@@ -113,14 +114,16 @@ class FileManageController extends BaseController
      */
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
-        $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $suffix = array_pop($nameArr) ?? 'txt';
+        $nameStr = implode('-', $nameArr);
+        $enName = generateRoute(Translate::tran($nameStr, 'en'));
         $fileName = $enName;
         $i=1;
-        while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
+        while($this->onlyName($enName.'.'.$suffix,$project_id)){
             $enName = $fileName .'-'.$i;
             $i++;
         }
-        return $enName.'.'.$nameArr[1];
+        return $enName.'.'.$suffix;
     }
 
     /**
@@ -154,7 +157,7 @@ class FileManageController extends BaseController
         if(!in_array($extension, explode(',', $this->upload_config['allow_file_type']))){
             $this->fail('不允许上传的文件类型');
         }
-        $hash = hash_file('md5', $file->getPathname());
+        $hash = hash_file('sha256', $file->getPathname());
         $info = FileManage::where('hash', $hash)->first();
         if($info){
             $this->fail('文件已上传，文件名称.'.$info['name']);

@@ -195,7 +195,7 @@ class FileController
      */
     public function api_upload_single(&$files)
     {
-        $hash = hash_file('md5', $files->getPathname());
+        $hash = hash_file('sha256', $files->getPathname());
         $name = $files->getFilename();
         //查看文件是否存在
         $fileModel = new File();