作者 李宇航

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

Master server



查看合并请求 !1152
@@ -202,7 +202,7 @@ class ProjectLogic extends BaseLogic @@ -202,7 +202,7 @@ class ProjectLogic extends BaseLogic
202 return true; 202 return true;
203 } 203 }
204 $projectModel = new Project(); 204 $projectModel = new Project();
205 - $projectInfo = $projectModel->read(['id'=>$project_id],['is_ai_blog','main_lang_id','company']); 205 + $projectInfo = $projectModel->read(['id'=>$project_id],['title','is_ai_blog','main_lang_id','company']);
206 //获取项目主语种 206 //获取项目主语种
207 $languageModel = new WebLanguage(); 207 $languageModel = new WebLanguage();
208 $languageInfo = $languageModel->read(['id'=>$main_lang_id],['short']); 208 $languageInfo = $languageModel->read(['id'=>$main_lang_id],['short']);
@@ -65,9 +65,11 @@ class AiBlogLogic extends BaseLogic @@ -65,9 +65,11 @@ class AiBlogLogic extends BaseLogic
65 $aiBlogModel = new AiBlog(); 65 $aiBlogModel = new AiBlog();
66 $aiBlogId = $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>$result['data']['status'], 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'], 66 $aiBlogId = $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>$result['data']['status'], 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
67 ]); 67 ]);
  68 + if(!empty($aiBlogService->route)){
68 $route = RouteMap::setRoute($aiBlogService->route, RouteMap::SOURCE_AI_BLOG, $aiBlogId, $this->user['project_id']); 69 $route = RouteMap::setRoute($aiBlogService->route, RouteMap::SOURCE_AI_BLOG, $aiBlogId, $this->user['project_id']);
69 $aiBlogModel->edit(['route'=>$route],['id'=>$aiBlogId]); 70 $aiBlogModel->edit(['route'=>$route],['id'=>$aiBlogId]);
70 } 71 }
  72 + }
71 return $this->success(); 73 return $this->success();
72 } 74 }
73 } 75 }