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

[更新]CompoesrUpdate

Browse Source
This commit is contained in:
Anyon 2018-12-25 18:07:07 +08:00
parent e049fe479a
commit 5a9e2bb102
32 changed files with 295 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.31 LTS';
const VERSION = '5.1.32 LTS';
/**
* 当前模块路径
@ -722,9 +722,9 @@ class App extends Container
list($module, $class) = $this->parseModuleAndClass($name, $layer, $appendSuffix);
if (class_exists($class)) {
return $this->__get($class);
return $this->make($class, true);
} elseif ($empty && class_exists($emptyClass = $this->parseClass($module, $layer, $empty, $appendSuffix))) {
return $this->__get($emptyClass);
return $this->make($emptyClass, true);
}
throw new ClassNotFoundException('class not exists:' . $class, $class);

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

@ -67,6 +67,8 @@ class Controller
// 控制器初始化
$this->initialize();
$this->registerMiddleware();
// 前置操作方法 即将废弃
foreach ((array) $this->beforeActionList as $method => $options) {
is_numeric($method) ?

3
thinkphp/library/think/Model.php
View File

@ -392,11 +392,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* 设置数据是否存在
* @access public
* @param bool $exists
* @return void
* @return $this
*/
public function exists($exists)
{
$this->exists = $exists;
return $this;
}
/**

10
thinkphp/library/think/Validate.php
View File

@ -516,7 +516,7 @@ class Validate
$rules = array_merge($rules, $this->append[$field]);
}
$i = 0;
$i = 0;
$result = true;
foreach ($rules as $key => $rule) {
@ -1002,10 +1002,14 @@ class Validate
// 支持多个字段验证
$fields = explode('^', $key);
foreach ($fields as $key) {
$map[] = [$key, '=', $data[$key]];
if (isset($data[$key])) {
$map[] = [$key, '=', $data[$key]];
}
}
} else {
} elseif (isset($data[$field])) {
$map[] = [$key, '=', $data[$field]];
} else {
$map = [];
}
$pk = !empty($rule[3]) ? $rule[3] : $db->getPk();

18
thinkphp/library/think/cache/Driver.php vendored
View File

@ -219,7 +219,7 @@ abstract class Driver
} elseif (is_null($keys)) {
$this->tag = $name;
} else {
$key = 'tag_' . md5($name);
$key = $this->getTagkey($name);
if (is_string($keys)) {
$keys = explode(',', $keys);
@ -248,14 +248,19 @@ abstract class Driver
protected function setTagItem($name)
{
if ($this->tag) {
$key = 'tag_' . md5($this->tag);
$key = $this->getTagkey($this->tag);
$prev = $this->tag;
$this->tag = null;
if ($this->has($key)) {
$value = explode(',', $this->get($key));
$value[] = $name;
$value = implode(',', array_unique($value));
if (count($value) > 1000) {
array_shift($value);
}
$value = implode(',', array_unique($value));
} else {
$value = $name;
}
@ -273,7 +278,7 @@ abstract class Driver
*/
protected function getTagItem($tag)
{
$key = 'tag_' . md5($tag);
$key = $this->getTagkey($tag);
$value = $this->get($key);
if ($value) {
@ -283,6 +288,11 @@ abstract class Driver
}
}
protected function getTagKey($tag)
{
return 'tag_' . md5($tag);
}
/**
* 序列化数据
* @access protected

2
thinkphp/library/think/cache/driver/File.php vendored
View File

@ -266,7 +266,7 @@ class File extends Driver
foreach ($keys as $key) {
$this->unlink($key);
}
$this->rm('tag_' . md5($tag));
$this->rm($this->getTagKey($tag));
return true;
}

2
thinkphp/library/think/cache/driver/Lite.php vendored
View File

@ -198,7 +198,7 @@ class Lite extends Driver
unlink($key);
}
$this->rm('tag_' . md5($tag));
$this->rm($this->getTagKey($tag));
return true;
}

5
thinkphp/library/think/cache/driver/Memcache.php vendored
View File

@ -188,11 +188,13 @@ class Memcache extends Driver
if ($tag) {
// 指定标签清除
$keys = $this->getTagItem($tag);
foreach ($keys as $key) {
$this->handler->delete($key);
}
$this->rm('tag_' . md5($tag));
$tagName = $this->getTagKey($tag);
$this->rm($tagName);
return true;
}
@ -200,4 +202,5 @@ class Memcache extends Driver
return $this->handler->flush();
}
}

65
thinkphp/library/think/cache/driver/Memcached.php vendored
View File

@ -204,7 +204,7 @@ class Memcached extends Driver
$keys = $this->getTagItem($tag);
$this->handler->deleteMulti($keys);
$this->rm('tag_' . md5($tag));
$this->rm($this->getTagKey($tag));
return true;
}
@ -213,4 +213,67 @@ class Memcached extends Driver
return $this->handler->flush();
}
/**
* 缓存标签
* @access public
* @param string $name 标签名
* @param string|array $keys 缓存标识
* @param bool $overlay 是否覆盖
* @return $this
*/
public function tag($name, $keys = null, $overlay = false)
{
if (is_null($keys)) {
$this->tag = $name;
} else {
$tagName = $this->getTagKey($name);
if ($overlay) {
$this->handler->delete($tagName);
}
if (!$this->handler->has($tagName)) {
$this->handler->set($tagName, '');
}
foreach ($keys as $key) {
$this->handler->append($tagName, ',' . $key);
}
}
return $this;
}
/**
* 更新标签
* @access protected
* @param string $name 缓存标识
* @return void
*/
protected function setTagItem($name)
{
if ($this->tag) {
$tagName = $this->getTagKey($this->tag);
if ($this->handler->has($tagName)) {
$this->handler->append($tagName, ',' . $name);
} else {
$this->handler->set($tagName, $name);
}
$this->tag = null;
}
}
/**
* 获取标签包含的缓存标识
* @access public
* @param string $tag 缓存标签
* @return array
*/
public function getTagItem($tag)
{
$tagName = $this->getTagKey($tag);
return explode(',', trim($this->handler->get($tagName), ','));
}
}

