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

@@ -108,7 +108,6 @@ class KeywordVideoController extends BaseController
         if($info === false){
         if($info === false){
             $this->response('请先设置域名',Code::SYSTEM_ERROR);
             $this->response('请先设置域名',Code::SYSTEM_ERROR);
         }
         }
-        $this->param['num'] = $this->param['number'];
         $rs = $keywordModel->add($this->param);
         $rs = $keywordModel->add($this->param);
         if($rs === false){
         if($rs === false){
             $this->response('添加失败',Code::SYSTEM_ERROR);
             $this->response('添加失败',Code::SYSTEM_ERROR);

@@ -313,7 +313,7 @@ class NewsController extends BaseController
         ],[
         ],[
             'keyword.required' => 'keyword不能为空',
             'keyword.required' => 'keyword不能为空',
         ]);
         ]);
-        $data = curl_c('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],false);
+        $data = http_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],false);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }