blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

[更新]微信SDK更新

Browse Source
This commit is contained in:
Anyon 2017-09-29 15:20:48 +08:00
parent 365a893ded
commit d4e77303d7
10 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f::getLoader();
return ComposerAutoloaderInite60d70c3d39de80436d30ec08e9a7eaf::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f
class ComposerAutoloaderInite60d70c3d39de80436d30ec08e9a7eaf
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInite60d70c3d39de80436d30ec08e9a7eaf', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInite60d70c3d39de80436d30ec08e9a7eaf', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit3448f0100e342fbe3e650c8002f8599f::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit3448f0100e342fbe3e650c8002f8599f
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit3448f0100e342fbe3e650c8002f8599f::$files;
$includeFiles = Composer\Autoload\ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire3448f0100e342fbe3e650c8002f8599f($fileIdentifier, $file);
composerRequiree60d70c3d39de80436d30ec08e9a7eaf($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire3448f0100e342fbe3e650c8002f8599f($fileIdentifier, $file)
function composerRequiree60d70c3d39de80436d30ec08e9a7eaf($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit3448f0100e342fbe3e650c8002f8599f
class ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf
{
public static $files = array (
'9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@ -385,9 +385,9 @@ class ComposerStaticInit3448f0100e342fbe3e650c8002f8599f
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit3448f0100e342fbe3e650c8002f8599f::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3448f0100e342fbe3e650c8002f8599f::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3448f0100e342fbe3e650c8002f8599f::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite60d70c3d39de80436d30ec08e9a7eaf::$classMap;
}, null, ClassLoader::class);
}

8
vendor/composer/installed.json vendored
View File

@ -49,18 +49,18 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/wechat-php-sdk.git",
"reference": "d00deaacb4862bda3525fd246c370fca5c0b6e6e"
"reference": "a5ac4d6351c8b07982f77bbbe6ea5fd823d62dda"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/d00deaacb4862bda3525fd246c370fca5c0b6e6e.zip",
"reference": "d00deaacb4862bda3525fd246c370fca5c0b6e6e",
"url": "https://files.phpcomposer.com/files/zoujingli/wechat-php-sdk/a5ac4d6351c8b07982f77bbbe6ea5fd823d62dda.zip",
"reference": "a5ac4d6351c8b07982f77bbbe6ea5fd823d62dda",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"time": "2017-09-29T04:02:48+00:00",
"time": "2017-09-29T07:13:32+00:00",
"type": "project",
"installation-source": "dist",
"autoload": {

17
vendor/zoujingli/wechat-php-sdk/Wechat/Lib/Common.php vendored
View File

@ -116,7 +116,7 @@ class Common
if (!isset($array[0]) || intval($array[0]) > 0) {
$this->errCode = $array[0];
$this->errMsg = $array[1];
Tools::log("Interface Authentication Failed. {$this->errMsg}[{$this->errCode}]", 'ERR');
Tools::log("Interface Authentication Failed. {$this->errMsg}[{$this->errCode}]", "ERR-{$this->appid}");
return false;
}
$this->postxml = $array[1];
@ -165,8 +165,7 @@ class Common
public function getAccessToken($appid = '', $appsecret = '', $token = '')
{
if (!$appid || !$appsecret) {
$appid = $this->appid;
$appsecret = $this->appsecret;
list($appid, $$appsecret) = [$this->appid, $this->appsecret];
}
if ($token) {
return $this->access_token = $token;
@ -185,11 +184,11 @@ class Common
if (!$json || isset($json['errcode'])) {
$this->errCode = $json['errcode'];
$this->errMsg = $json['errmsg'];
Tools::log("Get New AccessToken Error. {$this->errMsg}[{$this->errCode}]", 'ERR');
Tools::log("Get New AccessToken Error. {$this->errMsg}[{$this->errCode}]", "ERR-{$this->appid}");
return false;
}
$this->access_token = $json['access_token'];
Tools::log("Get New AccessToken Success.");
Tools::log("Get New AccessToken Success.", "MSG-{$this->appid}");
Tools::setCache($cache, $this->access_token, 5000);
return $this->access_token;
}
@ -198,18 +197,18 @@ class Common
/**
* 接口失败重试
* @param $method SDK方法名称
* @param string $method SDK方法名称
* @param array $arguments SDK方法参数
* @return bool|mixed
*/
protected function checkRetry($method, $arguments = array())
{
Tools::log("Run {$method} Faild. {$this->errMsg}[{$this->errCode}]", 'ERR');
Tools::log("Run {$method} Faild. {$this->errMsg}[{$this->errCode}]", "ERR-{$this->appid}");
if (!$this->_retry && in_array($this->errCode, array('40014', '40001', '41001', '42001'))) {
($this->_retry = true) && $this->resetAuth();
$this->errCode = 40001;
$this->errMsg = 'no access';
Tools::log("Retry Run {$method} ...");
Tools::log("Retry Run {$method} ...", "MSG-{$this->appid}");
return call_user_func_array(array($this, $method), $arguments);
}
return false;
@ -223,7 +222,7 @@ class Common
public function resetAuth($appid = '')
{
$authname = 'wechat_access_token_' . (empty($appid) ? $this->appid : $appid);
Tools::log("Reset Auth And Remove Old AccessToken.");
Tools::log("Reset Auth And Remove Old AccessToken.", "MSG-{$this->appid}");
$this->access_token = '';
Tools::removeCache($authname);
return true;

11
vendor/zoujingli/wechat-php-sdk/Wechat/WechatMedia.php vendored
View File

@ -26,10 +26,8 @@ use Wechat\Lib\Tools;
*/
class WechatMedia extends Common
{
const UPLOAD_MEDIA_URL = 'http://file.api.weixin.qq.com/cgi-bin';
const MEDIA_UPLOAD_URL = '/media/upload?';
const MEDIA_UPLOADIMG_URL = '/media/uploadimg?'; //图片上传接口
const MEDIA_UPLOADIMG_URL = '/media/uploadimg?';
const MEDIA_GET_URL = '/media/get?';
const MEDIA_VIDEO_UPLOAD = '/media/uploadvideo?';
const MEDIA_FOREVER_UPLOAD_URL = '/material/add_material?';
@ -84,10 +82,7 @@ class WechatMedia extends Common
if (!$this->access_token && !$this->getAccessToken()) {
return false;
}
//原先的上传多媒体文件接口使用 self::UPLOAD_MEDIA_URL 前缀
//如果要获取的素材是视频文件时，不能使用https协议，必须更换成http协议
$url_prefix = $is_video ? str_replace('https', 'http', self::API_URL_PREFIX) : self::API_URL_PREFIX;
$result = Tools::httpGet($url_prefix . self::MEDIA_GET_URL . "access_token={$this->access_token}" . '&media_id=' . $media_id);
$result = Tools::httpGet(self::API_URL_PREFIX . self::MEDIA_GET_URL . "access_token={$this->access_token}" . '&media_id=' . $media_id);
if ($result) {
if (is_string($result)) {
$json = json_decode($result, true);
@ -418,7 +413,7 @@ class WechatMedia extends Common
if (!$this->access_token && !$this->getAccessToken()) {
return false;
}
$result = Tools::httpPost(self::UPLOAD_MEDIA_URL . self::MEDIA_VIDEO_UPLOAD . "access_token={$this->access_token}", Tools::json_encode($data));
$result = Tools::httpPost(self::API_URL_PREFIX . self::MEDIA_VIDEO_UPLOAD . "access_token={$this->access_token}", Tools::json_encode($data));
if ($result) {
$json = json_decode($result, true);
if (empty($json) || !empty($json['errcode'])) {

10
vendor/zoujingli/wechat-php-sdk/Wechat/WechatOauth.php vendored
View File

@ -51,7 +51,7 @@ class WechatOauth extends Common
{
$code = isset($_GET['code']) ? $_GET['code'] : '';
if (empty($code)) {
Tools::log("getOauthAccessToken Fail, Because there is no access to the code value in get.");
Tools::log("getOauthAccessToken Fail, Because there is no access to the code value in get.", "MSG-{$this->appid}");
return false;
}
$result = Tools::httpGet(self::API_BASE_URL_PREFIX . self::OAUTH_TOKEN_URL . "appid={$this->appid}&secret={$this->appsecret}&code={$code}&grant_type=authorization_code");
@ -60,7 +60,7 @@ class WechatOauth extends Common
if (empty($json) || !empty($json['errcode'])) {
$this->errCode = isset($json['errcode']) ? $json['errcode'] : '505';
$this->errMsg = isset($json['errmsg']) ? $json['errmsg'] : '无法解析接口返回内容！';
Tools::log("WechatOauth::getOauthAccessToken Fail.{$this->errMsg} [{$this->errCode}]", 'ERR');
Tools::log("WechatOauth::getOauthAccessToken Fail.{$this->errMsg} [{$this->errCode}]", "ERR-{$this->appid}");
return false;
}
return $json;
@ -81,7 +81,7 @@ class WechatOauth extends Common
if (empty($json) || !empty($json['errcode'])) {
$this->errCode = isset($json['errcode']) ? $json['errcode'] : '505';
$this->errMsg = isset($json['errmsg']) ? $json['errmsg'] : '无法解析接口返回内容！';
Tools::log("WechatOauth::getOauthRefreshToken Fail.{$this->errMsg} [{$this->errCode}]", 'ERR');
Tools::log("WechatOauth::getOauthRefreshToken Fail.{$this->errMsg} [{$this->errCode}]", "ERR-{$this->appid}");
return false;
}
return $json;
@ -104,7 +104,7 @@ class WechatOauth extends Common
if (empty($json) || !empty($json['errcode'])) {
$this->errCode = isset($json['errcode']) ? $json['errcode'] : '505';
$this->errMsg = isset($json['errmsg']) ? $json['errmsg'] : '无法解析接口返回内容！';
Tools::log("WechatOauth::getOauthUserInfo Fail.{$this->errMsg} [{$this->errCode}]", 'ERR');
Tools::log("WechatOauth::getOauthUserInfo Fail.{$this->errMsg} [{$this->errCode}]", "ERR-{$this->appid}");
return false;
}
return $json;
@ -126,7 +126,7 @@ class WechatOauth extends Common
if (empty($json) || !empty($json['errcode'])) {
$this->errCode = isset($json['errcode']) ? $json['errcode'] : '505';
$this->errMsg = isset($json['errmsg']) ? $json['errmsg'] : '无法解析接口返回内容！';
Tools::log("WechatOauth::getOauthAuth Fail.{$this->errMsg} [{$this->errCode}]", 'ERR');
Tools::log("WechatOauth::getOauthAuth Fail.{$this->errMsg} [{$this->errCode}]", "ERR-{$this->appid}");
return false;
} elseif (intval($json['errcode']) === 0) {
return true;

8
vendor/zoujingli/wechat-php-sdk/Wechat/WechatPay.php vendored
View File

@ -210,13 +210,13 @@ class WechatPay
{
$notifyInfo = (array)simplexml_load_string(file_get_contents("php://input"), 'SimpleXMLElement', LIBXML_NOCDATA);
if (empty($notifyInfo)) {
Tools::log('Payment notification forbidden access.', 'ERR');
Tools::log('Payment notification forbidden access.', "ERR-{$this->appid}");
$this->errCode = '404';
$this->errMsg = 'Payment notification forbidden access.';
return false;
}
if (empty($notifyInfo['sign'])) {
Tools::log('Payment notification signature is missing.' . var_export($notifyInfo, true), 'ERR');
Tools::log('Payment notification signature is missing.' . var_export($notifyInfo, true), "ERR-{$this->appid}");
$this->errCode = '403';
$this->errMsg = 'Payment notification signature is missing.';
return false;
@ -224,12 +224,12 @@ class WechatPay
$data = $notifyInfo;
unset($data['sign']);
if ($notifyInfo['sign'] !== Tools::getPaySign($data, $this->partnerKey)) {
Tools::log('Payment notification signature verification failed.' . var_export($notifyInfo, true), 'ERR');
Tools::log('Payment notification signature verification failed.' . var_export($notifyInfo, true), "ERR-{$this->appid}");
$this->errCode = '403';
$this->errMsg = 'Payment signature verification failed.';
return false;
}
Tools::log('Payment notification signature verification success.' . var_export($notifyInfo, true), 'MSG');
Tools::log('Payment notification signature verification success.' . var_export($notifyInfo, true), "MSG-{$this->appid}");
$this->errCode = '0';
$this->errMsg = '';
return $notifyInfo;

2
vendor/zoujingli/wechat-php-sdk/Wechat/WechatReceive.php vendored
View File

@ -733,7 +733,7 @@ class WechatReceive extends WechatMessage
$array = $pc->encrypt($xmldata, empty($this->config['component_appid']) ? $this->appid : $this->config['component_appid']);
$ret = $array[0];
if ($ret != 0) {
Tools::log('encrypt err!');
Tools::log('Encrypt Error!', "ERR-{$this->appid}");
return false;
}
$timestamp = time();

18
vendor/zoujingli/wechat-php-sdk/Wechat/WechatService.php vendored
View File

@ -97,13 +97,13 @@ class WechatService
if (false === $receive->valid()) {
$this->errCode = $receive->errCode;
$this->errMsg = $receive->errMsg;
Tools::log("Get Wechat Push ComponentVerifyTicket Faild. {$this->errMsg} [$this->errCode]", 'Err');
Tools::log("Get Wechat Push ComponentVerifyTicket Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
return false;
}
$data = $receive->getRev()->getRevData();
if ($data['InfoType'] === 'component_verify_ticket' && !empty($data['ComponentVerifyTicket'])) {
# 记录推送日志到微信SDK
Tools::log("Get Wechat Push ComponentVerifyTicket Success. ");
Tools::log("Get Wechat Push ComponentVerifyTicket Success. ", "MSG-{$this->authorizer_appid}");
Tools::setCache('component_verify_ticket', $data['ComponentVerifyTicket']);
}
return $data;
@ -130,7 +130,7 @@ class WechatService
$url = self::URL_PREFIX . self::REFRESH_ACCESS_TOKEN . "?component_access_token={$this->component_access_token}";
$result = Tools::httpPost($url, Tools::json_encode($data));
if (($result = $this->_decode($result)) === false) {
Tools::log("Get getAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get getAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
}
return $result;
}
@ -151,7 +151,7 @@ class WechatService
$url = self::URL_PREFIX . self::COMPONENT_TOKEN_URL;
$result = Tools::httpPost($url, Tools::json_encode($data));
if (($this->component_access_token = $this->_decode($result, 'component_access_token')) === false) {
Tools::log("Get getComponentAccessToken Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get getComponentAccessToken Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
return false;
}
Tools::setCache($cacheKey, $this->component_access_token, 7200);
@ -202,7 +202,7 @@ class WechatService
$result = Tools::httpPost($url, Tools::json_encode($data));
$authorization_info = $this->_decode($result, 'authorization_info');
if (empty($authorization_info)) {
Tools::log("Get getAuthorizationInfo Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get getAuthorizationInfo Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
return false;
}
$authorization_info['func_info'] = $this->_parseFuncInfo($authorization_info['func_info']);
@ -241,7 +241,7 @@ class WechatService
$result = Tools::httpPost($url, Tools::json_encode($data));
$authorizer_info = $this->_decode($result, 'authorizer_info');
if (empty($authorizer_info)) {
Tools::log("Get WechatInfo Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get WechatInfo Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
return false;
}
$author_data = array_merge($authorizer_info, $this->data['authorization_info']);
@ -271,7 +271,7 @@ class WechatService
$url = self::URL_PREFIX . self::GET_AUTHORIZER_OPTION_URL . "?component_access_token={$this->component_access_token}";
$result = Tools::httpPost($url, Tools::json_encode($data));
if (($result = $this->_decode($result)) === false) {
Tools::log("Get getAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get getAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
}
return $result;
}
@ -297,7 +297,7 @@ class WechatService
$url = self::URL_PREFIX . self::SET_AUTHORIZER_OPTION_URL . "?component_access_token={$this->component_access_token}";
$result = Tools::httpPost($url, Tools::json_encode($data));
if (($result = $this->_decode($result)) === false) {
Tools::log("Get setAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get setAuthorizerOption Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
}
return $result;
}
@ -333,7 +333,7 @@ class WechatService
$result = Tools::httpPost($url, Tools::json_encode($data));
$this->pre_auth_code = $this->_decode($result, 'pre_auth_code');
if (empty($this->pre_auth_code)) {
Tools::log("Get getPreauthCode Faild. {$this->errMsg} [$this->errCode]", 'ERR');
Tools::log("Get getPreauthCode Faild. {$this->errMsg} [$this->errCode]", "ERR-{$this->authorizer_appid}");
}
return $this->pre_auth_code;
}