64
thinkphp/library/think/cache/driver/Redis.php vendored
View File

@ -70,6 +70,10 @@ class Redis extends Driver
}
}
if ('' == $this->options['password']) {
unset($this->options['password']);
}
$this->handler = new \Predis\Client($this->options, $params);
$this->options['prefix'] = '';
@ -187,7 +191,7 @@ class Redis extends Driver
{
$this->writeTimes++;
return $this->handler->delete($this->getCacheKey($name));
return $this->handler->del($this->getCacheKey($name));
}
/**
@ -202,11 +206,10 @@ class Redis extends Driver
// 指定标签清除
$keys = $this->getTagItem($tag);
foreach ($keys as $key) {
$this->handler->delete($key);
}
$this->handler->del($keys);
$this->rm('tag_' . md5($tag));
$tagName = $this->getTagKey($tag);
$this->handler->del($tagName);
return true;
}
@ -215,4 +218,55 @@ class Redis extends Driver
return $this->handler->flushDB();
}
/**
* 缓存标签
* @access public
* @param string $name 标签名
* @param string|array $keys 缓存标识
* @param bool $overlay 是否覆盖
* @return $this
*/
public function tag($name, $keys = null, $overlay = false)
{
if (is_null($keys)) {
$this->tag = $name;
} else {
$tagName = $this->getTagKey($name);
if ($overlay) {
$this->handler->del($tagName);
}
foreach ($keys as $key) {
$this->handler->sAdd($tagName, $key);
}
}
return $this;
}
/**
* 更新标签
* @access protected
* @param string $name 缓存标识
* @return void
*/
protected function setTagItem($name)
{
if ($this->tag) {
$tagName = $this->getTagKey($this->tag);
$this->handler->sAdd($tagName, $name);
}
}
/**
* 获取标签包含的缓存标识
* @access protected
* @param string $tag 缓存标签
* @return array
*/
protected function getTagItem($tag)
{
$tagName = $this->getTagKey($tag);
return $this->handler->sMembers($tagName);
}
}

2
thinkphp/library/think/cache/driver/Sqlite.php vendored
View File

@ -216,7 +216,7 @@ class Sqlite extends Driver
public function clear($tag = null)
{
if ($tag) {
$name = sqlite_escape_string($tag);
$name = sqlite_escape_string($this->getTagKey($tag));
$sql = 'DELETE FROM ' . $this->options['table'] . ' WHERE tag=\'' . $name . '\'';
sqlite_query($this->handler, $sql);
return true;

15
thinkphp/library/think/cache/driver/Wincache.php vendored
View File

@ -160,15 +160,16 @@ class Wincache extends Driver
{
if ($tag) {
$keys = $this->getTagItem($tag);
foreach ($keys as $key) {
wincache_ucache_delete($key);
}
$this->rm('tag_' . md5($tag));
wincache_ucache_delete($keys);
$tagName = $this->getTagkey($tag);
$this->rm($tagName);
return true;
} else {
$this->writeTimes++;
return wincache_ucache_clear();
}
$this->writeTimes++;
return wincache_ucache_clear();
}
}

4
thinkphp/library/think/cache/driver/Xcache.php vendored
View File

@ -159,10 +159,12 @@ class Xcache extends Driver
if ($tag) {
// 指定标签清除
$keys = $this->getTagItem($tag);
foreach ($keys as $key) {
xcache_unset($key);
}
$this->rm('tag_' . md5($tag));
$this->rm($this->getTagKey($tag));
return true;
}

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

@ -628,9 +628,6 @@ class Query
$result = (float) $result;
}
// 查询完成后清空聚合字段信息
$this->removeOption('field');
return $result;
}

