周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 431d58ed23fbcf834aa2475df4fe760e097900c2 1 个父辈 dceab6af

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 54 行增加 和 18 行删除
@@ -279,7 +279,7 @@ class HtmlCollect extends Command @@ -279,7 +279,7 @@ class HtmlCollect extends Command
279 foreach ($img as $vi) { 279 foreach ($img as $vi) {
280 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url); 280 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
281 if ($check_vi && (!in_array($check_vi, $source))) { 281 if ($check_vi && (!in_array($check_vi, $source))) {
282 - $check_vi && $source[] = $check_vi; 282 + $source[] = $check_vi;
283 } 283 }
284 } 284 }
285 285
@@ -289,7 +289,7 @@ class HtmlCollect extends Command @@ -289,7 +289,7 @@ class HtmlCollect extends Command
289 foreach ($js as $vj) { 289 foreach ($js as $vj) {
290 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url); 290 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
291 if ($check_vj && (!in_array($check_vj, $source))) { 291 if ($check_vj && (!in_array($check_vj, $source))) {
292 - $check_vj && $source[] = $check_vj; 292 + $source[] = $check_vj;
293 } 293 }
294 } 294 }
295 295
@@ -299,7 +299,15 @@ class HtmlCollect extends Command @@ -299,7 +299,15 @@ class HtmlCollect extends Command
299 foreach ($video as $vv) { 299 foreach ($video as $vv) {
300 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url); 300 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
301 if ($check_vv && (!in_array($check_vv, $source))) { 301 if ($check_vv && (!in_array($check_vv, $source))) {
302 - $check_vv && $source[] = $check_vv; 302 + $source[] = $check_vv;
  303 + }
  304 + }
  305 + preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
  306 + $video_2 = $result_video_2[2] ?? [];
  307 + foreach ($video_2 as $vv2) {
  308 + $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
  309 + if ($check_vv2 && (!in_array($check_vv2, $source))) {
  310 + $source[] = $check_vv2;
303 } 311 }
304 } 312 }
305 313
@@ -309,7 +317,7 @@ class HtmlCollect extends Command @@ -309,7 +317,7 @@ class HtmlCollect extends Command
309 foreach ($css as $vc) { 317 foreach ($css as $vc) {
310 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url); 318 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
311 if ($check_vc && (!in_array($check_vc, $source))) { 319 if ($check_vc && (!in_array($check_vc, $source))) {
312 - $check_vc && $source[] = $check_vc; 320 + $source[] = $check_vc;
313 } 321 }
314 } 322 }
315 323
@@ -319,7 +327,7 @@ class HtmlCollect extends Command @@ -319,7 +327,7 @@ class HtmlCollect extends Command
319 foreach ($css_b as $vc_b) { 327 foreach ($css_b as $vc_b) {
320 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url); 328 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
321 if ($check_vc_b && (!in_array($check_vc_b, $source))) { 329 if ($check_vc_b && (!in_array($check_vc_b, $source))) {
322 - $check_vc_b && $source[] = $check_vc_b; 330 + $source[] = $check_vc_b;
323 } 331 }
324 } 332 }
325 333
@@ -329,7 +337,7 @@ class HtmlCollect extends Command @@ -329,7 +337,7 @@ class HtmlCollect extends Command
329 foreach ($down as $vd) { 337 foreach ($down as $vd) {
330 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url); 338 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
331 if ($check_vd && (!in_array($check_vd, $source))) { 339 if ($check_vd && (!in_array($check_vd, $source))) {
332 - $check_vd && $source[] = $check_vd; 340 + $source[] = $check_vd;
333 } 341 }
334 } 342 }
335 343
@@ -282,7 +282,9 @@ class HtmlCustomCollect extends Command @@ -282,7 +282,9 @@ class HtmlCustomCollect extends Command
282 $img = $result_img[2] ?? []; 282 $img = $result_img[2] ?? [];
283 foreach ($img as $vi) { 283 foreach ($img as $vi) {
284 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url); 284 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
285 - $check_vi && $source[] = $check_vi; 285 + if ($check_vi && (!in_array($check_vi, $source))) {
  286 + $source[] = $check_vi;
  287 + }
286 } 288 }
287 289
288 //js 290 //js
@@ -290,7 +292,9 @@ class HtmlCustomCollect extends Command @@ -290,7 +292,9 @@ class HtmlCustomCollect extends Command
290 $js = $result_js[2] ?? []; 292 $js = $result_js[2] ?? [];
291 foreach ($js as $vj) { 293 foreach ($js as $vj) {
292 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url); 294 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
293 - $check_vj && $source[] = $check_vj; 295 + if ($check_vj && (!in_array($check_vj, $source))) {
  296 + $source[] = $check_vj;
  297 + }
294 } 298 }
295 299
296 //video 300 //video
@@ -298,7 +302,17 @@ class HtmlCustomCollect extends Command @@ -298,7 +302,17 @@ class HtmlCustomCollect extends Command
298 $video = $result_video[2] ?? []; 302 $video = $result_video[2] ?? [];
299 foreach ($video as $vv) { 303 foreach ($video as $vv) {
300 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url); 304 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
301 - $check_vv && $source[] = $check_vv; 305 + if ($check_vv && (!in_array($check_vv, $source))) {
  306 + $source[] = $check_vv;
  307 + }
  308 + }
  309 + preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
  310 + $video_2 = $result_video_2[2] ?? [];
  311 + foreach ($video_2 as $vv2) {
  312 + $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
  313 + if ($check_vv2 && (!in_array($check_vv2, $source))) {
  314 + $source[] = $check_vv2;
  315 + }
302 } 316 }
303 317
304 //css 318 //css
@@ -306,7 +320,9 @@ class HtmlCustomCollect extends Command @@ -306,7 +320,9 @@ class HtmlCustomCollect extends Command
306 $css = $result_css[2] ?? []; 320 $css = $result_css[2] ?? [];
307 foreach ($css as $vc) { 321 foreach ($css as $vc) {
308 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url); 322 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
309 - $check_vc && $source[] = $check_vc; 323 + if ($check_vc && (!in_array($check_vc, $source))) {
  324 + $source[] = $check_vc;
  325 + }
310 } 326 }
311 327
312 //css background 328 //css background
@@ -314,7 +330,9 @@ class HtmlCustomCollect extends Command @@ -314,7 +330,9 @@ class HtmlCustomCollect extends Command
314 $css_b = $result_css_b[1] ?? []; 330 $css_b = $result_css_b[1] ?? [];
315 foreach ($css_b as $vc_b) { 331 foreach ($css_b as $vc_b) {
316 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url); 332 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
317 - $check_vc_b && $source[] = $check_vc_b; 333 + if ($check_vc_b && (!in_array($check_vc_b, $source))) {
  334 + $source[] = $check_vc_b;
  335 + }
318 } 336 }
319 337
320 //a标签下载资源 338 //a标签下载资源
@@ -322,7 +340,9 @@ class HtmlCustomCollect extends Command @@ -322,7 +340,9 @@ class HtmlCustomCollect extends Command
322 $down = $result_a[2] ?? []; 340 $down = $result_a[2] ?? [];
323 foreach ($down as $vd) { 341 foreach ($down as $vd) {
324 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url); 342 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
325 - $check_vd && $source[] = $check_vd; 343 + if ($check_vd && (!in_array($check_vd, $source))) {
  344 + $source[] = $check_vd;
  345 + }
326 } 346 }
327 347
328 return $source; 348 return $source;
@@ -219,7 +219,7 @@ class HtmlLanguageCollect extends Command @@ -219,7 +219,7 @@ class HtmlLanguageCollect extends Command
219 foreach ($img as $vi) { 219 foreach ($img as $vi) {
220 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url); 220 $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
221 if ($check_vi && (!in_array($check_vi, $source))) { 221 if ($check_vi && (!in_array($check_vi, $source))) {
222 - $check_vi && $source[] = $check_vi; 222 + $source[] = $check_vi;
223 } 223 }
224 } 224 }
225 225
@@ -229,7 +229,7 @@ class HtmlLanguageCollect extends Command @@ -229,7 +229,7 @@ class HtmlLanguageCollect extends Command
229 foreach ($js as $vj) { 229 foreach ($js as $vj) {
230 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url); 230 $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
231 if ($check_vj && (!in_array($check_vj, $source))) { 231 if ($check_vj && (!in_array($check_vj, $source))) {
232 - $check_vj && $source[] = $check_vj; 232 + $source[] = $check_vj;
233 } 233 }
234 } 234 }
235 235
@@ -239,7 +239,15 @@ class HtmlLanguageCollect extends Command @@ -239,7 +239,15 @@ class HtmlLanguageCollect extends Command
239 foreach ($video as $vv) { 239 foreach ($video as $vv) {
240 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url); 240 $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
241 if ($check_vv && (!in_array($check_vv, $source))) { 241 if ($check_vv && (!in_array($check_vv, $source))) {
242 - $check_vv && $source[] = $check_vv; 242 + $source[] = $check_vv;
  243 + }
  244 + }
  245 + preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
  246 + $video_2 = $result_video_2[2] ?? [];
  247 + foreach ($video_2 as $vv2) {
  248 + $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
  249 + if ($check_vv2 && (!in_array($check_vv2, $source))) {
  250 + $source[] = $check_vv2;
243 } 251 }
244 } 252 }
245 253
@@ -249,7 +257,7 @@ class HtmlLanguageCollect extends Command @@ -249,7 +257,7 @@ class HtmlLanguageCollect extends Command
249 foreach ($css as $vc) { 257 foreach ($css as $vc) {
250 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url); 258 $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
251 if ($check_vc && (!in_array($check_vc, $source))) { 259 if ($check_vc && (!in_array($check_vc, $source))) {
252 - $check_vc && $source[] = $check_vc; 260 + $source[] = $check_vc;
253 } 261 }
254 } 262 }
255 263
@@ -259,7 +267,7 @@ class HtmlLanguageCollect extends Command @@ -259,7 +267,7 @@ class HtmlLanguageCollect extends Command
259 foreach ($css_b as $vc_b) { 267 foreach ($css_b as $vc_b) {
260 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url); 268 $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
261 if ($check_vc_b && (!in_array($check_vc_b, $source))) { 269 if ($check_vc_b && (!in_array($check_vc_b, $source))) {
262 - $check_vc_b && $source[] = $check_vc_b; 270 + $source[] = $check_vc_b;
263 } 271 }
264 } 272 }
265 273
@@ -269,7 +277,7 @@ class HtmlLanguageCollect extends Command @@ -269,7 +277,7 @@ class HtmlLanguageCollect extends Command
269 foreach ($down as $vd) { 277 foreach ($down as $vd) {
270 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url); 278 $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
271 if ($check_vd && (!in_array($check_vd, $source))) { 279 if ($check_vd && (!in_array($check_vd, $source))) {
272 - $check_vd && $source[] = $check_vd; 280 + $source[] = $check_vd;
273 } 281 }
274 } 282 }
275 283