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

Lyh server



查看合并请求 !2814

@@ -174,33 +174,33 @@ class AiBlogLogic extends BaseLogic
             if(empty($param['route'])){
             if(empty($param['route'])){
                 $param['route'] = generateRoute(Translate::tran($param['new_title'], 'en'));
                 $param['route'] = generateRoute(Translate::tran($param['new_title'], 'en'));
             }
             }
+            //推送到ai的数据结构
             $data = [
             $data = [
-                'title'=>$param['new_title'],
-                'thumb'=>$param['image'],
-                'foreword'=>$param['description'],
-                'author_id'=>$this->param['author_id'],
-                'url'=>$param['route'],
+                'title'=>$param['new_title'], 'thumb'=>$param['image'], 'foreword'=>$param['description'],
+                'author_id'=>$this->param['author_id'], 'url'=>$param['route'],
             ];
             ];
             if(isset($param['id']) && !empty($param['id'])){
             if(isset($param['id']) && !empty($param['id'])){
+                $id = $param['id'];
                 $data['task_id'] = $param['task_id'];
                 $data['task_id'] = $param['task_id'];
+                $param['route'] = RouteMap::setRoute($param['route'], RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
                 $this->model->edit($param,['id'=>$param['id']]);
                 $this->model->edit($param,['id'=>$param['id']]);
-                $id = $param['id'];
             }else{
             }else{
                 $param['uuid'] = md5(date('YmdHis').rand(100,999).$this->user['project_id']);
                 $param['uuid'] = md5(date('YmdHis').rand(100,999).$this->user['project_id']);
                 $param['project_id'] = $this->user['project_id'];
                 $param['project_id'] = $this->user['project_id'];
+                $param['status'] = $this->model::STATUS_RUNNING;
                 $id = $this->model->addReturnId($param);
                 $id = $this->model->addReturnId($param);
+                $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
+                $this->model->edit(['route'=>$route],['id'=>$id]);
             }
             }
-            $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_AI_BLOG, $id, $this->user['project_id']);
-            $this->model->edit(['route'=>$route],['id'=>$id]);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('保存失败，请联系管理员');
             $this->fail('保存失败，请联系管理员');
         }
         }
         $aiBlogService = new AiBlogService($this->user['project_id']);
         $aiBlogService = new AiBlogService($this->user['project_id']);
         $result = $aiBlogService->createCustomBlog($data);
         $result = $aiBlogService->createCustomBlog($data);
-        if($result['status'] == 200){
-            $this->model->edit(['task_id'=>$result['data']['task_id']],['id'=>$id]);
+        if(isset($result['status']) && $result['status'] == 200){
+            $this->model->edit(['task_id'=>$result['data']['task_id'],'status'=>$this->model::STATUS_FINISH],['id'=>$id]);
             //todo::更新列表页
             //todo::更新列表页
-        shell_exec("php artisan save_ai_blog_list {$this->user['project_id']} > /dev/null 2>&1 &");
+            shell_exec("php artisan save_ai_blog_list {$this->user['project_id']} > /dev/null 2>&1 &");
         }
         }
         return $this->success();
         return $this->success();
     }
     }