6
thinkphp/library/think/model/concern/Attribute.php
View File

@ -371,7 +371,8 @@ trait Attribute
case 'datetime':
case 'date':
$format = !empty($param) ? $param : $this->dateFormat;
$value = $this->formatDateTime($format . '.u');
$format .= strpos($format, 'u') || false !== strpos($format, '\\') ? '' : '.u';
$value = $this->formatDateTime($format);
break;
case 'timestamp':
case 'integer':
@ -384,7 +385,8 @@ trait Attribute
'date',
'timestamp',
])) {
$value = $this->formatDateTime($this->dateFormat . '.u');
$format = strpos($this->dateFormat, 'u') || false !== strpos($this->dateFormat, '\\') ? '' : '.u';
$value = $this->formatDateTime($this->dateFormat . $format);
} else {
$value = time();
}

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

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

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

@ -241,9 +241,9 @@ class HasMany extends Relation
*/
public function save($data, $replace = true)
{
$model = $this->make($data);
$model = $this->make();
return $model->replace($replace)->save() ? $model : false;
return $model->replace($replace)->save($data) ? $model : false;
}
/**

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

@ -277,7 +277,7 @@ class MorphMany extends Relation
*/
public function save($data)
{
$model = $this->make($data);
$model = $this->make();
return $model->save($data) ? $model : false;
}

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

