作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !58
... ... @@ -226,12 +226,23 @@ class HtmlCollect extends Command
$path = $arr['path'] ?? '';
$query = $arr['query'] ?? '';
if (
(strpos($host, '.globalso.') === false) &&
(strpos($host, '.goodao.') === false) &&
$path && (strpos($path, '.') !== false)
) {
$web_url_domain = $domain;
$home_url = $domain;
$url_web_config = 'https://' . $domain . '/wp-content/cache/user_config.text';
$data_config = http_get($url_web_config, ['charset' => 'UTF-8']);
if ($data_config) {
$web_url_arr = parse_url($data_config['web_url_domain']);
if (isset($web_url_arr['host'])) {
$web_url_domain = $web_url_arr['host'];
}
$home_url_arr = parse_url($data_config['home_url']);
if (isset($home_url_arr['host'])) {
$home_url = $home_url_arr['host'];
}
}
if (empty($host) || $host == $web_url_domain || $host == $home_url) {
$source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
if (!$source) {
return [
... ...
... ... @@ -226,12 +226,23 @@ class HtmlLanguageCollect extends Command
$path = $arr['path'] ?? '';
$query = $arr['query'] ?? '';
if (
(strpos($host, '.globalso.') === false) &&
(strpos($host, '.goodao.') === false) &&
$path && (strpos($path, '.') !== false)
) {
$web_url_domain = $domain;
$home_url = $domain;
$url_web_config = 'https://' . $domain . '/wp-content/cache/user_config.text';
$data_config = http_get($url_web_config, ['charset' => 'UTF-8']);
if ($data_config) {
$web_url_arr = parse_url($data_config['web_url_domain']);
if (isset($web_url_arr['host'])) {
$web_url_domain = $web_url_arr['host'];
}
$home_url_arr = parse_url($data_config['home_url']);
if (isset($home_url_arr['host'])) {
$home_url = $home_url_arr['host'];
}
}
if (empty($host) || $host == $web_url_domain || $host == $home_url) {
$source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
if (!$source) {
return [
... ...