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

[更新]ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2018-12-11 10:50:44 +08:00
parent 4ef8946cb1
commit e049fe479a
30 changed files with 347 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
thinkphp/helper.php
View File

@ -313,9 +313,9 @@ if (!function_exists('download')) {
* @param integer $expire 有效期（秒）
* @return \think\response\Download
*/
function download($filename, $name = '', $content = false, $expire = 180)
function download($filename, $name = '', $content = false, $expire = 360, $openinBrower = false)
{
return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire);
return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrower($openinBrower);
}
}

2
thinkphp/library/think/App.php
View File

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.30 LTS';
const VERSION = '5.1.31 LTS';
/**
* 当前模块路径

18
thinkphp/library/think/db/Query.php
View File

@ -656,9 +656,9 @@ class Query
$query->fetchSql(true);
}
$count = $query->aggregate('COUNT', '*');
$count = $query->aggregate('COUNT', '*', true);
} else {
$count = $this->aggregate('COUNT', $field);
$count = $this->aggregate('COUNT', $field, true);
}
return is_string($count) ? $count : (int) $count;
@ -1008,11 +1008,13 @@ class Query
if ($tableName) {
// 添加统一的前缀
$prefix = $prefix ?: $tableName;
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$val = $prefix . '.' . $val . ($alias ? ' AS ' . $alias . $val : '');
foreach ($field as $key => &$val) {
if (is_numeric($key) && $alias) {
$field[$prefix . '.' . $val] = $alias . $val;
unset($field[$key]);
} elseif (is_numeric($key)) {
$val = $prefix . '.' . $val;
}
$field[$key] = $val;
}
}
@ -3548,6 +3550,10 @@ class Query
*/
protected function parseView(&$options)
{
if (!isset($options['map'])) {
return;
}
foreach (['AND', 'OR'] as $logic) {
if (isset($options['where'][$logic])) {
foreach ($options['where'][$logic] as $key => $val) {

2
thinkphp/library/think/db/connector/Sqlsrv.php
View File

@ -56,6 +56,8 @@ class Sqlsrv extends Connection
public function getFields($tableName)
{
list($tableName) = explode(' ', $tableName);
$tableNames = explode('.', $tableName);
$tableName = isset($tableNames[1]) ? $tableNames[1] : $tableNames[0];
$sql = "SELECT column_name, data_type, column_default, is_nullable
FROM information_schema.tables AS t

2
thinkphp/library/think/model/relation/BelongsToMany.php
View File

@ -559,7 +559,7 @@ class BelongsToMany extends Relation
foreach ($ids as $id) {
$pivot[$this->foreignKey] = $id;
$this->pivot->insert($pivot, true);
$this->pivot->replace()->save($pivot);
$result[] = $this->newPivot($pivot, true);
}

16
thinkphp/library/think/model/relation/HasMany.php
View File

@ -240,6 +240,18 @@ class HasMany extends Relation
* @return Model|false
*/
public function save($data, $replace = true)
{
$model = $this->make($data);
return $model->replace($replace)->save() ? $model : false;
}
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
@ -248,9 +260,7 @@ class HasMany extends Relation
// 保存关联表数据
$data[$this->foreignKey] = $this->parent->{$this->localKey};
$model = new $this->model;
return $model->replace($replace)->save($data) ? $model : false;
return new $this->model($data);
}
/**

18
thinkphp/library/think/model/relation/MorphMany.php
View File

@ -272,10 +272,22 @@ class MorphMany extends Relation
/**
* 保存（新增）当前关联数据对象
* @access public
* @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
* @param mixed $data 数据
* @return Model|false
*/
public function save($data)
{
$model = $this->make($data);
return $model->save($data) ? $model : false;
}
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
@ -284,12 +296,10 @@ class MorphMany extends Relation
// 保存关联表数据
$pk = $this->parent->getPk();
$model = new $this->model;
$data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type;
return $model->save($data) ? $model : false;
return new $this->model($data);
}
/**

19
thinkphp/library/think/model/relation/MorphOne.php
View File

@ -206,22 +206,33 @@ class MorphOne extends Relation
/**
* 保存（新增）当前关联数据对象
* @access public
* @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
* @param mixed $data 数据
* @return Model|false
*/
public function save($data)
{
$model = $this->make($data);
return $model->save() ? $model : false;
}
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
}
// 保存关联表数据
$pk = $this->parent->getPk();
$model = new $this->model;
$data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type;
return $model->save($data) ? $model : false;
return new $this->model($data);
}
/**

15
thinkphp/library/think/response/Download.php
View File

@ -20,7 +20,7 @@ class Download extends Response
protected $name;
protected $mimeType;
protected $isContent = false;
protected $openinBrower = false;
/**
* 处理数据
* @access protected
@ -53,7 +53,7 @@ class Download extends Response
$this->header['Pragma'] = 'public';
$this->header['Content-Type'] = $mimeType ?: 'application/octet-stream';
$this->header['Cache-control'] = 'max-age=' . $this->expire;
$this->header['Content-Disposition'] = 'attachment; filename="' . $name . '"';
$this->header['Content-Disposition'] = $this->openinBrower ? 'inline' : 'attachment; filename="' . $name . '"';
$this->header['Content-Length'] = $size;
$this->header['Content-Transfer-Encoding'] = 'binary';
$this->header['Expires'] = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
@ -134,4 +134,15 @@ class Download extends Response
return $this;
}
/**
* 设置是否在浏览器中显示文件
* @access public
* @param bool $openinBrower 是否在浏览器中显示文件
* @return $this
*/
public function openinBrower($openinBrower) {
$this->openinBrower = $openinBrower;
return $this;
}
}

