gx

@@ -14,10 +14,24 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Devops\ServersLogic;
 use App\Http\Logic\Aside\Devops\ServersLogic;
 use App\Models\Devops\Servers;
 use App\Models\Devops\Servers;
 use App\Models\Devops\Servers as ServersModel;
 use App\Models\Devops\Servers as ServersModel;
+use App\Models\Devops\ServersIp;
 
 
 class ServersController extends BaseController
 class ServersController extends BaseController
 {
 {
     /**
     /**
+     * @remark :获取服务器列表
+     * @name   :serverList
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/24 17:47
+     */
+    public function serverList(){
+        $serversIpModel = new ServersIp();
+        $query = $serversIpModel->leftJoin('gl_servers', 'gl_servers_ip.servers_id', '=', 'gl_servers.id');
+        $query = $query->paginate($this->row, $this->selectParam(), 'page', $this->page)->toArray();
+    }
+
+    /**
      * @remark :服务器列表
      * @remark :服务器列表
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh

@@ -604,7 +604,7 @@ class ProjectController extends BaseController
      * @name   :getServiceConfig
      * @name   :getServiceConfig
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
-     * @time   :2023/8/14 10:23
+     * @time   :2023/8/14 10:23 todo::后面删除
      */
      */
     public function getServiceConfig(){
     public function getServiceConfig(){
         $serviceConfigModel = new ServerConfig();
         $serviceConfigModel = new ServerConfig();

@@ -107,7 +107,8 @@ class RenewProjectController extends BaseController
      * @time   :2023/8/18 14:33
      * @time   :2023/8/18 14:33
      */
      */
     public function notHaveRenewItems(Project $project){
     public function notHaveRenewItems(Project $project){
-        $this->map['extend_type'] = $project::TYPE_FIVE;//未续费网站
+        $this->map['extend_type'] = $project::TYPE_FIVE;//未续费网站        if(!empty($param['search']) && !empty($param['search_type'])){
+        $this->map['title'] = ['like', '%'.$this->map['title'].'title'];
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
         $lists = $project->where($this->map)->with('payment')->with('deploy_build')
             ->with('deploy_optimize')->with('online_check')
             ->with('deploy_optimize')->with('online_check')
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);
             ->with('project_after')->paginate($this->row, ['*'], 'page', $this->page);