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

@@ -786,9 +786,12 @@ class UpdateSeoTdk extends Command
                 Cache::forget($cache_key);
                 Cache::forget($cache_key);
             }
             }
         }
         }
-
+        $a = $text;
         $text = Common::deal_keywords($text);
         $text = Common::deal_keywords($text);
         $text = Common::deal_str($text);
         $text = Common::deal_str($text);
+        if(!$text){
+            echo getmypid() . ' '  . 'AI生成结果['.$a.']被关键词过滤' . PHP_EOL;
+        }
 
 
         //包含这写字 重新生成
         //包含这写字 重新生成
         if(Str::contains(Str::lower($text), ['[your brand]', '[brand name]'])){
         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\Encryption\Encrypter;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 
 
 /**
 /**
  * @name:
  * @name:
@@ -213,19 +214,24 @@ class Common
                 }
                 }
                 $keyword = str_replace($str,'',$keyword);
                 $keyword = str_replace($str,'',$keyword);
                 $keyword = trim($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);
         return implode(', ',$ar_keywords);
     }
     }

@@ -46,7 +46,7 @@ class OptimizeCheckLog extends Base
             $param['images'] = Arr::a2s($param['images'] ?? []);
             $param['images'] = Arr::a2s($param['images'] ?? []);
         }
         }
         $param['operator_id'] = $manage_id;
         $param['operator_id'] = $manage_id;
-        $param['date'] = date('Y-m-d H:i:s');
+        $param['date'] = $param['date'] ?? date('Y-m-d H:i:s');
         return $param;
         return $param;
     }
     }
 }
 }