Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8eb5922d10 |
@@ -14,7 +14,7 @@ abstract class Miniprogarampage
|
|||||||
/** @var Config */
|
/** @var Config */
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
/** @var mixed $instance */
|
/** @var Miniprogarampage $instance */
|
||||||
protected static $instance = null;
|
protected static $instance = null;
|
||||||
|
|
||||||
/** @var WxClient */
|
/** @var WxClient */
|
||||||
@@ -40,6 +40,12 @@ abstract class Miniprogarampage
|
|||||||
}
|
}
|
||||||
static::$instance->config = $config;
|
static::$instance->config = $config;
|
||||||
static::$instance->request->setAgent($config->getAgent());
|
static::$instance->request->setAgent($config->getAgent());
|
||||||
|
|
||||||
|
$request = static::$instance->request;
|
||||||
|
if ($request->getIsSSL()) {
|
||||||
|
$request->addHeader('ssl_cert_file', $config->getSslCert());
|
||||||
|
$request->addHeader('ssl_key_file', $config->getSslKey());
|
||||||
|
}
|
||||||
return static::$instance;
|
return static::$instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
-5
@@ -100,11 +100,11 @@ class WxClient
|
|||||||
public function setIsSSL(bool $isSSL)
|
public function setIsSSL(bool $isSSL)
|
||||||
{
|
{
|
||||||
$this->isSSL = $isSSL;
|
$this->isSSL = $isSSL;
|
||||||
if ($this->isSSL) {
|
|
||||||
$ssl = Wx::getMiniProGaRamPage()->getConfig();
|
|
||||||
$this->header['ssl_cert_file'] = $ssl->getSslCert();
|
|
||||||
$this->header['ssl_key_file'] = $ssl->getSslKey();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getIsSSL()
|
||||||
|
{
|
||||||
|
return $this->isSSL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -263,7 +263,7 @@ class WxClient
|
|||||||
curl_setopt($ch, CURLOPT_SSLKEY, $this->header['ssl_key_file']);
|
curl_setopt($ch, CURLOPT_SSLKEY, $this->header['ssl_key_file']);
|
||||||
}
|
}
|
||||||
curl_setopt($ch, CURLOPT_NOBODY, FALSE);
|
curl_setopt($ch, CURLOPT_NOBODY, FALSE);
|
||||||
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1);// 超时设置
|
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1); // 超时设置
|
||||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
|
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
|
||||||
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
|
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
|
||||||
curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate');
|
curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate');
|
||||||
|
|||||||
Reference in New Issue
Block a user