gx

@@ -7,6 +7,7 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Logic\Aside\Domain\DomainInfoLogic;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
 use App\Http\Requests\Aside\Domain\DomainInfoRequest;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Project\Project;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\JsonResponse;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
@@ -30,6 +31,15 @@ class DomainInfoController extends BaseController
             $this->map['domain'] = ['like','%'.$this->map['domain'],'%'];
             $this->map['domain'] = ['like','%'.$this->map['domain'],'%'];
         }
         }
         $lists = $domainModel->lists($this->map,$this->page,$this->row,$this->order);
         $lists = $domainModel->lists($this->map,$this->page,$this->row,$this->order);
+        $projectModel = new Project();
+        if(!empty($lists)){
+            foreach ($lists['list'] as $k => $v){
+                if(!empty($info['project_id'])){
+                    $v['company'] = $projectModel->read(['id'=>$info['project_id']],['title'])['title'];
+                }
+                $lists['list'][$k] = $v;
+            }
+        }
         return $this->response('success', Code::SUCCESS, $lists);
         return $this->response('success', Code::SUCCESS, $lists);
     }
     }
 
 

@@ -35,11 +35,6 @@ class DomainInfoLogic extends BaseLogic
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
         }else{
         }else{
-//            $data = $this->getDomainInfo($this->param['domain']);
-//            if(!empty($data['domain_start_time']) && !empty($data['domain_end_time'])){
-//                $this->param['domain_start_time'] = $data['domain_start_time'];
-//                $this->param['domain_end_time'] = $data['domain_end_time'];
-//            }
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);
         }
         }
         if($rs === false){
         if($rs === false){
@@ -48,14 +43,6 @@ class DomainInfoLogic extends BaseLogic
         return $this->success();
         return $this->success();
     }
     }
 
 
-    public function getDomainInfo($domain)
-    {
-        // 获取域名的开始时间
-        $data['domain_start_time'] = Carbon::parse(dns_get_record($domain, DNS_TXT)['0']['entries']['0'])->toDateTimeString();
-        // 获取域名的到期时间
-        $data['domain_end_time'] = Carbon::parse(dns_get_record($domain, DNS_TXT)['1']['entries']['0'])->toDateTimeString();
-        return $this->success($data);
-    }
 
 
     /**
     /**
      * @remark :验证域名是否存在
      * @remark :验证域名是否存在
@@ -144,31 +131,6 @@ class DomainInfoLogic extends BaseLogic
 
 
 
 
 
 
-    /**
-     * 域名到期时间
-     * @param $domain
-     * @return array
-     * @throws GuzzleException
-     */
-    public function getDomainTime($domain)
-    {
-        $url    = "http://openai.waimaoq.com/v1/whois_api?domain={$domain}";
-        $client = new Client(['verify' => false]);
-        $http   = $client->get($url);
-        $data   = [];
-        if ($http->getStatusCode() != 200) {
-            return $data;
-        }
-        $content = $http->getBody()->getContents();
-        $json    = json_decode($content, true);
-        if ($json['code'] == 200) {
-            $con               = $json['text'];
-            $data['domain']    = $domain;
-            $data['validFrom'] = $con['creation_date'];
-            $data['validTo']   = $con['expiration_date'];
-        }
-        return $data;
-    }
 
 
 
 
 }
 }