From 3fc888a1ac4f370a2196b214fb564e17e9ad3eb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Fri, 20 Sep 2024 14:25:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WeChat/Contracts/Tools.php | 48 ++++++++++++++++++++++++++++++++------ _test/config.php | 13 ++++++++--- _test/pay-v3-config.php | 23 ++++++++++++++++++ _test/work-config.php | 28 ++++++++++++++++++++-- readme.md | 23 ++++++++++++++++++ 5 files changed, 123 insertions(+), 12 deletions(-) diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php index f408b80..8d82fba 100644 --- a/WeChat/Contracts/Tools.php +++ b/WeChat/Contracts/Tools.php @@ -20,6 +20,29 @@ use WeChat\Exceptions\InvalidArgumentException; use WeChat\Exceptions\InvalidResponseException; use WeChat\Exceptions\LocalCacheException; +// ===================================================== +// 配置缓存处理函数 ( 适配其他环境 ) +// ----------------------------------------------------- +// 数据缓存 (set|get|del) 操作可以将缓存写到任意位置或Redis +// 文件缓存 (put) 只能写在本地服务器，还需要返回可读的文件路径 +// 未配置自定义缓存处理机制时，默认在 cache_path 写入文件缓存 +// // ===================================================== +// \WeChat\Contracts\Tools::$cache_callable = [ +// 'set' => function ($name, $value, $expired = 360) { +// var_dump(func_get_args()); +// }, +// 'get' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'del' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'put' => function ($name) { +// var_dump(func_get_args()); +// return $filePath; +// }, +// ]; + /** * 网络请求支持 * Class Tools @@ -34,14 +57,14 @@ class Tools public static $cache_path = null; /** - * 缓存写入操作 + * 缓存读写配置 * @var array */ public static $cache_callable = [ - 'set' => null, // 写入缓存 - 'get' => null, // 获取缓存 - 'del' => null, // 删除缓存 - 'put' => null, // 写入文件 + 'set' => null, // 写入缓存 ($name,$value='',$expired=3600):string + 'get' => null, // 获取缓存 ($name):mixed|null + 'del' => null, // 删除缓存 ($name):boolean + 'put' => null, // 写入文件 ($name,$content):string ]; /** @@ -67,7 +90,7 @@ class Tools /** * 获取输入对象 - * @return false|mixed|string + * @return string */ public static function getRawInput() { @@ -78,6 +101,16 @@ class Tools } } + /** + * 设置输入内容 + * @param string $rawInput + * @return void + */ + public static function setRawInput($rawInput) + { + $GLOBALS['HTTP_RAW_POST_DATA'] = $rawInput; + } + /** * 根据文件后缀获取文件类型 * @param string|array $ext 文件后缀 @@ -353,7 +386,8 @@ class Tools curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - list($content) = [curl_exec($curl), curl_close($curl)]; + $content = curl_exec($curl); + curl_close($curl); // 清理 CURL 缓存文件 if (!empty(self::$cache_curl)) foreach (self::$cache_curl as $key => $file) { Tools::delCache($file); diff --git a/_test/config.php b/_test/config.php index 677d67b..31d9f63 100644 --- a/_test/config.php +++ b/_test/config.php @@ -14,8 +14,14 @@ // | github 代码仓库：https://github.com/zoujingli/WeChatDeveloper // +---------------------------------------------------------------------- -// 配置缓存处理函数 -//\WeChat\Contracts\Tools::$cache_callable = [ +// ===================================================== +// 配置缓存处理函数 ( 适配其他环境 ) +// ----------------------------------------------------- +// 数据缓存 (set|get|del) 操作可以将缓存写到任意位置或Redis +// 文件缓存 (put) 只能写在本地服务器，还需要返回可读的文件路径 +// 未配置自定义缓存处理机制时，默认在 cache_path 写入文件缓存 +// // ===================================================== +// \WeChat\Contracts\Tools::$cache_callable = [ // 'set' => function ($name, $value, $expired = 360) { // var_dump(func_get_args()); // }, @@ -27,8 +33,9 @@ // }, // 'put' => function ($name) { // var_dump(func_get_args()); +// return $filePath; // }, -//]; +// ]; return [ 'token' => 'test', diff --git a/_test/pay-v3-config.php b/_test/pay-v3-config.php index 1723fd4..8d728f3 100644 --- a/_test/pay-v3-config.php +++ b/_test/pay-v3-config.php @@ -14,6 +14,29 @@ // | github 代码仓库：https://github.com/zoujingli/WeChatDeveloper // +---------------------------------------------------------------------- +// ===================================================== +// 配置缓存处理函数 ( 适配其他环境 ) +// ----------------------------------------------------- +// 数据缓存 (set|get|del) 操作可以将缓存写到任意位置或Redis +// 文件缓存 (put) 只能写在本地服务器，还需要返回可读的文件路径 +// 未配置自定义缓存处理机制时，默认在 cache_path 写入文件缓存 +// // ===================================================== +// \WeChat\Contracts\Tools::$cache_callable = [ +// 'set' => function ($name, $value, $expired = 360) { +// var_dump(func_get_args()); +// }, +// 'get' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'del' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'put' => function ($name) { +// var_dump(func_get_args()); +// return $filePath; +// }, +// ]; + $certPublic = << function ($name, $value, $expired = 360) { +// var_dump(func_get_args()); +// }, +// 'get' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'del' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'put' => function ($name) { +// var_dump(func_get_args()); +// return $filePath; +// }, +// ]; + return [ - 'appid' => '', // 企业ID - 'appsecret' => '', // 应用的凭证密钥 + 'appid' => '', // 企业ID + 'appsecret' => '', // 应用的凭证密钥 + 'cache_path' => '', // 配置缓存目录 ]; \ No newline at end of file diff --git a/readme.md b/readme.md index a39cddf..a6bc131 100644 --- a/readme.md +++ b/readme.md @@ -114,6 +114,29 @@ include "您的目录/WeChatDeveloper/include.php"; 2.1 接口实例所需参数 ```php +// ===================================================== +// 配置缓存处理函数 ( 适配其他环境 ) +// ----------------------------------------------------- +// 数据缓存 (set|get|del) 操作可以将缓存写到任意位置或Redis +// 文件缓存 (put) 只能写在本地服务器，还需要返回可读的文件路径 +// 未配置自定义缓存处理机制时，默认在 cache_path 写入文件缓存 +// // ===================================================== +// \WeChat\Contracts\Tools::$cache_callable = [ +// 'set' => function ($name, $value, $expired = 360) { +// var_dump(func_get_args()); +// }, +// 'get' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'del' => function ($name) { +// var_dump(func_get_args()); +// }, +// 'put' => function ($name) { +// var_dump(func_get_args()); +// return $filePath; +// }, +// ]; + $config = [ 'token' => 'test', 'appid' => 'wx60a43dd8161666d4',