blackteay/WeChatDeveloper
1
0
Fork 0
mirror of https://gitee.com/zoujingli/WeChatDeveloper.git synced 2025-04-06 03:58:03 +08:00
Code Issues Projects Releases Wiki Activity

Update Tools.php

Browse Source
This commit is contained in:
Anyon 2018-12-05 17:06:38 +08:00
parent 018918d342
commit fbf73b5ca4
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WeChat/Contracts/Tools.php
View File

@ -267,18 +267,16 @@ class Tools
private static function _buildHttpData($data, $build = true) private static function _buildHttpData($data, $build = true)
{ {
if (!is_array($data)) return $data; if (!is_array($data)) return $data;
foreach ($data as $key => $value) { foreach ($data as $key => $value) if (is_object($value) && $value instanceof \CURLFile) {
if (is_object($value) && $value instanceof \CURLFile) { $build = false;
} elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') {
$build = false;
$data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
array_push(self::$cache_curl, $myCurlFile->tempname);
} elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
$build = false; $build = false;
} elseif (is_object($value) && isset($value->datatype) && $value->datatype === 'MY_CURL_FILE') { $data[$key] = self::createCurlFile($filename);
$build = false;
$data[$key] = ($myCurlFile = new MyCurlFile((array)$value))->get();
array_push(self::$cache_curl, $myCurlFile->tempname);
} elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
$build = false;
$data[$key] = self::createCurlFile($filename);
}
} }
} }
return $build ? http_build_query($data) : $data; return $build ? http_build_query($data) : $data;
@ -324,7 +322,8 @@ class Tools
*/ */
public static function getCache($name) public static function getCache($name)
{ {
if (file_exists($file = self::_getCacheName($name)) && ($content = file_get_contents($file))) { $file = self::_getCacheName($name);
if (file_exists($file) && ($content = file_get_contents($file))) {
$data = unserialize($content); $data = unserialize($content);
if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) { if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
return $data['value']; return $data['value'];