|
...
|
...
|
@@ -20,6 +20,7 @@ use App\Models\Com\UpdateLog; |
|
|
|
use App\Models\Devops\ServerConfig;
|
|
|
|
use App\Models\Devops\ServersIp;
|
|
|
|
use App\Models\Domain\DomainCreateTask;
|
|
|
|
use App\Models\Domain\DomainInfo;
|
|
|
|
use App\Models\Domain\DomainInfo as DomainInfoModel;
|
|
|
|
use App\Models\Geo\GeoArticle;
|
|
|
|
use App\Models\Geo\GeoConf;
|
|
...
|
...
|
@@ -225,7 +226,7 @@ class ProjectController extends BaseController |
|
|
|
if($this->map['domain_type'] == 'domain'){
|
|
|
|
$parsedUrl = parse_url($this->map['domain_search']);
|
|
|
|
$this->map['domain_search'] = $parsedUrl['host'] ?? $this->map['domain_search'];
|
|
|
|
$ids = DomainInfo::where('domain', 'like', '%'.$this->map['domain_search'].'%')->pluck('id')->toArray();
|
|
|
|
$ids = DomainInfoModel::where('domain', 'like', '%'.$this->map['domain_search'].'%')->pluck('id')->toArray();
|
|
|
|
$query->whereIn('gl_project_deploy_optimize.domain', $ids);
|
|
|
|
}else{
|
|
|
|
$query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['domain_search'].'%');
|
...
|
...
|
|