@ -211,8 +211,8 @@ class MorphOne extends Relation
*/
public function save($data)
{
$model = $this->make($data);
return $model->save() ? $model : false;
$model = $this->make();
return $model->save($data) ? $model : false;
}
/**

16
thinkphp/library/think/route/Rule.php
View File

@ -722,13 +722,17 @@ abstract class Rule
// 替换路由地址中的变量
if (is_string($route) && !empty($matches)) {
foreach ($matches as $key => $val) {
if (false !== strpos($route, '<' . $key . '>')) {
$route = str_replace('<' . $key . '>', $val, $route);
} elseif (false !== strpos($route, ':' . $key)) {
$route = str_replace(':' . $key, $val, $route);
}
$search = $replace = [];
foreach ($matches as $key => $value) {
$search[] = '<' . $key . '>';
$replace[] = $value;
$search[] = ':' . $key;
$replace[] = $value;
}
$route = str_replace($search, $replace, $route);
}
// 解析额外参数

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

@ -69,10 +69,6 @@ class Module extends Dispatch
// 获取控制器名
$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;
// 获取操作名
@ -97,10 +93,6 @@ class Module extends Dispatch
$this->rule->getConfig('url_controller_layer'),
$this->rule->getConfig('controller_suffix'),
$this->rule->getConfig('empty_controller'));
if ($instance instanceof Controller) {
$instance->registerMiddleware();
}
} catch (ClassNotFoundException $e) {
throw new HttpException(404, 'controller not exists:' . $e->getClass());
}

4
thinkphp/library/think/route/dispatch/Url.php
View File

@ -60,6 +60,10 @@ class Url extends Dispatch
$controller = !empty($path) ? array_shift($path) : null;
}
if ($controller && !preg_match('/^[A-Za-z][\w|\.]*$/', $controller)) {
throw new HttpException(404, 'controller not exists:' . $controller);
}
// 解析操作
$action = !empty($path) ? array_shift($path) : null;

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65
class ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitdb024538c33c9c5891bc8d9e71a6cd38', '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\ComposerStaticInit372f99933a0353fdad4eccea136beb65::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit372f99933a0353fdad4eccea136beb65
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit372f99933a0353fdad4eccea136beb65::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire372f99933a0353fdad4eccea136beb65($fileIdentifier, $file);
composerRequiredb024538c33c9c5891bc8d9e71a6cd38($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire372f99933a0353fdad4eccea136beb65($fileIdentifier, $file)
function composerRequiredb024538c33c9c5891bc8d9e71a6cd38($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 ComposerStaticInit372f99933a0353fdad4eccea136beb65
class ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38
{
public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -321,9 +321,9 @@ class ComposerStaticInit372f99933a0353fdad4eccea136beb65
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit372f99933a0353fdad4eccea136beb65::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitdb024538c33c9c5891bc8d9e71a6cd38::$classMap;
}, null, ClassLoader::class);
}

24
vendor/composer/installed.json vendored
View File

@ -239,17 +239,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.31",
"version_normalized": "5.1.31.0",
"version": "v5.1.32",
"version_normalized": "5.1.32.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0"
"reference": "88a2ab625b35e047896718db320e08375cf021da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
"reference": "93339b1a4df5a73e0143db0847a4c5e0b2e46fb0",
"url": "https://api.github.com/repos/top-think/framework/zipball/88a2ab625b35e047896718db320e08375cf021da",
"reference": "88a2ab625b35e047896718db320e08375cf021da",
"shasum": "",
"mirrors": [
{
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-12-09T12:41:21+00:00",
"time": "2018-12-23T13:42:11+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.7",
"version_normalized": "1.2.7.0",
"version": "v1.2.9",
"version_normalized": "1.2.9.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "fbf73b5ca44da65c3df93b11b27998476260e227"
"reference": "9e117202873a3219b978eba6bac4c3c40b5cbc3c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/fbf73b5ca44da65c3df93b11b27998476260e227",
"reference": "fbf73b5ca44da65c3df93b11b27998476260e227",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9e117202873a3219b978eba6bac4c3c40b5cbc3c",
"reference": "9e117202873a3219b978eba6bac4c3c40b5cbc3c",
"shasum": "",
"mirrors": [
{
@ -468,7 +468,7 @@
"ext-openssl": "*",
"php": ">=5.4"
},
"time": "2018-12-05T09:06:38+00:00",
"time": "2018-12-19T07:58:04+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

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

@ -93,6 +93,7 @@ abstract class BasicAliPay
* @param string $out_trade_no
* @return array|boolean
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function query($out_trade_no = '')
{
@ -106,6 +107,7 @@ abstract class BasicAliPay
* @param null $refund_amount 退款金额
* @return array|boolean
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function refund($options, $refund_amount = null)
{
@ -119,6 +121,7 @@ abstract class BasicAliPay
* @param array|string $options
* @return array|boolean
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function close($options)
{
@ -210,6 +213,7 @@ abstract class BasicAliPay
* @param array $options
* @return array|boolean
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
protected function getResult($options)
{

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

@ -43,18 +43,18 @@ class BasicPushEvent
*/
protected $encryptType;
/**
* 公众号的推送请求参数
* @var DataArray
*/
protected $input;
/**
* 当前公众号配置对象
* @var DataArray
*/
protected $config;
/**
* 公众号的推送请求参数
* @var DataArray
*/
protected $params;
/**
* 公众号推送内容对象
* @var DataArray
@ -85,13 +85,13 @@ class BasicPushEvent
}
// 参数初始化
$this->config = new DataArray($options);
$this->params = new DataArray($_REQUEST);
$this->input = new DataArray($_REQUEST);
$this->appid = $this->config->get('appid');
// 推送消息处理
if ($_SERVER['REQUEST_METHOD'] == "POST") {
$this->postxml = file_get_contents("php://input");
$this->encryptType = $this->params->get('encrypt_type');
if ($this->encryptType == 'aes') {
$this->encryptType = $this->input->get('encrypt_type');
if ($this->isEncrypt()) {
if (empty($options['encodingaeskey'])) {
throw new InvalidArgumentException("Missing Config -- [encodingaeskey]");
}
@ -109,23 +109,33 @@ class BasicPushEvent
$this->receive = new DataArray(Tools::xml2arr($this->postxml));
} elseif ($_SERVER['REQUEST_METHOD'] == "GET" && $this->checkSignature()) {
@ob_clean();
exit($this->params->get('echostr'));
exit($this->input->get('echostr'));
} else {
throw new InvalidResponseException('Invalid interface request.', '0');
}
}
/**
* 消息是否需要加密
* @return boolean
*/
public function isEncrypt()
{
return $this->encryptType === 'aes';
}
/**
* 回复消息
* @param array $data 消息内容
* @param bool $return 是否返回XML内容
* @param boolean $return 是否返回XML内容
* @param boolean $isEncrypt 是否加密内容
* @return string
* @throws InvalidDecryptException
*/
public function reply(array $data = [], $return = false)
public function reply(array $data = [], $return = false, $isEncrypt = false)
{
$xml = Tools::arr2xml(empty($data) ? $this->message : $data);
if ($this->encryptType == 'aes') {
if ($this->isEncrypt() || $isEncrypt) {
if (!class_exists('Prpcrypt', false)) {
require __DIR__ . '/Prpcrypt.php';
}
@ -134,9 +144,7 @@ class BasicPushEvent
$component_appid = $this->config->get('component_appid');
$appid = empty($component_appid) ? $this->appid : $component_appid;
$array = $prpcrypt->encrypt($xml, $appid);
if ($array[0] > 0) {
throw new InvalidDecryptException('Encrypt Error.', '0');
}
if ($array[0] > 0) throw new InvalidDecryptException('Encrypt Error.', '0');
list($timestamp, $encrypt) = [time(), $array[1]];
$nonce = rand(77, 999) * rand(605, 888) * rand(11, 99);
$tmpArr = [$this->config->get('token'), $timestamp, $nonce, $encrypt];
@ -145,9 +153,7 @@ class BasicPushEvent
$format = "<xml><Encrypt><![CDATA[%s]]></Encrypt><MsgSignature><![CDATA[%s]]></MsgSignature><TimeStamp>%s</TimeStamp><Nonce><![CDATA[%s]]></Nonce></xml>";
$xml = sprintf($format, $encrypt, $signature, $timestamp, $nonce);
}
if ($return) {
return $xml;
}
if ($return) return $xml;
@ob_clean();
echo $xml;
}
@ -159,10 +165,10 @@ class BasicPushEvent
*/
private function checkSignature($str = '')
{
$nonce = $this->params->get('nonce');
$timestamp = $this->params->get('timestamp');
$msg_signature = $this->params->get('msg_signature');
$signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
$nonce = $this->input->get('nonce');
$timestamp = $this->input->get('timestamp');
$msg_signature = $this->input->get('msg_signature');
$signature = empty($msg_signature) ? $this->input->get('signature') : $msg_signature;
$tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
sort($tmpArr, SORT_STRING);
return sha1(implode($tmpArr)) === $signature;

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

@ -96,12 +96,15 @@ class Tools
*/
public static function createCurlFile($filename, $mimetype = null, $postname = null)
{
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);
if (is_string($filename) && file_exists($filename)) {
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);
}
return "@{$filename};filename={$postname};type={$mimetype}";
}
return "@{$filename};filename={$postname};type={$mimetype}";
return $filename;
}
/**
@ -271,8 +274,9 @@ class Tools
$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);
$mycurl = new MyCurlFile((array)$value);
$data[$key] = $mycurl->get();
array_push(self::$cache_curl, $mycurl->tempname);
} elseif (is_string($value) && class_exists('CURLFile', false) && stripos($value, '@') === 0) {
if (($filename = realpath(trim($value, '@'))) && file_exists($filename)) {
$build = false;

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

@ -55,6 +55,17 @@ class Pay extends BasicWePay
return $pay->jsapiParams($prepay_id);
}
/**
* 获取APP支付参数
* @param string $prepay_id 统一下单预支付码
* @return array
*/
public function createParamsForApp($prepay_id)
{
$pay = new Order($this->config->get());
return $pay->appParams($prepay_id);
}
/**
* 获取支付规则二维码
* @param string $product_id 商户定义的商品id 或者订单号

3
vendor/zoujingli/wechat-developer/WePay/Bill.php vendored
View File

@ -30,7 +30,8 @@ class Bill extends BasicWePay
* @param array $options 静音参数
* @param null|string $outType 输出类型
* @return bool|string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function download(array $options, $outType = null)
{

19
vendor/zoujingli/wechat-developer/WePay/Order.php vendored
View File

@ -100,6 +100,25 @@ class Order extends BasicWePay
return "weixin://wxpay/bizpayurl?" . http_build_query($data);
}
/**
* 获取微信App支付秘需参数
* @param string $prepayId 统一下单预支付码
* @return array
*/
public function appParams($prepayId)
{
$data = [
'appid' => $this->config->get('appid'),
'partnerid' => $this->config->get('mch_id'),
'prepayid' => (string)$prepayId,
'package' => 'Sign=WXPay',
'timestamp' => (string)time(),
'noncestr' => Tools::createNoncestr(),
];
$data['sign'] = $this->getPaySign($data, 'MD5');
return $data;
}
/**
* 刷卡支付 撤销订单
* @param array $options