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

@@ -139,9 +139,9 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->where('status', '=', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
-            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
+            $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
             if (!$project_info) {
                 continue;
             }
@@ -161,14 +161,20 @@ class DomainInfo extends Command
                 continue;
             }
 
+            if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
+                $type = DomainCreateTask::TYPE_BLOG;
+            } else {
+                $type = DomainCreateTask::TYPE_MAIN;
+            }
+
             //创建更新站点证书任务
-            $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_MAIN, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
             if (!$task_info) {
                 $domainCreateTaskModel->add([
                     'server_id' => $servers_ip_info['servers_id'],
                     'project_id' => $v['project_id'],
                     'domain_id' => $v['id'],
-                    'type' => DomainCreateTask::TYPE_MAIN
+                    'type' => $type
                 ]);
             }
         }
@@ -186,7 +192,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '=', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
             $domain_array = parse_url($v['domain']);
             $host = $domain_array['host'] ?? $domain_array['path'];
@@ -243,7 +249,7 @@ class DomainInfo extends Command
         $serverIpModel = new ServersIp();
         $domainCreateTaskModel = new DomainCreateTask();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
-        $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray();
+        $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
         foreach ($list as $v) {
             $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
             if (!$project_info) {

@@ -786,9 +786,12 @@ class UpdateSeoTdk extends Command
                 Cache::forget($cache_key);
             }
         }
-
+        $a = $text;
         $text = Common::deal_keywords($text);
         $text = Common::deal_str($text);
+        if(!$text){
+            echo getmypid() . ' '  . 'AI生成结果['.$a.']被关键词过滤' . PHP_EOL;
+        }
 
         //包含这写字 重新生成
         if(Str::contains(Str::lower($text), ['[your brand]', '[brand name]'])){

@@ -9,6 +9,7 @@ use App\Models\User\UserLogin as UserLoginModel;
 use Illuminate\Encryption\Encrypter;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 
 /**
  * @name:
@@ -213,18 +214,23 @@ class Common
                 }
                 $keyword = str_replace($str,'',$keyword);
                 $keyword = trim($keyword,'.');
-                if(    (strpos(strtolower($keyword),'hope') === false || strpos(strtolower($keyword),'hopein') !== false)
-                    && (strpos(strtolower($keyword),'remember') === false || strpos(strtolower($keyword),'rememberance') !== false)
-                    && strpos(strtolower($keyword),'help') === false
-                    && strpos(strtolower($keyword),'website') === false
-                    && strpos(strtolower($keyword),'search keywords') === false
-                    && strpos(strtolower($keyword),'here are 8') === false
-                    && strpos(strtolower($keyword),'search keywords') === false
-                    && strpos(strtolower($keyword),'thank you') === false
-                    && (strpos(strtolower($keyword),'thanks') === false || strpos(strtolower($keyword),'thanksgiving') !== false)
-                    && strpos(strtolower($keyword),'copywriter') === false ){
-                    $ar_keywords[] = $keyword;
+
+                if(Str::contains($keyword, ['search keywords', 'here are 8', 'thank you'])){
+                    continue;
+                }
+                $keyword_words = explode(' ', $keyword);
+
+                $is_contains = false;
+                foreach ($keyword_words as $word){
+                    if(in_array($word, ['hope', 'remember', 'help', 'website', 'thanks', 'copywriter'])){
+                        $is_contains = true;
+                        break;
+                    }
+                }
+                if($is_contains){
+                    continue;
                 }
+                $ar_keywords[] = $keyword;
             }
         }
         return implode(', ',$ar_keywords);