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

Master server



查看合并请求 !1118

@@ -40,7 +40,7 @@ class AiBlogTask extends Command
         while (true){
         while (true){
             $info = $aiBlogTaskModel->where('status',1)->orderBy('id','asc')->first();
             $info = $aiBlogTaskModel->where('status',1)->orderBy('id','asc')->first();
             if($info === false){
             if($info === false){
-                sleep(20);
+                sleep(30);
                 continue;
                 continue;
             }
             }
             $info = $info->toArray();
             $info = $info->toArray();

@@ -35,6 +35,12 @@ class AiBlogController extends BaseController
      */
      */
     public function getAiBlog(AiBlog $aiBlog){
     public function getAiBlog(AiBlog $aiBlog){
         $lists = $aiBlog->lists($this->map,$this->page,$this->row,'id',['id','new_title','task_id','status','created_at','updated_at']);
         $lists = $aiBlog->lists($this->map,$this->page,$this->row,'id',['id','new_title','task_id','status','created_at','updated_at']);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['image'] = getImageUrl($v['url'],$this->user['storage_type'],$this->user['project_location']);
+                $lists['list'][$k] = $v;
+            }
+        }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 

@@ -34,10 +34,11 @@ class KeywordPrefixLogic extends BaseLogic
             $data = [
             $data = [
                 'project_id'=>$this->param['project_id'] ?? 0,
                 'project_id'=>$this->param['project_id'] ?? 0,
                 'keyword'=>$v,
                 'keyword'=>$v,
-                'type'=>$this->param['type']
+                'type'=>$this->param['type'],
             ];
             ];
             $prefixInfo = $this->model->read($data);
             $prefixInfo = $this->model->read($data);
             if($prefixInfo == false){
             if($prefixInfo == false){
+                $data['remark'] = $this->param['remark'] ?? '';
                 $this->model->add($data);
                 $this->model->add($data);
             }
             }
         }
         }

@@ -99,6 +99,9 @@ class ProjectLogic extends BaseLogic
         if(isset($info['deploy_build']['other_project']) && !empty($info['deploy_build']['other_project'])){
         if(isset($info['deploy_build']['other_project']) && !empty($info['deploy_build']['other_project'])){
             $info['deploy_build']['other_project']= json_decode($info['deploy_build']['other_project']);
             $info['deploy_build']['other_project']= json_decode($info['deploy_build']['other_project']);
         }
         }
+        if(isset($info['project_keyword']['operator_log']) && !empty($info['project_keyword']['operator_log'])){
+            $info['project_keyword']['operator_log'] = json_decode($info['project_keyword']['operator_log']);
+        }
         //is_product:"0",is_news:"0",is_blogs:"0",is_module:"0"
         //is_product:"0",is_news:"0",is_blogs:"0",is_module:"0"
         //获取小语种
         //获取小语种
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
@@ -439,6 +442,9 @@ class ProjectLogic extends BaseLogic
             'customer_keywords'=>$project_keyword['customer_keywords'] ?? '',
             'customer_keywords'=>$project_keyword['customer_keywords'] ?? '',
             'search_keywords'=>$project_keyword['search_keywords'] ?? '',
             'search_keywords'=>$project_keyword['search_keywords'] ?? '',
         ];
         ];
+        if(isset($project_keyword['operator_log']) && !empty($project_keyword['operator_log'])){
+            $data['operator_log'] = json_encode($project_keyword['operator_log'] ?? []);
+        }
         if($info === false){
         if($info === false){
             $data['project_id'] = $project_id;
             $data['project_id'] = $project_id;
             $projectKeywordModel->addReturnId($data);
             $projectKeywordModel->addReturnId($data);

@@ -28,8 +28,11 @@ class AiBlogLogic extends BaseLogic
      * @time   :2023/7/5 14:46
      * @time   :2023/7/5 14:46
      */
      */
     public function blogSave(){
     public function blogSave(){
-        $this->param['project_id'] = $this->user['project_id'];
-        $rs = $this->model->add($this->param);
+        if(!empty($this->param['image'])){
+            $this->param['image'] = str_replace_url($this->param['image']);
+        }
+        $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+        $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){
             $this->fail('error');
             $this->fail('error');
         }
         }
@@ -57,15 +60,13 @@ class AiBlogLogic extends BaseLogic
         }
         }
         $result = $aiBlogService->createTask($this->param['keyword'],$this->param['type']);
         $result = $aiBlogService->createTask($this->param['keyword'],$this->param['type']);
         if($result['status'] == 200){
         if($result['status'] == 200){
-            try {
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'task_id'=>$result['data']['task_id'],'status'=>$result['data']['status']]);
             $aiBlogTaskModel->addReturnId(['project_id'=>$this->user['project_id'],'task_id'=>$result['data']['task_id'],'status'=>$result['data']['status']]);
             $aiBlogModel = new AiBlog();
             $aiBlogModel = new AiBlog();
-                $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>$result['data']['status'], 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
+            $aiBlogId = $aiBlogModel->addReturnId(['keyword'=>$this->param['keyword'], 'status'=>$result['data']['status'], 'task_id'=>$result['data']['task_id'],'project_id'=>$this->user['project_id'],
             ]);
             ]);
-            }catch (\Exception $e){
-                $this->fail('请求ai_blog失败，请联系管理员');
-            }
+            $route = RouteMap::setRoute($aiBlogService->route, RouteMap::SOURCE_AI_BLOG, $aiBlogId, $this->user['project_id']);
+            $aiBlogModel->edit(['route'=>$route],['id'=>$aiBlogId]);
         }
         }
         return $this->success();
         return $this->success();
     }
     }

@@ -33,6 +33,8 @@ class RouteMap extends Base
     const SOURCE_NEWS_CATE = 'news_category';
     const SOURCE_NEWS_CATE = 'news_category';
     //自定义模块
     //自定义模块
     const SOURCE_MODULE = 'module';
     const SOURCE_MODULE = 'module';
+
+    const SOURCE_AI_BLOG = 'ai_blog';
     //自定义模块分类
     //自定义模块分类
     const SOURCE_MODULE_CATE = 'module_category';
     const SOURCE_MODULE_CATE = 'module_category';