as2252258/kiri-wchat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add clear

Browse Source
This commit is contained in:
as2252258@163.com
2019-11-04 14:39:59 +08:00
parent dbfbbf75b0
commit 8eb5922d10
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wx/Miniprogarampage.php
+7 -1
View File
@@ -14,7 +14,7 @@ abstract class Miniprogarampage
/** @var Config */
protected $config;
/** @var mixed $instance */
/** @var Miniprogarampage $instance */
protected static $instance = null;
/** @var WxClient */
@@ -40,6 +40,12 @@ abstract class Miniprogarampage
}
static::$instance->config = $config;
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;
}
wx/WxClient.php
+5 -5
View File
@@ -100,11 +100,11 @@ class WxClient
public function setIsSSL(bool $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_NOBODY, FALSE);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1);// 超时设置
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1); // 超时设置
curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);//返回内容
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);// 跟踪重定向
curl_setopt($ch, CURLOPT_ENCODING, 'gzip,deflate');