Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -64,7 +64,7 @@ class SendKeyword extends Command
             })
             })
             ->get();
             ->get();
         $time = time();
         $time = time();
-        $send_num = [30 => 1000, 60 => 3000, 90 => 6000];
+        $send_num = [30 => 1000, 50 => 2000, 60 => 4000, 70 => 6000];
         $ban_domain = $this->banDomain();
         $ban_domain = $this->banDomain();
         foreach ($projects as $item) {
         foreach ($projects as $item) {
             if (empty($item->is_auto_keywords))
             if (empty($item->is_auto_keywords))

@@ -51,7 +51,7 @@ class GeneratePage extends Command
     {
     {
         $noticeModel = new NoticeLog();
         $noticeModel = new NoticeLog();
         while (true){
         while (true){
-            $noticeInfo = $noticeModel->read(['status'=>0,'type'=>$noticeModel::GENERATE_PAGE]);
+            $noticeInfo = $noticeModel->read(['status'=>0,'type'=>$noticeModel::GENERATE_PAGE,'start_at'=>['<=',date('Y-m-d H:i:s')]]);
             if (empty($noticeInfo)) {
             if (empty($noticeInfo)) {
                 sleep(10);
                 sleep(10);
                 continue;
                 continue;

@@ -7,6 +7,7 @@ use App\Helper\Common;
 use App\Helper\Gpt;
 use App\Helper\Gpt;
 use App\Models\Ai\AiCommand;
 use App\Models\Ai\AiCommand;
 use App\Models\Ai\AiTdkErrorLog;
 use App\Models\Ai\AiTdkErrorLog;
+use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateNotify;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Mail\Mail;
 use App\Models\Mail\Mail;
@@ -258,7 +259,8 @@ class UpdateSeoTdk extends Command
             'url' => [],
             'url' => [],
             'language'=> [],
             'language'=> [],
         ];
         ];
-        http_post($url, json_encode($param));
+        NoticeLog::createLog(NoticeLog::GENERATE_PAGE, json_encode(['c_url'=>$url,'c_params'=>$param]),date('Y-m-d H:i:s',time()+300));
+//        http_post($url, json_encode($param));
         echo getmypid() . ' '  . '更新中请稍后, 更新完成将会发送站内信通知更新结果！'. PHP_EOL;
         echo getmypid() . ' '  . '更新中请稍后, 更新完成将会发送站内信通知更新结果！'. PHP_EOL;
     }
     }
     public function seo_tdk($project_id, $task_id)
     public function seo_tdk($project_id, $task_id)

@@ -29,13 +29,15 @@ class NoticeLog extends Base
      * 创建日志
      * 创建日志
      * @param $type
      * @param $type
      * @param $data
      * @param $data
+     * @param $start_at
      * @return mixed
      * @return mixed
      */
      */
-    public static function createLog($type, $data)
+    public static function createLog($type, $data,$start_at=0)
     {
     {
         $log = new self();
         $log = new self();
         $log->type = $type;
         $log->type = $type;
         $log->data = $data;
         $log->data = $data;
+        $log->start_at = $start_at ?: date('Y-m-d H:i:s');
         return $log->save();
         return $log->save();
     }
     }