7
thinkphp/library/think/route/dispatch/Module.php
View File

@ -67,7 +67,12 @@ class Module extends Dispatch
// 是否自动转换控制器和操作名
$convert = is_bool($this->convert) ? $this->convert : $this->rule->getConfig('url_convert');
// 获取控制器名
$controller = strip_tags($result[1] ?: $this->rule->getConfig('default_controller'));
$controller = strip_tags($result[1] ?: $this->rule->getConfig('default_controller'));
if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
throw new HttpException(404, 'controller not exists:' . $controller);
}
$this->controller = $convert ? strtolower($controller) : $controller;
// 获取操作名

2
thinkphp/library/think/template/TagLib.php
View File

@ -298,7 +298,7 @@ class TagLib
*/
public function parseCondition($condition)
{
if (strpos($condition, ':')) {
if (!strpos($condition, '::') && strpos($condition, ':')) {
$condition = ' ' . substr(strstr($condition, ':'), 1);
}

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -130,6 +130,7 @@ return array(
'WeChat\\Contracts\\BasicWePay' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php',
'WeChat\\Contracts\\DataArray' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Contracts/DataArray.php',
'WeChat\\Contracts\\DataError' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Contracts/DataError.php',
'WeChat\\Contracts\\MyCurlFile' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php',
'WeChat\\Contracts\\Tools' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Contracts/Tools.php',
'WeChat\\Custom' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Custom.php',
'WeChat\\Exceptions\\InvalidArgumentException' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Exceptions/InvalidArgumentException.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57
class ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65', '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\ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit372f99933a0353fdad4eccea136beb65::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInitf061ffbd27d2aca36162b5280255ea57
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit372f99933a0353fdad4eccea136beb65::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiref061ffbd27d2aca36162b5280255ea57($fileIdentifier, $file);
composerRequire372f99933a0353fdad4eccea136beb65($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequiref061ffbd27d2aca36162b5280255ea57($fileIdentifier, $file)
function composerRequire372f99933a0353fdad4eccea136beb65($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitf061ffbd27d2aca36162b5280255ea57
class ComposerStaticInit372f99933a0353fdad4eccea136beb65
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -228,6 +228,7 @@ class ComposerStaticInitf061ffbd27d2aca36162b5280255ea57
'WeChat\\Contracts\\BasicWePay' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php',
'WeChat\\Contracts\\DataArray' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Contracts/DataArray.php',
'WeChat\\Contracts\\DataError' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Contracts/DataError.php',
'WeChat\\Contracts\\MyCurlFile' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php',
'WeChat\\Contracts\\Tools' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Contracts/Tools.php',
'WeChat\\Custom' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Custom.php',
'WeChat\\Exceptions\\InvalidArgumentException' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Exceptions/InvalidArgumentException.php',
@ -320,9 +321,9 @@ class ComposerStaticInitf061ffbd27d2aca36162b5280255ea57
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf061ffbd27d2aca36162b5280255ea57::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$classMap;
}, null, ClassLoader::class);
}

28
vendor/composer/installed.json vendored
View File

@ -177,8 +177,8 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.4.19",
"version_normalized": "3.4.19.0",
"version": "v3.4.20",
"version_normalized": "3.4.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
@ -239,17 +239,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.30",
"version_normalized": "5.1.30.0",
"version": "v5.1.31",
"version_normalized": "5.1.31.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc"
"reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
"reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc",
"url": "https://api.github.com/repos/top-think/framework/zipball/93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
"reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
"shasum": "",
"mirrors": [
{
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-11-30T07:46:23+00:00",
"time": "2018-12-09T12:41:21+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@ -443,17 +443,17 @@
},
{
"name": "zoujingli/wechat-developer",
"version": "v1.2.6",
"version_normalized": "1.2.6.0",
"version": "v1.2.7",
"version_normalized": "1.2.7.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "e6be8222c2be8e70515876affd966ec1d22cc65d"
"reference": "fbf73b5ca44da65c3df93b11b27998476260e227"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/e6be8222c2be8e70515876affd966ec1d22cc65d",
"reference": "e6be8222c2be8e70515876affd966ec1d22cc65d",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/fbf73b5ca44da65c3df93b11b27998476260e227",
"reference": "fbf73b5ca44da65c3df93b11b27998476260e227",
"shasum": "",
"mirrors": [
{
@ -468,7 +468,7 @@
"ext-openssl": "*",
"php": ">=5.4"
},
"time": "2018-11-19T13:44:54+00:00",
"time": "2018-12-05T09:06:38+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

19
vendor/zoujingli/wechat-developer/README.md vendored
View File

@ -45,13 +45,13 @@ WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何
|文件名|类名|描述|类型|加载 ①|
|---|---|---|---|---|
| App.php | AliPay\App | 支付宝App支付 | 支付宝 | \We::AliPayApp() |
| Bill.php | AliPay\Bill | 支付宝账单下载 | 支付宝 | \We::AliPayBill() |
| Pos.php | AliPay\Pos | 支付宝刷卡支付 | 支付宝 | \We::AliPayPos() |
| Scan.php | AliPay\Scan | 支付宝扫码支付 | 支付宝 | \We::AliPayScan() |
| Transfer.php | AliPay\Transfer | 支付宝转账 | 支付宝 | \We::AliPayTransfer() |
| Wap.php | AliPay\Wap | 支付宝Wap支付 | 支付宝 | \We::AliPayWap() |
| Web.php | AliPay\Web | 支付宝Web支付 | 支付宝 | \We::AliPayWeb() |
| App.php | AliPay\App | 支付宝App支付 | 支付宝支付 | \We::AliPayApp() |
| Bill.php | AliPay\Bill | 支付宝账单下载 | 支付宝支付 | \We::AliPayBill() |
| Pos.php | AliPay\Pos | 支付宝刷卡支付 | 支付宝支付 | \We::AliPayPos() |
| Scan.php | AliPay\Scan | 支付宝扫码支付 | 支付宝支付 | \We::AliPayScan() |
| Transfer.php | AliPay\Transfer | 支付宝转账 | 支付宝支付 | \We::AliPayTransfer() |
| Wap.php | AliPay\Wap | 支付宝Wap支付 | 支付宝支付 | \We::AliPayWap() |
| Web.php | AliPay\Web | 支付宝Web支付 | 支付宝支付 | \We::AliPayWeb() |
| Card.php | WeChat\Card | 微信卡券接口支持 | 认证服务号 | \We::WeChatCard() |
| Custom.php | WeChat\Custom | 微信客服消息接口支持 | 认证服务号 | \We::WeChatCustom() |
| Media.php | WeChat\Media | 微信媒体素材接口支持 | 认证服务号 | \We::WeChatMedia() |
@ -232,17 +232,20 @@ $config['notify_url'] = 'http://pay.thinkadmin.top/test/alipay-notify.php';
$config['return_url'] = 'http://pay.thinkadmin.top/test/alipay-success.php';
try {
// 实例支付对象
$pay = We::AliPayWap($config);
// $pay = new \AliPay\Wap($config);
// 参考链接：https://docs.open.alipay.com/api_1/alipay.trade.wap.pay
$result = $pay->apply([
'out_trade_no' => time(), // 商户订单号
'total_amount' => '1', // 支付金额
'subject' => '支付订单描述', // 支付订单描述
]);
echo $result; // 直接输出HTML（提交表单跳转)
} catch (Exception $e) {
// 异常处理

4
vendor/zoujingli/wechat-developer/WeChat/Card.php vendored
View File

@ -14,7 +14,6 @@
namespace WeChat;
use WeChat\Contracts\BasicWeChat;
/**
@ -669,6 +668,5 @@ class Card extends BasicWeChat
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->httpPostForJson($url, $data);
}
}

5
vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPushEvent.php vendored
View File

@ -165,10 +165,7 @@ class BasicPushEvent
$signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
$tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
sort($tmpArr, SORT_STRING);
if (sha1(implode($tmpArr)) == $signature) {
return true;
}
return false;
return sha1(implode($tmpArr)) === $signature;
}
/**

6
vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php vendored
View File

@ -141,7 +141,8 @@ class BasicWeChat
* 以GET获取接口数据并转为数组
* @param string $url 接口地址
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
protected function httpGetForJson($url)
{
@ -165,7 +166,8 @@ class BasicWeChat
* @param array $data 请求数据
* @param bool $buildToJson
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
protected function httpPostForJson($url, array $data, $buildToJson = true)
{

9
vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWePay.php vendored
View File

@ -85,6 +85,15 @@ class BasicWePay
throw new InvalidResponseException('Invalid Notify.', '0');
}
/**
* 获取微信支付通知回复内容
* @return string
*/
public function getNotifySuccessReply()
{
return Tools::arr2xml(['return_code' => 'SUCCESS', 'return_msg' => 'OK']);
}
/**
* 生成支付签名
* @param array $data 参与签名的数据

63
vendor/zoujingli/wechat-developer/WeChat/Contracts/MyCurlFile.php vendored Normal file
View File

@ -0,0 +1,63 @@
<?php
namespace WeChat\Contracts;
/**
* 自定义CURL文件类
* Class MyCurlFile
* @package WeChat\Contracts
*/
class MyCurlFile extends \stdClass
{
/**
* 当前数据类型
* @var string
*/
public $datatype = 'MY_CURL_FILE';
/**
* MyCurlFile constructor.
* @param string|array $filename
* @param string $mimetype
* @param string $postname
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function __construct($filename, $mimetype = '', $postname = '')
{
if (is_array($filename)) {
foreach ($filename as $k => $v) $this->{$k} = $v;
} else {
$this->mimetype = $mimetype;
$this->postname = $postname;
$this->extension = pathinfo($filename, PATHINFO_EXTENSION);
if (empty($this->extension)) $this->extension = 'tmp';
if (empty($this->mimetype)) $this->mimetype = Tools::getExtMine($this->extension);
if (empty($this->postname)) $this->postname = pathinfo($filename, PATHINFO_BASENAME);
$this->content = base64_encode(file_get_contents($filename));
$this->tempname = md5($this->content) . ".{$this->extension}";
}
}
/**
* 获取文件信息
* @return \CURLFile|string
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function get()
{
$this->filename = Tools::pushFile($this->tempname, base64_decode($this->content));
if (class_exists('CURLFile')) {
return new \CURLFile($this->filename, $this->mimetype, $this->postname);
}
return "@{$this->tempname};filename={$this->postname};type={$this->mimetype}";
}
/**
* 类销毁处理
*/
public function __destruct()
{
// Tools::delCache($this->tempname);
}
}

111
vendor/zoujingli/wechat-developer/WeChat/Contracts/Tools.php vendored
View File

@ -31,6 +31,11 @@ class Tools
*/
public static $cache_path = null;
/**
* 网络缓存
* @var array
*/
private static $cache_curl = [];
/**
* 产生随机字符串
@ -49,8 +54,8 @@ class Tools
/**
* 根据文件后缀获取文件MINE
* @param array $ext 文件后缀
* 根据文件后缀获取文件类型
* @param string|array $ext 文件后缀
* @param array $mine 文件后缀MINE信息
* @return string
* @throws LocalCacheException
@ -65,7 +70,7 @@ class Tools
}
/**
* 获取所有文件扩展的mine
* 获取所有文件扩展的类型
* @return array
* @throws LocalCacheException
*/
@ -75,9 +80,7 @@ class Tools
if (empty($mines)) {
$content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER);
foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) {
$mines[$ext] = $match[1];
}
foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) $mines[$ext] = $match[1];
self::setCache('all_ext_mine', $mines);
}
return $mines;
@ -93,8 +96,8 @@ class Tools
*/
public static function createCurlFile($filename, $mimetype = null, $postname = null)
{
is_null($postname) && $postname = basename($filename);
is_null($mimetype) && $mimetype = self::getExtMine(pathinfo($filename, 4));
if (is_null($postname)) $postname = basename($filename);
if (is_null($mimetype)) $mimetype = self::getExtMine(pathinfo($filename, 4));
if (function_exists('curl_file_create')) {
return curl_file_create($filename, $mimetype, $postname);
}
@ -182,7 +185,8 @@ class Tools
* @param string $url 访问URL
* @param array $query GET数
* @param array $options
* @return bool|string
* @return boolean|string
* @throws LocalCacheException
*/
public static function get($url, $query = [], $options = [])
{
@ -195,7 +199,8 @@ class Tools
* @param string $url 访问URL
* @param array $data POST数据
* @param array $options
* @return bool|string
* @return boolean|string
* @throws LocalCacheException
*/
public static function post($url, $data = [], $options = [])
{
@ -208,9 +213,10 @@ class Tools
* @param string $method 请求方法
* @param string $url 请求方法
* @param array $options 请求参数[headers,data,ssl_cer,ssl_key]
* @return bool|string
* @return boolean|string
* @throws LocalCacheException
*/
protected static function doRequest($method, $url, $options = [])
public static function doRequest($method, $url, $options = [])
{
$curl = curl_init();
// GET参数设置
@ -224,34 +230,56 @@ class Tools
// POST数据设置
if (strtolower($method) === 'post') {
curl_setopt($curl, CURLOPT_POST, true);
curl_setopt($curl, CURLOPT_POSTFIELDS, $options['data']);
curl_setopt($curl, CURLOPT_POSTFIELDS, self::_buildHttpData($options['data']));
}
// 证书文件设置
if (!empty($options['ssl_cer'])) {
if (file_exists($options['ssl_cer'])) {
curl_setopt($curl, CURLOPT_SSLCERTTYPE, 'PEM');
curl_setopt($curl, CURLOPT_SSLCERT, $options['ssl_cer']);
} else {
throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_cer]");
}
}
if (!empty($options['ssl_cer'])) if (file_exists($options['ssl_cer'])) {
curl_setopt($curl, CURLOPT_SSLCERTTYPE, 'PEM');
curl_setopt($curl, CURLOPT_SSLCERT, $options['ssl_cer']);
} else throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_cer]");
// 证书文件设置
if (!empty($options['ssl_key'])) {
if (file_exists($options['ssl_key'])) {
curl_setopt($curl, CURLOPT_SSLKEYTYPE, 'PEM');
curl_setopt($curl, CURLOPT_SSLKEY, $options['ssl_key']);
} else {
throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_key]");
}
}
if (!empty($options['ssl_key'])) if (file_exists($options['ssl_key'])) {
curl_setopt($curl, CURLOPT_SSLKEYTYPE, 'PEM');
curl_setopt($curl, CURLOPT_SSLKEY, $options['ssl_key']);
} else throw new InvalidArgumentException("Certificate files that do not exist. --- [ssl_key]");
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_TIMEOUT, 60);
curl_setopt($curl, CURLOPT_HEADER, false);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
list($content, $status) = [curl_exec($curl), curl_getinfo($curl), curl_close($curl)];
return (intval($status["http_code"]) === 200) ? $content : false;
list($content) = [curl_exec($curl), curl_close($curl)];
// 清理 CURL 缓存文件
if (!empty(self::$cache_curl)) foreach (self::$cache_curl as $key => $file) {
Tools::delCache($file);
unset(self::$cache_curl[$key]);
}
return $content;
}
/**
* POST数据过滤处理
* @param array $data 需要处理的数据
* @param boolean $build 是否编译数据
* @return array|string
* @throws \WeChat\Exceptions\LocalCacheException
*/
private static function _buildHttpData($data, $build = true)
{
if (!is_array($data)) return $data;
foreach ($data as $key => $value) 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;
$data[$key] = self::createCurlFile($filename);
}
}
return $build ? http_build_query($data) : $data;
}
/**
@ -263,8 +291,10 @@ class Tools
*/
public static function pushFile($name, $content)
{
$file = self::getCacheName($name);
if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0');
$file = self::_getCacheName($name);
if (!file_put_contents($file, $content)) {
throw new LocalCacheException('local file write error.', '0');
}
return $file;
}
@ -278,9 +308,10 @@ class Tools
*/
public static function setCache($name, $value = '', $expired = 3600)
{
$file = self::getCacheName($name);
$content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]);
if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0');
$file = self::_getCacheName($name);
if (!file_put_contents($file, serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]))) {
throw new LocalCacheException('local cache error.', '0');
}
return $file;
}
@ -291,7 +322,7 @@ class Tools
*/
public static function getCache($name)
{
$file = self::getCacheName($name);
$file = self::_getCacheName($name);
if (file_exists($file) && ($content = file_get_contents($file))) {
$data = unserialize($content);
if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
@ -305,11 +336,11 @@ class Tools
/**
* 移除缓存文件
* @param string $name 缓存名称
* @return bool
* @return boolean
*/
public static function delCache($name)
{
$file = self::getCacheName($name);
$file = self::_getCacheName($name);
return file_exists($file) ? unlink($file) : true;
}
@ -318,7 +349,7 @@ class Tools
* @param string $name
* @return string
*/
private static function getCacheName($name)
private static function _getCacheName($name)
{
if (empty(self::$cache_path)) {
self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;

28
vendor/zoujingli/wechat-developer/WeChat/Limit.php vendored
View File

@ -14,7 +14,6 @@
namespace WeChat;
use WeChat\Contracts\BasicWeChat;
/**
@ -38,5 +37,32 @@ class Limit extends BasicWeChat
return $this->callPostApi($url, ['appid' => $this->config->get('appid')]);
}
/**
* 网络检测
* @param string $action 执行的检测动作
* @param string $operator 指定平台从某个运营商进行检测
* @return array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function ping($action = 'all', $operator = 'DEFAULT')
{
$url = 'https://api.weixin.qq.com/cgi-bin/callback/check?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->callPostApi($url, ['action' => $action, 'check_operator' => $operator]);
}
/**
* 获取微信服务器IP地址
* @return array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function getCallbackIp()
{
$url = 'https://api.weixin.qq.com/cgi-bin/getcallbackip?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->httpGetForJson($url);
}
}

4
vendor/zoujingli/wechat-developer/WeChat/Oauth.php vendored
View File

@ -42,6 +42,7 @@ class Oauth extends BasicWeChat
* 通过 code 获取 AccessToken 和 openid
* @return bool|array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function getOauthAccessToken()
{
@ -57,6 +58,7 @@ class Oauth extends BasicWeChat
* @param string $refresh_token
* @return bool|array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function getOauthRefreshToken($refresh_token)
{
@ -71,6 +73,7 @@ class Oauth extends BasicWeChat
* @param string $openid 用户的唯一标识
* @return array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function checkOauthAccessToken($access_token, $openid)
{
@ -85,6 +88,7 @@ class Oauth extends BasicWeChat
* @param string $lang 返回国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
* @return array
* @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException
*/
public function getUserInfo($access_token, $openid, $lang = 'zh_CN')
{

3
vendor/zoujingli/wechat-developer/WeChat/Pay.php vendored
View File

@ -162,12 +162,13 @@ class Pay extends BasicWePay
* 拉取订单评价数据
* @param array $options
* @return array
* @throws Exceptions\LocalCacheException
* @throws InvalidResponseException
*/
public function billCommtent(array $options)
{
$pay = new Bill($this->config->get());
return $pay->commtent($options);
return $pay->comment($options);
}
/**

1
vendor/zoujingli/wechat-developer/WeChat/Product.php vendored
View File

@ -14,7 +14,6 @@
namespace WeChat;
use WeChat\Contracts\BasicWeChat;
/**

12
vendor/zoujingli/wechat-developer/WeChat/Script.php vendored
View File

@ -87,15 +87,11 @@ class Script extends BasicWeChat
"timestamp" => $data['timestamp'],
"signature" => $this->getSignature($data, 'sha1'),
'jsApiList' => [
'onWXDeviceBluetoothStateChange', 'onWXDeviceStateChange',
'openProductSpecificView', 'addCard', 'chooseCard', 'openCard',
'translateVoice', 'getNetworkType', 'openLocation', 'getLocation',
'onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone',
'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'closeWindow', 'scanQRCode', 'chooseWXPay',
'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem',
'startScanWXDevice', 'stopScanWXDevice', 'onWXDeviceBindStateChange', 'onScanWXDeviceResult', 'onReceiveDataFromWXDevice',
'updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareWeibo', 'onMenuShareQZone',
'startRecord', 'stopRecord', 'onVoiceRecordEnd', 'playVoice', 'pauseVoice', 'stopVoice', 'onVoicePlayEnd', 'uploadVoice', 'downloadVoice',
'openWXDeviceLib', 'closeWXDeviceLib', 'getWXDeviceInfos', 'sendDataToWXDevice', 'disconnectWXDevice', 'getWXDeviceTicket', 'connectWXDevice',
'chooseImage', 'previewImage', 'uploadImage', 'downloadImage', 'translateVoice', 'getNetworkType', 'openLocation', 'getLocation',
'hideOptionMenu', 'showOptionMenu', 'hideMenuItems', 'showMenuItems', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem',
'closeWindow', 'scanQRCode', 'chooseWXPay', 'openProductSpecificView', 'addCard', 'chooseCard', 'openCard',
],
];
}

1
vendor/zoujingli/wechat-developer/WeChat/Wifi.php vendored
View File

@ -14,7 +14,6 @@
namespace WeChat;
use WeChat\Contracts\BasicWeChat;
/**

42
vendor/zoujingli/wechat-developer/_test/pay-order-notify.php vendored Normal file
View File

@ -0,0 +1,42 @@
<?php
// +----------------------------------------------------------------------
// | WeChatDeveloper
// +----------------------------------------------------------------------
// | 版权所有 2014~2018 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/WeChatDeveloper
// +----------------------------------------------------------------------
try {
// 1. 手动加载入口文件
include "../include.php";
// 2. 准备公众号配置参数
$config = include "./config.php";
// 3. 创建接口实例
$wechat = new \WeChat\Pay($config);
// 4. 获取通知参数
$data = $wechat->getNotify();
if ($data['result_code'] === 'SUCCESS' && $data['result_code'] === 'SUCCESS') {
// @todo 去更新下原订单的支付状态
$order_no = $data['out_trade_no'];
// 返回接收成功的回复
ob_clean();
echo $wechat->getNotifySuccessReply();
}
} catch (Exception $e) {
// 出错啦，处理下吧
echo $e->getMessage() . PHP_EOL;
}