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

@@ -68,7 +68,9 @@ class UpdateRoute extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        return $this->getAiBlog();
+        ProjectServer::useProject(1181);
+        return $this->setProductKeyword();
+        DB::disconnect('custom_mysql');
     }
     }
 
 
     /**
     /**
@@ -299,18 +301,18 @@ class UpdateRoute extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-//                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
-//                    $route = $this->setRoute($v['route'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
+                    $route = $this->setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     continue;
                     continue;
                 }else{
                 }else{
-                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
-                    $route = Translate::tran($v['title'], 'en');
-                    if(!empty($route)){
-                        echo date('Y-m-d H:i:s') . $route . PHP_EOL;
-                        $route = $this->setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }
+//                    echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
+//                    $route = Translate::tran($v['title'], 'en');
+//                    if(!empty($route)){
+//                        echo date('Y-m-d H:i:s') . $route . PHP_EOL;
+//                        $route = $this->setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }
                 }
                 }
             }
             }
         }
         }
@@ -372,7 +374,7 @@ class UpdateRoute extends Command
             }
             }
         }
         }
         $route = $sign.$suffix;
         $route = $sign.$suffix;
-        while(RouteMap::isExist($route, $source_id, $project_id)){
+        while(RouteMap::isExist($route, $source_id, $project_id,$source)){
             $route = $sign .'-'.$i.$suffix;
             $route = $sign .'-'.$i.$suffix;
             $i++;
             $i++;
         }
         }

@@ -35,7 +35,6 @@ class UpdateKeyword extends Command
 
 
 
 
     public function handle(){
     public function handle(){
-        dd(1111);
         while (true){
         while (true){
             $keywordPageModel = new KeywordPage();
             $keywordPageModel = new KeywordPage();
             $lists = $keywordPageModel->list(['status'=>0]);
             $lists = $keywordPageModel->list(['status'=>0]);

@@ -52,7 +52,7 @@ class PrivateController extends BaseController
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->where('gl_project.type', Project::TYPE_TWO)
             ->where('gl_project.type', Project::TYPE_TWO)
-            ->where('gl_project,project_type',Project::TYPE_ZERO)
+            ->where('gl_project.project_type',Project::TYPE_ZERO)
             ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制
             ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制
             ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
             ->where('gl_project.delete_status', Project::IS_DEL_FALSE)
             ->where(function ($subQuery) {
             ->where(function ($subQuery) {

@@ -347,10 +347,11 @@ class KeywordController extends BaseController
      */
      */
     public function sendComment(KeywordLogic $logic){
     public function sendComment(KeywordLogic $logic){
         $this->request->validate([
         $this->request->validate([
-            'count'=>'required|max:10',
-        ],[
+            'count' => 'required|integer|max:100',
+        ], [
             'count.required' => '生成条数不能为空',
             'count.required' => '生成条数不能为空',
-            'count.max'=>'count最大10',
+            'count.integer' => '生成条数必须是整数',
+            'count.max' => '生成条数最大不能超过100',
         ]);
         ]);
         $data = $logic->sendComment();
         $data = $logic->sendComment();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);