Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop
正在显示
2 个修改的文件
包含
16 行增加
和
6 行删除
| @@ -353,9 +353,11 @@ class HtmlCollect extends Command | @@ -353,9 +353,11 @@ class HtmlCollect extends Command | ||
| 353 | //相对路径 | 353 | //相对路径 |
| 354 | $url_arr = explode('/', $vs['url']); | 354 | $url_arr = explode('/', $vs['url']); |
| 355 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 355 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); |
| 356 | - $vjs = implode('/', $url_arr); | 356 | + $vjs_down = implode('/', $url_arr); |
| 357 | + } else { | ||
| 358 | + $vjs_down = $vjs; | ||
| 357 | } | 359 | } |
| 358 | - $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url); | 360 | + $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); |
| 359 | if (!$vjs_result) { | 361 | if (!$vjs_result) { |
| 360 | continue; | 362 | continue; |
| 361 | } | 363 | } |
| @@ -402,8 +404,11 @@ class HtmlCollect extends Command | @@ -402,8 +404,11 @@ class HtmlCollect extends Command | ||
| 402 | $url_arr = explode('/', $vs['url']); | 404 | $url_arr = explode('/', $vs['url']); |
| 403 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 405 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); |
| 404 | $vjs = implode('/', $url_arr); | 406 | $vjs = implode('/', $url_arr); |
| 407 | + $vjs_down = implode('/', $url_arr); | ||
| 408 | + } else { | ||
| 409 | + $vjs_down = $vjs; | ||
| 405 | } | 410 | } |
| 406 | - $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url); | 411 | + $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); |
| 407 | if (!$vjs_result) { | 412 | if (!$vjs_result) { |
| 408 | continue; | 413 | continue; |
| 409 | } | 414 | } |
| @@ -354,8 +354,11 @@ class HtmlLanguageCollect extends Command | @@ -354,8 +354,11 @@ class HtmlLanguageCollect extends Command | ||
| 354 | $url_arr = explode('/', $vs['url']); | 354 | $url_arr = explode('/', $vs['url']); |
| 355 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 355 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); |
| 356 | $vjs = implode('/', $url_arr); | 356 | $vjs = implode('/', $url_arr); |
| 357 | + $vjs_down = implode('/', $url_arr); | ||
| 358 | + } else { | ||
| 359 | + $vjs_down = $vjs; | ||
| 357 | } | 360 | } |
| 358 | - $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url); | 361 | + $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); |
| 359 | if (!$vjs_result) { | 362 | if (!$vjs_result) { |
| 360 | continue; | 363 | continue; |
| 361 | } | 364 | } |
| @@ -401,9 +404,11 @@ class HtmlLanguageCollect extends Command | @@ -401,9 +404,11 @@ class HtmlLanguageCollect extends Command | ||
| 401 | //相对路径 | 404 | //相对路径 |
| 402 | $url_arr = explode('/', $vs['url']); | 405 | $url_arr = explode('/', $vs['url']); |
| 403 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 406 | $url_arr[count($url_arr) - 1] = substr($vjs, 2); |
| 404 | - $vjs = implode('/', $url_arr); | 407 | + $vjs_down = implode('/', $url_arr); |
| 408 | + } else { | ||
| 409 | + $vjs_down = $vjs; | ||
| 405 | } | 410 | } |
| 406 | - $vjs_result = $this->url_check($vjs, $project_id, $domain, $web_url_domain, $home_url); | 411 | + $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); |
| 407 | if (!$vjs_result) { | 412 | if (!$vjs_result) { |
| 408 | continue; | 413 | continue; |
| 409 | } | 414 | } |
-
请 注册 或 登录 后发表评论