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

gx创建作者



查看合并请求 !1209

@@ -77,6 +77,8 @@ class AiBlogListTask extends Command
             ProjectServer::useProject($v['project_id']);
             ProjectServer::useProject($v['project_id']);
             $aiBlogListModel = new AiBlogList();
             $aiBlogListModel = new AiBlogList();
             if(!empty($saveData)){
             if(!empty($saveData)){
+                //写一条路由信息
+                RouteMap::setRoute('ai_blogs',RouteMap::SOURCE_AI_BLOG_LIST,0,$v['project_id']);
                 $aiBlogListModel->truncate();
                 $aiBlogListModel->truncate();
                 $aiBlogListModel->insertAll($saveData);
                 $aiBlogListModel->insertAll($saveData);
             }
             }

@@ -64,7 +64,7 @@ class AiBlogController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
-                $v['route'] = $this->user['domain'] . '/' . $v['route'];
+                $v['route'] = $this->user['domain'] . '/blog/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -104,7 +104,7 @@ class AiBlogController extends BaseController
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
-                $v['route'] = $this->user['domain'] . '/' . $v['route'];
+                $v['route'] = $this->user['domain'] . '/user/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -171,7 +171,7 @@ class AiBlogController extends BaseController
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
         $lists = $aiBlogList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
         if(!empty($lists) && !empty($lists['list'])){
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
-                $v['route'] = $this->user['domain'] . '/ai_blogs/' . $v['route'];
+                $v['route'] = $this->user['domain'] . '/top-blog/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }

@@ -99,7 +99,7 @@ class AiBlogLogic extends BaseLogic
         $aiBlogService = new AiBlogService();
         $aiBlogService = new AiBlogService();
         $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
         $aiBlogService->mch_id = $aiSettingInfo['mch_id'];
         $aiBlogService->key = $aiSettingInfo['key'];
         $aiBlogService->key = $aiSettingInfo['key'];
-        $aiBlogService->route = generateRoute(Translate::tran($this->param['title'], 'en'));
+        $aiBlogService->route = generateRoute(Translate::tran($this->param['keyword'], 'en'));
         $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){
             $aiBlogTaskModel = new AiBlogTask();
             $aiBlogTaskModel = new AiBlogTask();

@@ -35,6 +35,7 @@ class RouteMap extends Base
     const SOURCE_MODULE = 'module';
     const SOURCE_MODULE = 'module';
     const SOURCE_AI_BLOG = 'ai_blog';
     const SOURCE_AI_BLOG = 'ai_blog';
     const SOURCE_AI_BLOG_AUTHOR = 'ai_blog_author';//ai博客作者
     const SOURCE_AI_BLOG_AUTHOR = 'ai_blog_author';//ai博客作者
+    const SOURCE_AI_BLOG_LIST = 'ai_blog_list';
     //自定义模块分类
     //自定义模块分类
     const SOURCE_MODULE_CATE = 'module_category';
     const SOURCE_MODULE_CATE = 'module_category';