周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 6c66885755ad6113ba09431dac1637782b1263ac 2 个父辈 37f8e474 6617e869

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 33 行增加 和 18 行删除
@@ -139,9 +139,9 @@ class DomainInfo extends Command @@ -139,9 +139,9 @@ class DomainInfo extends Command
139 $serverIpModel = new ServersIp(); 139 $serverIpModel = new ServersIp();
140 $domainCreateTaskModel = new DomainCreateTask(); 140 $domainCreateTaskModel = new DomainCreateTask();
141 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 141 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
142 - $list = $domainModel->where('status', '=', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 142 + $list = $domainModel->where('status', '=', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
143 foreach ($list as $v) { 143 foreach ($list as $v) {
144 - $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']); 144 + $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id', 'project_type']);
145 if (!$project_info) { 145 if (!$project_info) {
146 continue; 146 continue;
147 } 147 }
@@ -161,14 +161,20 @@ class DomainInfo extends Command @@ -161,14 +161,20 @@ class DomainInfo extends Command
161 continue; 161 continue;
162 } 162 }
163 163
  164 + if ($project_info['project_type'] == Project::PROJECT_TYPE_SEO) {
  165 + $type = DomainCreateTask::TYPE_BLOG;
  166 + } else {
  167 + $type = DomainCreateTask::TYPE_MAIN;
  168 + }
  169 +
164 //创建更新站点证书任务 170 //创建更新站点证书任务
165 - $task_info = $domainCreateTaskModel->read(['type' => DomainCreateTask::TYPE_MAIN, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]); 171 + $task_info = $domainCreateTaskModel->read(['type' => $type, 'domain_id' => $v['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
166 if (!$task_info) { 172 if (!$task_info) {
167 $domainCreateTaskModel->add([ 173 $domainCreateTaskModel->add([
168 'server_id' => $servers_ip_info['servers_id'], 174 'server_id' => $servers_ip_info['servers_id'],
169 'project_id' => $v['project_id'], 175 'project_id' => $v['project_id'],
170 'domain_id' => $v['id'], 176 'domain_id' => $v['id'],
171 - 'type' => DomainCreateTask::TYPE_MAIN 177 + 'type' => $type
172 ]); 178 ]);
173 } 179 }
174 } 180 }
@@ -186,7 +192,7 @@ class DomainInfo extends Command @@ -186,7 +192,7 @@ class DomainInfo extends Command
186 $serverIpModel = new ServersIp(); 192 $serverIpModel = new ServersIp();
187 $domainCreateTaskModel = new DomainCreateTask(); 193 $domainCreateTaskModel = new DomainCreateTask();
188 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 194 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
189 - $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '!=', 2)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray(); 195 + $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where('amp_type', '=', 1)->where('amp_certificate_end_time', '<', $end_day)->get()->toArray();
190 foreach ($list as $v) { 196 foreach ($list as $v) {
191 $domain_array = parse_url($v['domain']); 197 $domain_array = parse_url($v['domain']);
192 $host = $domain_array['host'] ?? $domain_array['path']; 198 $host = $domain_array['host'] ?? $domain_array['path'];
@@ -243,7 +249,7 @@ class DomainInfo extends Command @@ -243,7 +249,7 @@ class DomainInfo extends Command
243 $serverIpModel = new ServersIp(); 249 $serverIpModel = new ServersIp();
244 $domainCreateTaskModel = new DomainCreateTask(); 250 $domainCreateTaskModel = new DomainCreateTask();
245 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期 251 $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
246 - $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '!=', 2)->where('certificate_end_time', '<', $end_day)->get()->toArray(); 252 + $list = $customModel->where('status', 1)->where('is_create', 1)->where('type', '=', 1)->where('certificate_end_time', '<', $end_day)->get()->toArray();
247 foreach ($list as $v) { 253 foreach ($list as $v) {
248 $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']); 254 $project_info = $projectModel->read(['id' => $v['project_id'], 'type' => ['!=', Project::TYPE_CLOSE]], ['serve_id']);
249 if (!$project_info) { 255 if (!$project_info) {
@@ -786,9 +786,12 @@ class UpdateSeoTdk extends Command @@ -786,9 +786,12 @@ class UpdateSeoTdk extends Command
786 Cache::forget($cache_key); 786 Cache::forget($cache_key);
787 } 787 }
788 } 788 }
789 - 789 + $a = $text;
790 $text = Common::deal_keywords($text); 790 $text = Common::deal_keywords($text);
791 $text = Common::deal_str($text); 791 $text = Common::deal_str($text);
  792 + if(!$text){
  793 + echo getmypid() . ' ' . 'AI生成结果['.$a.']被关键词过滤' . PHP_EOL;
  794 + }
792 795
793 //包含这写字 重新生成 796 //包含这写字 重新生成
794 if(Str::contains(Str::lower($text), ['[your brand]', '[brand name]'])){ 797 if(Str::contains(Str::lower($text), ['[your brand]', '[brand name]'])){
@@ -9,6 +9,7 @@ use App\Models\User\UserLogin as UserLoginModel; @@ -9,6 +9,7 @@ use App\Models\User\UserLogin as UserLoginModel;
9 use Illuminate\Encryption\Encrypter; 9 use Illuminate\Encryption\Encrypter;
10 use Illuminate\Support\Facades\Cache; 10 use Illuminate\Support\Facades\Cache;
11 use Illuminate\Support\Facades\Http; 11 use Illuminate\Support\Facades\Http;
  12 +use Illuminate\Support\Str;
12 13
13 /** 14 /**
14 * @name: 15 * @name:
@@ -213,18 +214,23 @@ class Common @@ -213,18 +214,23 @@ class Common
213 } 214 }
214 $keyword = str_replace($str,'',$keyword); 215 $keyword = str_replace($str,'',$keyword);
215 $keyword = trim($keyword,'.'); 216 $keyword = trim($keyword,'.');
216 - if( (strpos(strtolower($keyword),'hope') === false || strpos(strtolower($keyword),'hopein') !== false)  
217 - && (strpos(strtolower($keyword),'remember') === false || strpos(strtolower($keyword),'rememberance') !== false)  
218 - && strpos(strtolower($keyword),'help') === false  
219 - && strpos(strtolower($keyword),'website') === false  
220 - && strpos(strtolower($keyword),'search keywords') === false  
221 - && strpos(strtolower($keyword),'here are 8') === false  
222 - && strpos(strtolower($keyword),'search keywords') === false  
223 - && strpos(strtolower($keyword),'thank you') === false  
224 - && (strpos(strtolower($keyword),'thanks') === false || strpos(strtolower($keyword),'thanksgiving') !== false)  
225 - && strpos(strtolower($keyword),'copywriter') === false ){  
226 - $ar_keywords[] = $keyword; 217 +
  218 + if(Str::contains($keyword, ['search keywords', 'here are 8', 'thank you'])){
  219 + continue;
  220 + }
  221 + $keyword_words = explode(' ', $keyword);
  222 +
  223 + $is_contains = false;
  224 + foreach ($keyword_words as $word){
  225 + if(in_array($word, ['hope', 'remember', 'help', 'website', 'thanks', 'copywriter'])){
  226 + $is_contains = true;
  227 + break;
  228 + }
  229 + }
  230 + if($is_contains){
  231 + continue;
227 } 232 }
  233 + $ar_keywords[] = $keyword;
228 } 234 }
229 } 235 }
230 return implode(', ',$ar_keywords); 236 return implode(', ',$ar_keywords);