合并分支 'akun' 到 'master'

Akun



查看合并请求 !248

@@ -78,6 +78,7 @@ class HtmlLanguageCollect extends Command
             $collect_info->save();
             $collect_info->save();
 
 
             //获取站点正式和测试域名
             //获取站点正式和测试域名
+            //TODO:小语种域名获取英文站的
             $old_info = UpdateOldInfo::getOldDomain($project_id, $collect_info->domain);
             $old_info = UpdateOldInfo::getOldDomain($project_id, $collect_info->domain);
 
 
             //采集html页面，下载资源到本地并替换
             //采集html页面，下载资源到本地并替换

@@ -36,7 +36,7 @@ class UpdateOldInfo extends Model
                 $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
                 $web_url_arr = parse_url($data_config['web_url_domain'] ?? '');
                 $old_domain_online = $web_url_arr['host'] ?? '';
                 $old_domain_online = $web_url_arr['host'] ?? '';
 
 
-                if ($link_type && $old_domain_test && $old_domain_online) {
+                if ($old_domain_test || $old_domain_online) {
                     $info = new self();
                     $info = new self();
                     $info->project_id = $project_id;
                     $info->project_id = $project_id;
                     $info->link_type = $link_type;
                     $info->link_type = $link_type;