添加getter and setter

Author: 李仕鹏

CurlHttp.php

@@ -21,29 +21,45 @@ class CurlHttp extends Component
  'User-Agent' => 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1',
  'Accept-Charset' => 'GBK,utf-8' ,
  );
- 
+ 
+ private static $methodDesc = [
+ self::METHOD_GET => "GET",
+ self::METHOD_POST => "POST",
+ self::METHOD_POSTJSON => "POST",
+ ];
+
  // closure 
  public $beforeRequest;
  public $afterRequest;
 
  private $_curl;
+ private $_action;
 
  public function init()
  {
  parent::init();
  if(empty($this->host)) {
  throw new InvalidParamException("Please config host."); 
  }
- 
  }
 
- private function getUrl()
+ public function getUrl()
  {
  $url = $this->protocol."://".$this->host;
  if($this->port != 80) {
  $url .= ":".$this->port;
  }
- return $url;
+ return $url.$this->getAction();
+ }
+
+ public function getAction()
+ {
+ return $this->_action;
+ }
+ 
+ public function setAction($action) 
+ {
+ $this->_action = $action;
  }
 
  public function setMethod($method)
@@ -59,7 +75,15 @@ public function setGet()
  }
  return $this->setMethod(self::METHOD_GET);
  }
- 
+ 
+ public function getMethod()
+ {
+ if(isset(self::$methodDesc[$this->method])) {
+ return self::$methodDesc[$this->method];
+ }
+ return "GET";
+ }
+
  public function setPost()
  {
  if(!empty($this->headers['Content-Type'])) {
@@ -108,19 +132,27 @@ public function getCurl()
  public function httpExec($action = "/", $params = array())
  {
  $ch = $this->getCurl();
+ $this->setAction($action);
  if($this->beforeRequest instanceof Closure) {
  $params = call_user_func($this->beforeRequest, $params, $this);
  empty($params) && $params = []; 
  }
- $url = $this->getUrl().$action;
+ $url = $this->getUrl();
  if ($this->method == self::METHOD_POST) {
  curl_setopt($ch, CURLOPT_POST, 1);
  curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
  } elseif ($this->method == self::METHOD_POSTJSON) {
  curl_setopt($ch, CURLOPT_POST, 1);
  curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($params));
  } else {
- !empty($params) && $url .= "?".http_build_query($params);
+ if(!empty($params)) {
+ $temp = explode("?", $url);
+ if(count($temp) > 1) {
+ $url = $temp[0]."?".$temp[1].'&'.http_build_query($params); 
+ } else {
+ $url = $url."?".http_build_query($params);
+ }
+ }
  }
  curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);

demo/test.php

@@ -3,13 +3,27 @@
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../CurlHttp.php');
 $curl = new \lspbupt\curl\CurlHttp([
- 'host' => "www.baidu.com",
- 'beforeRequest' => function($params, $curlhttp) {
- $params['q'] = "ldi";
- var_dump($curlhttp);
- }, 
- 'afterRequest' => function($output, $curlhttp) {
- var_dump($curlhttp);
+ 'host' => 'apis.baidu.com',
+ 'beforeRequest' => function($params, $curlHttp) {
+ //you need put you baidu api key here
+ $apikey = '';
+ echo $curlHttp->getMethod();
+ echo $curlHttp->getUrl();
+ $curlHttp->setHeader('apikey', $apikey);
+ return $params;
+ },
+ 'afterRequest' => function($response, $curlHttp) {
+ // you may want process the request here, this is just a example
+ $code = curl_getinfo($curlHttp->getCurl(), CURLINFO_HTTP_CODE);
+ if($code == 200) {
+ $data = json_decode($response, true);
+ if(empty($data) || empty($data['code'])) {
+ }
+ return $response;
+ }
+ return $response;
  }
 ]);
-$data = $curl->setPost()->httpExec("/", ['q' => 'test']);
+$data = $curl->setGet()
+ ->httpExec("/apistore/weatherservice/recentweathers", ['cityname' => '北京', 'cityid' => '101010100']);
+echo $data;