Merge remote-tracking branch 'origin/master' into akun

@@ -639,8 +639,9 @@ if (!function_exists('getImageUrl')) {
                 return 'https:'.$path;
                 return 'https:'.$path;
             }
             }
             if($location == 0){
             if($location == 0){
-                $cos = config('filesystems.disks.cos');
-                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+//                $cos = config('filesystems.disks.cos');
+//                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+                $cosCdn = 'https://file.globalso.com';//TODO::暂时使用
                 $url = $cosCdn.$path;
                 $url = $cosCdn.$path;
             }else{
             }else{
                 $s3 = config('filesystems.disks.s3');
                 $s3 = config('filesystems.disks.s3');

@@ -104,11 +104,6 @@ class AiBlogLogic extends BaseLogic
         if($result['status'] == 200){
         if($result['status'] == 200){
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'type'=>2,'task_id'=>$result['data']['task_id'],'status'=>1]);
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'type'=>2,'task_id'=>$result['data']['task_id'],'status'=>1]);
-            //增加一条更新列表页的记录
-            $aiThreeInfo = $aiBlogTaskModel->read(['project_id'=>$this->user['project_id'],'type'=>3,'status'=>1]);
-            if($aiThreeInfo === false){
-                $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'type'=>3,'status'=>1]);
-            }
             $aiBlogModel = new AiBlog();
             $aiBlogModel = new AiBlog();
             $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>1, 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
             $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>1, 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
             ]);
             ]);

@@ -35,7 +35,7 @@ class SyncImageFileJob implements ShouldQueue
     public function handle()
     public function handle()
     {
     {
         $file_path = $this->getUrl($this->param['path'].'/'.$this->param['name'], 0,$this->param['location']);
         $file_path = $this->getUrl($this->param['path'].'/'.$this->param['name'], 0,$this->param['location']);
-        $cmd = 'curl -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->param['path'].'" https://v6-file.globalso.com/upload.php';
+        $cmd = 'curl -k -F "file_path='.$file_path.'" -F "save_path=/www/wwwroot/cos'.$this->param['path'].'" https://v6-file.globalso.com/upload.php';
         echo date('Y-m-d H:i:s') . ' | ' . $cmd . PHP_EOL;
         echo date('Y-m-d H:i:s') . ' | ' . $cmd . PHP_EOL;
         $code = shell_exec($cmd);
         $code = shell_exec($cmd);
         if(200 != (int)$code){
         if(200 != (int)$code){