Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -171,11 +171,13 @@ class ServersIpController extends BaseController
         $serversIpModel = new ServersIpModel();
         $serversIpModel = new ServersIpModel();
         $this->map['status'] = 0;
         $this->map['status'] = 0;
         $list = $serversIpModel->list($this->map);
         $list = $serversIpModel->list($this->map);
+        if(!empty($list)){
             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'],'MAX优先级'=>'','TTL值'=>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);
     }
     }
 }
 }

@@ -220,7 +220,7 @@ class RankDataController extends BaseController
             $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param);
             $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param);
             if ($res) {
             if ($res) {
                 $res = Arr::s2a($res);
                 $res = Arr::s2a($res);
-                $data['position'] = $res['position'];
+                $data['position'] = $res['position'] ?? '';
             }
             }
         }
         }
 
 

@@ -82,6 +82,13 @@ class ServersIpLogic extends BaseLogic
             if(empty($v)){
             if(empty($v)){
                 continue;
                 continue;
             }
             }
+            $ipInfo = $this->model->read(['ip'=>$v]);
+            if($ipInfo !== false){
+                if($ipInfo['status'] == 1){
+                    $this->model->edit(['status'=>0],['id'=>$ipInfo['id']]);
+                }
+                continue;
+            }
             $param = [
             $param = [
                 'ip'=>$v,
                 'ip'=>$v,
                 'domain'=>ip_to_unique_string($v).'.'.$info['domain'],
                 'domain'=>ip_to_unique_string($v).'.'.$info['domain'],