gx

@@ -79,7 +79,6 @@ class ServersController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'server_name'=>'required',
             'server_name'=>'required',
             'service_type'=>'required',
             'service_type'=>'required',
-            'total'=>'required',
             'account'=>'required',
             'account'=>'required',
             'password'=>'required',
             'password'=>'required',
             'port'=>'required',
             'port'=>'required',
@@ -88,7 +87,6 @@ class ServersController extends BaseController
         ],[
         ],[
             'server_name.required' => '服务器名称server_name不能为空',
             'server_name.required' => '服务器名称server_name不能为空',
             'service_type.required' => '服务器类型不能为空',
             'service_type.required' => '服务器类型不能为空',
-            'total.required' => '总数不能为空',
             'account.required' => '账号不能为空',
             'account.required' => '账号不能为空',
             'password.required' => '密码不能为空',
             'password.required' => '密码不能为空',
             'port.required' => '端口不能为空',
             'port.required' => '端口不能为空',

@@ -158,13 +158,13 @@ class ServersIpController extends BaseController
         ]);
         ]);
         $serverModel = new Servers();
         $serverModel = new Servers();
         $info = $serverModel->read(['id'=>$this->map['servers_id']]);
         $info = $serverModel->read(['id'=>$this->map['servers_id']]);
-        $data[] = ['记录类型','主机记录','解析线路','记录值','MAX优先级','TTL值','状态(暂停/启用)','备注'];
+        $data[] = [];
         $serversIpModel = new ServersIpModel();
         $serversIpModel = new ServersIpModel();
         $list = $serversIpModel->list($this->map);
         $list = $serversIpModel->list($this->map);
         foreach ($list as $v){
         foreach ($list as $v){
             $position = strpos($v['domain'], '.');
             $position = strpos($v['domain'], '.');
             $result = substr($v['domain'], 0, $position);
             $result = substr($v['domain'], 0, $position);
-            $data[] = ['A',$result,'默认',$v['ip'],'',600,'启用',$info['server_name']];
+            $data[] = ['记录类型'=>'A','主机记录'=>$result,'解析线路'=>'默认','记录值'=>$v['ip'],'MAX优先级'=>'','TTL值'=>600,'状态(暂停/启用)'=>'启用','备注'=>$info['server_name']];
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }

@@ -198,9 +198,6 @@ class ProjectLogic extends BaseLogic
         }
         }
         $info = $serversIpModel->read(['id'=>$servers_id]);
         $info = $serversIpModel->read(['id'=>$servers_id]);
         $serversInfo = $serversModel->read(['id'=>$info['servers_id']]);
         $serversInfo = $serversModel->read(['id'=>$info['servers_id']]);
-        if($serversInfo['being_number'] >= $serversInfo['total']){
-            $this->fail('请选择其他服务器,当前服务器已满');
-        }
         $project_arr = [];
         $project_arr = [];
         if(!empty(trim($info['project_arr'],','))){
         if(!empty(trim($info['project_arr'],','))){
             $project_arr = explode(',',trim($info['project_arr'],','));
             $project_arr = explode(',',trim($info['project_arr'],','));