|
...
|
...
|
@@ -14,6 +14,7 @@ use App\Http\Controllers\Aside\BaseController; |
|
|
|
use App\Http\Logic\Aside\Devops\ServersLogic;
|
|
|
|
use App\Models\Devops\Servers as ServersModel;
|
|
|
|
use App\Models\Devops\ServersIp;
|
|
|
|
use App\Models\Project\Project;
|
|
|
|
|
|
|
|
class ServersController extends BaseController
|
|
|
|
{
|
|
...
|
...
|
@@ -46,6 +47,18 @@ class ServersController extends BaseController |
|
|
|
if(isset($this->map['server_name']) && !empty($this->map['server_name'])){
|
|
|
|
$this->map['server_name'] = ['like','%'.$this->map['server_name'].'%'];
|
|
|
|
}
|
|
|
|
if(isset($this->map['project_name']) && !empty($this->map['project_name'])){
|
|
|
|
$projectModel = new Project();
|
|
|
|
$projectInfo = $projectModel->read(['title'=>['like','%'.$this->map['project_name'].'%']],['id','serve_id']);
|
|
|
|
if($projectInfo !== false){
|
|
|
|
$serversIpModel = new ServersIp();
|
|
|
|
$ipInfo = $serversIpModel->read(['id'=>$projectInfo['serve_id']],['servers_id']);
|
|
|
|
if($ipInfo !== false){
|
|
|
|
$this->map['id'] = $ipInfo['servers_id'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unset($this->map['project_name']);
|
|
|
|
}
|
|
|
|
$serversModel = new ServersModel();
|
|
|
|
$data = $serversModel->lists($this->map,$this->page,$this->row,$this->order);
|
|
|
|
$this->response('success',Code::SUCCESS,$data);
|
...
|
...
|
|