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

@@ -140,7 +140,7 @@ class UpdateSeoTdk extends Command
                 ProjectServer::useProject($project_id);
                 ProjectServer::useProject($project_id);
                 $this->seo_tdk($project_id);
                 $this->seo_tdk($project_id);
             } catch (\Exception $e) {
             } catch (\Exception $e) {
-                echo date('Y-m-d H:i:s') . ' error: ' . $project_id . '->' . $e->getMessage() . PHP_EOL;
+                echo date('Y-m-d H:i:s') . ' line '. $e->getLine() .' error: ' . $project_id . '->' . $e->getMessage() . PHP_EOL;
             }
             }
             echo date('Y-m-d H:i:s') . ' end: ' . $project_id . PHP_EOL;
             echo date('Y-m-d H:i:s') . ' end: ' . $project_id . PHP_EOL;
         }
         }
@@ -232,7 +232,7 @@ class UpdateSeoTdk extends Command
             $lang = $this->getLang($topic);
             $lang = $this->getLang($topic);
         }
         }
         if(strpos($prompt, '{keyword}') !== false) {
         if(strpos($prompt, '{keyword}') !== false) {
-            $keyword = $this->mainKeywords($project_id, 8);
+            $keyword = $this->mainKeywords($project_id, 1);
             if(!$keyword){
             if(!$keyword){
                 echo '核心关键词为空 跳过' . PHP_EOL;
                 echo '核心关键词为空 跳过' . PHP_EOL;
                 return false;
                 return false;
@@ -289,7 +289,7 @@ class UpdateSeoTdk extends Command
         $projectOptimizeModel = new DeployOptimize();
         $projectOptimizeModel = new DeployOptimize();
         $info = $projectOptimizeModel->read(['project_id' => $project_id], ['id', 'main_keywords']);
         $info = $projectOptimizeModel->read(['project_id' => $project_id], ['id', 'main_keywords']);
         if (!empty($info['main_keywords'])) {
         if (!empty($info['main_keywords'])) {
-            $main_keywords = explode(',', $info['main_keywords']);
+            $main_keywords = explode("\r\n", $info['main_keywords']);
             //随机取
             //随机取
             shuffle($main_keywords);
             shuffle($main_keywords);
             $main_keywords = array_slice($main_keywords, 0, $num);
             $main_keywords = array_slice($main_keywords, 0, $num);

@@ -107,12 +107,12 @@ class ProjectServer extends BaseService
         $info = DB::connection('custom_mysql')->table('gl_web_nav')->first();
         $info = DB::connection('custom_mysql')->table('gl_web_nav')->first();
         if(empty($info)) {
         if(empty($info)) {
             $data = [
             $data = [
-                ['project_id' => $project_id, 'name' => 'Home', 'url' => 'nav-home-' . $project_id, 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'Products', 'url' => 'nav-product' . $project_id, 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'News', 'url' => 'nav-news' . $project_id, 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'nav-about-us' . $project_id, 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'nav-contact-us' . $project_id, 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
-                ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'nav-faq' . $project_id, 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'Home', 'url' => 'Home', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'Products', 'url' => 'Products', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'News', 'url' => 'News', 'location' => 'header', 'group_id' => 1, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'ABOUT US', 'url' => 'about-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'Contact Us', 'url' => 'contact-us', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
+                ['project_id' => $project_id, 'name' => 'FAQ', 'url' => 'faq', 'location' => 'footer', 'group_id' => 2, 'created_at' => $created_at, 'updated_at' => $created_at],
             ];
             ];
             DB::connection('custom_mysql')->table('gl_web_nav')->insert($data);
             DB::connection('custom_mysql')->table('gl_web_nav')->insert($data);
         }
         }