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

@@ -67,22 +67,16 @@ class UpdateRoute extends Command
             $settingInfo = $webSettingModel->read(['project_id'=>$v['id']]);
             $settingInfo = $webSettingModel->read(['project_id'=>$v['id']]);
             if($settingInfo === false){
             if($settingInfo === false){
                 echo date('Y-m-d H:i:s') . '当前项目的设置数据不存在:'.$v['id'] . PHP_EOL;
                 echo date('Y-m-d H:i:s') . '当前项目的设置数据不存在:'.$v['id'] . PHP_EOL;
-                continue;
-            }
-            if($settingInfo !== false){
-                if(empty($settingInfo['anchor_setting'])){
-                    $settingInfo['anchor_setting'] = '["3","4","5"]';
-                }
-                if(empty($settingInfo['anchor_page_num'])){
-                    $settingInfo['anchor_page_num'] = 1;
-                }
+                //新增一条数据
                 $data = [
                 $data = [
-                    'anchor_setting'=>$settingInfo['anchor_setting'],
+                    'anchor_setting'=>'["3","4","5"]',
                     'anchor_is_enable'=>1,
                     'anchor_is_enable'=>1,
-                    'anchor_page_num'=>$settingInfo['anchor_page_num'],
-                    'anchor_keyword_is_enable'=>1
+                    'anchor_page_num'=>1,
+                    'anchor_num'=>2,
+                    'anchor_keyword_is_enable'=>1,
+                    'project_id'=>$v['id']
                 ];
                 ];
-                $webSettingModel->edit($data,['project_id'=>$v['id']]);
+                $webSettingModel->add($data);
             }
             }
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }

@@ -65,7 +65,7 @@ class AiBlogController extends BaseController
             foreach ($lists['list'] as $k => $v){
             foreach ($lists['list'] as $k => $v){
                 $v['image'] = getImageUrl($v['image']);
                 $v['image'] = getImageUrl($v['image']);
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
+                    $v['route'] = $this->user['domain'] . 'blog/' . $v['route'];
                 }
                 }
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
@@ -106,7 +106,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['test_domain'] . 'user/' . $v['route'];
+                $v['route'] = $this->user['domain'] . 'user/' . $v['route'];
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }
@@ -173,9 +173,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){
-                if(!empty($v['route'])){
-                    $v['route'] = $this->user['test_domain'] . 'blog/' . $v['route'];
-                }
+                $v['route'] = $this->user['domain'] . 'top-blog/' . ($v['route'] > 1) ? $v['route'] : '';
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }