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:
邹景立 2018-05-12 16:18:01 +08:00
parent 25d62a355d
commit 1ce23fc7a0
69 changed files with 1189 additions and 933 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thinkphp/composer.json
View File

@ -21,7 +21,7 @@
],
"require": {
"php": ">=5.6.0",
"topthink/think-installer": "~1.0"
"topthink/think-installer": "2.*"
},
"require-dev": {
"phpunit/phpunit": "^5.0|^6.0",

2
thinkphp/convention.php
View File

@ -79,6 +79,8 @@ return [
'pathinfo_depr' => '/',
// HTTPS代理标识
'https_agent_name' => '',
// IP代理获取标识
'http_agent_ip' => 'X-REAL-IP',
// URL伪静态后缀
'url_html_suffix' => 'html',
// URL普通方式参数 用于自动生成

2
thinkphp/helper.php
View File

@ -70,7 +70,7 @@ if (!function_exists('app')) {
* @param string $name 类名或标识 默认获取当前应用实例
* @param array $args 参数
* @param bool $newInstance 是否每次创建新的实例
* @return object
* @return mixed|\think\App
*/
function app($name = 'think\App', $args = [], $newInstance = false)
{

1
thinkphp/lang/zh-cn.php
View File

@ -51,6 +51,7 @@ return [
'where express error' => '查询表达式错误',
'no data to update' => '没有任何数据需要更新',
'miss data to insert' => '缺少需要写入的数据',
'not support data' => '不支持的数据表达式',
'miss complex primary data' => '缺少复合主键数据',
'miss update condition' => '缺少更新条件',
'model data Not Found' => '模型数据不存在',

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App implements \ArrayAccess
{
const VERSION = '5.1.10';
const VERSION = '5.1.13';
/**
* 当前模块路径
@ -128,6 +128,12 @@ class App implements \ArrayAccess
{
$this->appPath = $appPath ? realpath($appPath) . DIRECTORY_SEPARATOR : $this->getAppPath();
$this->container = Container::getInstance();
$this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
$this->rootPath = dirname($this->appPath) . DIRECTORY_SEPARATOR;
$this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
$this->routePath = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
$this->configPath = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
}
/**
@ -161,13 +167,8 @@ class App implements \ArrayAccess
*/
public function initialize()
{
$this->beginTime = microtime(true);
$this->beginMem = memory_get_usage();
$this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
$this->rootPath = dirname($this->appPath) . DIRECTORY_SEPARATOR;
$this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
$this->routePath = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
$this->configPath = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
$this->beginTime = microtime(true);
$this->beginMem = memory_get_usage();
// 设置路径环境变量
$this->env->set([
@ -304,6 +305,8 @@ class App implements \ArrayAccess
}
}
$this->setModulePath($path);
$this->request->filter($this->config('app.default_filter'));
}
@ -891,7 +894,7 @@ class App implements \ArrayAccess
public function __unset($name)
{
$this->container->__unset($name);
$this->container->delete($name);
}
public function offsetExists($key)

8
thinkphp/library/think/Cache.php
View File

@ -13,6 +13,14 @@ namespace think;
use think\cache\Driver;
/**
* Class Cache
*
* @package think
*
* @mixin Driver
* @mixin \think\cache\driver\File
*/
class Cache
{
/**

54
thinkphp/library/think/Container.php
View File

@ -39,6 +39,12 @@ class Container
*/
protected $bind = [];
/**
* 容器标识别名
* @var array
*/
protected $name = [];
/**
* 获取当前容器的实例（单例）
* @access public
@ -124,17 +130,21 @@ class Container
/**
* 绑定一个类实例当容器
* @access public
* @param string $abstract 类名或者标识
* @param object $instance 类的实例
* @param string $abstract 类名或者标识
* @param object|\Closure $instance 类的实例
* @return $this
*/
public function instance($abstract, $instance)
{
if (isset($this->bind[$abstract])) {
$abstract = $this->bind[$abstract];
}
if ($instance instanceof \Closure) {
$this->bind[$abstract] = $instance;
} else {
if (isset($this->bind[$abstract])) {
$abstract = $this->bind[$abstract];
}
$this->instances[$abstract] = $instance;
$this->instances[$abstract] = $instance;
}
return $this;
}
@ -177,6 +187,8 @@ class Container
$vars = [];
}
$abstract = isset($this->name[$abstract]) ? $this->name[$abstract] : $abstract;
if (isset($this->instances[$abstract]) && !$newInstance) {
return $this->instances[$abstract];
}
@ -187,7 +199,8 @@ class Container
if ($concrete instanceof Closure) {
$object = $this->invokeFunction($concrete, $vars);
} else {
$object = $this->make($concrete, $vars, $newInstance);
$this->name[$abstract] = $concrete;
return $this->make($concrete, $vars, $newInstance);
}
} else {
$object = $this->invokeClass($abstract, $vars);
@ -203,13 +216,17 @@ class Container
/**
* 删除容器中的对象实例
* @access public
* @param string $abstract 类名或者标识
* @param string|array $abstract 类名或者标识
* @return void
*/
public function delete($abstract)
{
if (isset($this->instances[$abstract])) {
unset($this->instances[$abstract]);
foreach ((array) $abstract as $name) {
$name = isset($this->name[$name]) ? $this->name[$name] : $name;
if (isset($this->instances[$name])) {
unset($this->instances[$name]);
}
}
}
@ -222,6 +239,7 @@ class Container
{
$this->instances = [];
$this->bind = [];
$this->name = [];
}
/**
@ -238,7 +256,7 @@ class Container
$args = $this->bindParams($reflect, $vars);
return $reflect->invokeArgs($args);
return call_user_func_array($function, $args);
} catch (ReflectionException $e) {
throw new Exception('function not exists: ' . $function . '()');
}
@ -266,6 +284,10 @@ class Container
return $reflect->invokeArgs(isset($class) ? $class : null, $args);
} catch (ReflectionException $e) {
if (is_array($method) && is_object($method[0])) {
$method[0] = get_class($method[0]);
}
throw new Exception('method not exists: ' . (is_array($method) ? $method[0] . '::' . $method[1] : $method) . '()');
}
}
@ -313,11 +335,21 @@ class Container
try {
$reflect = new ReflectionClass($class);
if ($reflect->hasMethod('__make')) {
$method = new ReflectionMethod($class, '__make');
if ($method->isPublic() && $method->isStatic()) {
$args = $this->bindParams($method, $vars);
return $method->invokeArgs(null, $args);
}
}
$constructor = $reflect->getConstructor();
$args = $constructor ? $this->bindParams($constructor, $vars) : [];
return $reflect->newInstanceArgs($args);
} catch (ReflectionException $e) {
throw new ClassNotFoundException('class not exists: ' . $class, $class);
}

8
thinkphp/library/think/Db.php
View File

@ -16,14 +16,22 @@ namespace think;
* @package think
* @method \think\db\Query connect(array $config =[], mixed $name = false) static 连接/切换数据库连接
* @method \think\db\Query master() static 从主服务器读取数据
* @method \think\db\Query readMaster(bool $all = false) static 后续从主服务器读取数据
* @method \think\db\Query table(string $table) static 指定数据表（含前缀）
* @method \think\db\Query name(string $name) static 指定数据表（不含前缀）
* @method \think\db\Expression raw(string $value) static 使用表达式设置数据
* @method \think\db\Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件
* @method \think\db\Query whereRaw(string $where, array $bind = []) static 表达式查询
* @method \think\db\Query whereExp(string $field, string $condition, array $bind = []) static 字段表达式查询
* @method \think\db\Query when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询
* @method \think\db\Query join(mixed $join, mixed $condition = null, string $type = 'INNER') static JOIN查询
* @method \think\db\Query view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询
* @method \think\db\Query field(mixed $field, boolean $except = false) static 指定查询字段
* @method \think\db\Query fieldRaw(string $field, array $bind = []) static 指定查询字段
* @method \think\db\Query union(mixed $union, boolean $all = false) static UNION查询
* @method \think\db\Query limit(mixed $offset, integer $length = null) static 查询LIMIT
* @method \think\db\Query order(mixed $field, string $order = null) static 查询ORDER
* @method \think\db\Query orderRaw(string $field, array $bind = []) static 查询ORDER
* @method \think\db\Query cache(mixed $key = null , integer $expire = null) static 设置查询缓存
* @method mixed value(string $field) static 获取某个字段的值
* @method array column(string $field, string $key = '') static 获取某个列的值

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

@ -57,7 +57,8 @@ class Facade
*/
protected static function createFacade($class = '', $args = [], $newInstance = false)
{
$class = $class ?: static::class;
$class = $class ?: static::class;
$facadeClass = static::getFacadeClass();
if ($facadeClass) {

24
thinkphp/library/think/Loader.php
View File

@ -41,10 +41,10 @@ class Loader
private static $fallbackDirsPsr0 = [];
/**
* 自动加载的文件列表
* 需要加载的文件
* @var array
*/
private static $autoloadFiles = [];
private static $files = [];
/**
* Composer安装路径
@ -88,7 +88,7 @@ class Loader
$declaredClass = get_declared_classes();
$composerClass = array_pop($declaredClass);
foreach (['prefixLengthsPsr4', 'prefixDirsPsr4', 'prefixesPsr0', 'classMap'] as $attr) {
foreach (['prefixLengthsPsr4', 'prefixDirsPsr4', 'fallbackDirsPsr4', 'prefixesPsr0', 'fallbackDirsPsr0', 'classMap', 'files'] as $attr) {
if (property_exists($composerClass, $attr)) {
self::${$attr} = $composerClass::${$attr};
}
@ -340,22 +340,20 @@ class Loader
self::addClassMap($classMap);
}
}
if (is_file($composerPath . 'autoload_files.php')) {
self::$files = require $composerPath . 'autoload_files.php';
}
}
// 加载composer autofile文件
public static function loadComposerAutoloadFiles()
{
if (is_file(self::$composerPath . 'autoload_files.php')) {
$includeFiles = require self::$composerPath . 'autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) {
if (isset($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
continue;
}
foreach (self::$files as $fileIdentifier => $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
__require_file($file);
if (empty(self::$autoloadFiles[$fileIdentifier])) {
__require_file($file);
self::$autoloadFiles[$fileIdentifier] = true;
}
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
}
}
}

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

@ -92,6 +92,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
protected static $initialized = [];
/**
* 是否从主库读取（主从分布式有效）
* @var array
*/
protected static $readMaster;
/**
* 查询对象实例
* @var Query
@ -171,6 +177,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->connection = array_merge($config->pull('database'), $this->connection);
}
if ($this->observerClass) {
// 注册模型观察者
static::observe($this->observerClass);
}
// 执行初始化操作
$this->initialize();
}
@ -185,6 +196,21 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $this->name;
}
/**
* 是否从主库读取数据（主从分布有效）
* @access public
* @param bool $all 是否所有模型有效
* @return $this
*/
public function readMaster($all = false)
{
$model = $all ? '*' : static::class;
static::$readMaster[$model] = true;
return $this;
}
/**
* 创建新的模型实例
* @access public
@ -207,7 +233,14 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
{
// 设置当前模型 确保查询返回模型对象
$class = $this->query;
$query = (new $class())->connect($this->connection)->model($this)->json($this->json);
$query = (new $class())->connect($this->connection)
->model($this)
->json($this->json)
->setJsonFieldType($this->jsonType);
if (isset(static::$readMaster['*']) || isset(static::$readMaster[static::class])) {
$query->master(true);
}
// 设置当前数据表和模型名
if (!empty($this->table)) {
@ -567,12 +600,20 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 读取更新条件
$where = $this->getWhere();
// 事件回调
if (false === $this->trigger('before_update')) {
return false;
}
$result = $this->db(false)->where($where)->setInc($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] += $step;
}
// 更新回调
$this->trigger('after_update');
return $result;
}
@ -590,12 +631,20 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 读取更新条件
$where = $this->getWhere();
// 事件回调
if (false === $this->trigger('before_update')) {
return false;
}
$result = $this->db(false)->where($where)->setDec($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] -= $step;
}
// 更新回调
$this->trigger('after_update');
return $result;
}

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

@ -431,7 +431,15 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
public function __call($name, $arguments)
{
return call_user_func_array([$this->getCollection(), $name], $arguments);
$collection = $this->getCollection();
$result = call_user_func_array([$collection, $name], $arguments);
if ($result === $collection) {
return $this;
}
return $result;
}
}

51
thinkphp/library/think/Request.php
View File

@ -404,19 +404,24 @@ class Request
/**
* 设置或获取当前包含协议的域名
* @access public
* @param string $domain 域名
* @param string|bool $domain 域名
* @return string|$this
*/
public function domain($domain = null)
{
if (!is_null($domain)) {
$this->domain = $domain;
return $this;
} elseif (!$this->domain) {
$this->domain = $this->scheme() . '://' . $this->host();
if (is_null($domain)) {
if (!$this->domain) {
$this->domain = $this->scheme() . '://' . $this->host();
}
return $this->domain;
}
return $this->domain;
if (true === $domain) {
return $this->scheme() . '://' . $this->host(true);
}
$this->domain = $domain;
return $this;
}
/**
@ -429,7 +434,7 @@ class Request
$root = $this->config->get('app.url_domain_root');
if (!$root) {
$item = explode('.', $this->host());
$item = explode('.', $this->host(true));
$count = count($item);
$root = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
}
@ -450,9 +455,9 @@ class Request
if ($rootDomain) {
// 配置域名根 例如 thinkphp.cn 163.com.cn 如果是国家级域名 com.cn net.cn 之类的域名需要配置
$domain = explode('.', rtrim(stristr($this->host(), $rootDomain, true), '.'));
$domain = explode('.', rtrim(stristr($this->host(true), $rootDomain, true), '.'));
} else {
$domain = explode('.', $this->host(), -2);
$domain = explode('.', $this->host(true), -2);
}
$this->subDomain = implode('.', $domain);
@ -1593,11 +1598,11 @@ class Request
// IP地址合法验证
if (filter_var($ip, FILTER_VALIDATE_IP) !== $ip) {
$ip = ($ip_mode === 'ipv4') ? '0.0.0.0' : '::';
$ip = ('ipv4' === $ip_mode) ? '0.0.0.0' : '::';
}
// 如果是ipv4地址，则直接使用ip2long返回int类型ip；如果是ipv6地址，暂时不支持，直接返回0
$long_ip = ($ip_mode === 'ipv4') ? sprintf("%u", ip2long($ip)) : 0;
$long_ip = ('ipv4' === $ip_mode) ? sprintf("%u", ip2long($ip)) : 0;
$ip = [$ip, $long_ip];
@ -1647,15 +1652,18 @@ class Request
/**
* 当前请求的host
* @access public
* @param bool $strict true 仅仅获取HOST
* @return string
*/
public function host()
public function host($strict = false)
{
if (isset($_SERVER['HTTP_X_REAL_HOST'])) {
return $_SERVER['HTTP_X_REAL_HOST'];
$host = $_SERVER['HTTP_X_REAL_HOST'];
} else {
$host = $this->server('HTTP_HOST');
}
return $this->server('HTTP_HOST');
return true === $strict && strpos($host, ':') ? strstr($host, ':', true) : $host;
}
/**
@ -1952,10 +1960,21 @@ class Request
return $this->cache;
}
/**
* 设置请求数据
* @access public
* @param string $name 参数名
* @param mixed $value 值
*/
public function __set($name, $value)
{
return $this->param[$name] = $value;
}
/**
* 获取请求数据的值
* @access public
* @param string $name 名称
* @param string $name 参数名
* @return mixed
*/
public function __get($name)

4
thinkphp/library/think/Route.php
View File

@ -122,7 +122,7 @@ class Route
public function __construct(Request $request)
{
$this->request = $request;
$this->host = $this->request->host();
$this->host = $this->request->host(true);
$this->setDefaultDomain();
}
@ -313,6 +313,8 @@ class Route
{
if (is_null($domain)) {
$domain = $this->domain;
} elseif (true === $domain) {
return $this->bind;
} elseif (!strpos($domain, '.')) {
$domain .= '.' . $this->request->rootDomain();
}

33
thinkphp/library/think/Url.php
View File

@ -105,7 +105,7 @@ class Url
$url = $match[0];
if (!empty($match[1])) {
$host = $this->app['config']->get('app_host') ?: $this->app['request']->host();
$host = $this->app['config']->get('app_host') ?: $this->app['request']->host(true);
if ($domain || $match[1] != $host) {
$domain = $match[1];
}
@ -139,6 +139,25 @@ class Url
$url = $this->parseUrl($url);
}
// 检测URL绑定
if (!$this->bindCheck) {
$bind = $this->app['route']->getBind($domain && is_string($domain) ? $domain : null);
if ($bind && 0 === strpos($url, $bind)) {
$url = substr($url, strlen($bind) + 1);
} else {
$binds = $this->app['route']->getBind(true);
foreach ($binds as $key => $val) {
if (is_string($val) && 0 === strpos($url, $val) && substr_count($val, '/') > 1) {
$url = substr($url, strlen($val) + 1);
$domain = $key;
break;
}
}
}
}
if (isset($info['query'])) {
// 解析地址里面参数 合并到vars
parse_str($info['query'], $params);
@ -146,15 +165,6 @@ class Url
}
}
// 检测URL绑定
if (!$this->bindCheck) {
$bind = $this->app['route']->getBind($domain ?: null);
if ($bind && 0 === strpos($url, $bind)) {
$url = substr($url, strlen($bind) + 1);
}
}
// 还原URL分隔符
$depr = $this->app['config']->get('pathinfo_depr');
$url = str_replace('/', $depr, $url);
@ -254,9 +264,8 @@ class Url
$rootDomain = $this->app['request']->rootDomain();
if (true === $domain) {
// 自动判断域名
$domain = $this->app['config']->get('app_host') ?: $this->app['request']->host();
$domain = $this->app['config']->get('app_host') ?: $this->app['request']->host(true);
$domains = $this->app['route']->getDomains();

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

@ -41,28 +41,37 @@ class Redis extends Driver
*/
public function __construct($options = [])
{
if (!extension_loaded('redis')) {
throw new \BadFunctionCallException('not support: redis');
}
if (!empty($options)) {
$this->options = array_merge($this->options, $options);
}
$this->handler = new \Redis;
if (extension_loaded('redis')) {
$this->handler = new \Redis;
if ($this->options['persistent']) {
$this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']);
if ($this->options['persistent']) {
$this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']);
} else {
$this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']);
}
if ('' != $this->options['password']) {
$this->handler->auth($this->options['password']);
}
if (0 != $this->options['select']) {
$this->handler->select($this->options['select']);
}
} elseif (class_exists('\Predis\Client')) {
$params = [];
foreach ($this->options as $key => $val) {
if (in_array($key, ['aggregate', 'cluster', 'connections', 'exceptions', 'prefix', 'profile', 'replication'])) {
$params[$key] = $val;
unset($this->options[$key]);
}
}
$this->handler = new \Predis\Client($this->options, $params);
} else {
$this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']);
}
if ('' != $this->options['password']) {
$this->handler->auth($this->options['password']);
}
if (0 != $this->options['select']) {
$this->handler->select($this->options['select']);
throw new \BadFunctionCallException('not support: redis');
}
}

63
thinkphp/library/think/db/Builder.php
View File

@ -33,6 +33,7 @@ abstract class Builder
'parseBetweenTime' => ['BETWEEN TIME', 'NOT BETWEEN TIME'],
'parseTime' => ['< TIME', '> TIME', '<= TIME', '>= TIME'],
'parseExists' => ['NOT EXISTS', 'EXISTS'],
'parseColumn' => ['COLUMN'],
];
// SQL表达式
@ -143,6 +144,8 @@ abstract class Builder
case 'DEC':
$result[$item] = $item . ' - ' . floatval($val[1]);
break;
case 'EXP':
throw new Exception('not support data:[' . $val[0] . ']');
}
} elseif (is_scalar($val)) {
// 过滤非标量数据
@ -182,13 +185,13 @@ abstract class Builder
* 字段名分析
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param mixed $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key, $strict = false)
{
return $key;
return $key instanceof Expression ? $key->getValue() : $key;
}
/**
@ -207,9 +210,7 @@ abstract class Builder
$array = [];
foreach ($fields as $key => $field) {
if ($field instanceof Expression) {
$array[] = $field->getValue();
} elseif (!is_numeric($key)) {
if (!is_numeric($key)) {
$array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field, true);
} else {
$array[] = $this->parseKey($query, $field);
@ -412,7 +413,12 @@ abstract class Builder
$value = $value->__toString();
}
$bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
if (strpos($field, '->')) {
$jsonType = $query->getJsonFieldType($field);
$bindType = $this->connection->getFieldBindType($jsonType);
} else {
$bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
}
if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
if (strpos($value, ':') !== 0 || !$query->isBind(substr($value, 1))) {
@ -458,7 +464,7 @@ abstract class Builder
// 模糊匹配
if (is_array($value)) {
foreach ($value as $k => $item) {
$bindKey = $bindName . '_' . $k;
$bindKey = $bindName . '_' . intval($k);
$bind[$bindKey] = [$item, $bindType];
$array[] = $key . ' ' . $exp . ' :' . $bindKey;
}
@ -473,6 +479,30 @@ abstract class Builder
return $whereStr;
}
/**
* 表达式查询
* @access protected
* @param Query $query 查询对象
* @param string $key
* @param string $exp
* @param array $value
* @param string $field
* @param string $bindName
* @param integer $bindType
* @return string
*/
protected function parseColumn(Query $query, $key, $exp, array $value, $field, $bindName, $bindType)
{
// 字段比较查询
list($op, $field2) = $value;
if (!in_array($op, ['=', '<>', '>', '>=', '<', '<='])) {
throw new Exception('where express error:' . var_export($value, true));
}
return '( ' . $key . ' ' . $op . ' ' . $this->parseKey($query, $field2, true) . ' )';
}
/**
* 表达式查询
* @access protected
@ -787,9 +817,12 @@ abstract class Builder
$condition = [];
foreach ((array) $on as $val) {
if (strpos($val, '=')) {
if ($val instanceof Expression) {
$condition[] = $val->getValue();
} elseif (strpos($val, '=')) {
list($val1, $val2) = explode('=', $val, 2);
$condition[] = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
$condition[] = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
} else {
$condition[] = $val;
}
@ -843,7 +876,7 @@ abstract class Builder
}
/**
* group分析
* orderField分析
* @access protected
* @param Query $query 查询对象
* @param mixed $key
@ -917,6 +950,10 @@ abstract class Builder
*/
protected function parseComment(Query $query, $comment)
{
if (false !== strpos($comment, '*/')) {
$comment = strstr($coment, '*/', true);
}
return !empty($comment) ? ' /* ' . $comment . ' */' : '';
}
@ -1035,7 +1072,7 @@ abstract class Builder
// 分析并处理数据
$data = $this->parseData($query, $options['data']);
if (empty($data)) {
return 0;
return '';
}
$fields = array_keys($data);
@ -1113,8 +1150,6 @@ abstract class Builder
*/
public function selectInsert(Query $query, $fields, $table)
{
$options = $query->getOptions();
if (is_string($fields)) {
$fields = explode(',', $fields);
}
@ -1123,7 +1158,7 @@ abstract class Builder
$field = $this->parseKey($query, $field, true);
}
return 'INSERT INTO ' . $this->parseTable($query, $table, $options) . ' (' . implode(',', $fields) . ') ' . $this->select($options);
return 'INSERT INTO ' . $this->parseTable($query, $table) . ' (' . implode(',', $fields) . ') ' . $this->select($query);
}
/**

120
thinkphp/library/think/db/Connection.php
View File

@ -90,6 +90,8 @@ abstract class Connection
'master_num' => 1,
// 指定从服务器序号
'slave_no' => '',
// 模型写入后自动读取主服务器
'read_master' => false,
// 是否严格检查字段是否存在
'fields_strict' => true,
// 数据集返回类型
@ -614,7 +616,7 @@ abstract class Connection
$this->PDOStatement->execute();
// 调试结束
$this->debug(false);
$this->debug(false, '', $master);
// 返回结果集
while ($result = $this->PDOStatement->fetch($this->fetchType)) {
@ -688,7 +690,7 @@ abstract class Connection
$this->PDOStatement->execute();
// 调试结束
$this->debug(false);
$this->debug(false, '', $master);
// 返回结果集
return $this->getResult($pdo, $procedure);
@ -718,13 +720,14 @@ abstract class Connection
* @access public
* @param string $sql sql指令
* @param array $bind 参数绑定
* @param Query $query 查询对象
* @return int
* @throws BindParamException
* @throws \PDOException
* @throws \Exception
* @throws \Throwable
*/
public function execute($sql, $bind = [])
public function execute($sql, $bind = [], Query $query = null)
{
$this->initConnect(true);
@ -766,26 +769,30 @@ abstract class Connection
$this->PDOStatement->execute();
// 调试结束
$this->debug(false);
$this->debug(false, '', true);
if ($query && !empty($this->config['deploy']) && !empty($this->config['read_master'])) {
$query->readMaster();
}
$this->numRows = $this->PDOStatement->rowCount();
return $this->numRows;
} catch (\PDOException $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw new PDOException($e, $this->config, $this->getLastsql());
} catch (\Throwable $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw $e;
} catch (\Exception $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
return $this->close()->execute($sql, $bind, $query);
}
throw $e;
@ -807,11 +814,8 @@ abstract class Connection
$options = $query->getOptions();
$pk = $query->getPk($options);
if (!empty($options['cache']) && true === $options['cache']['key'] && is_string($pk) && isset($options['where']['AND'][$pk])) {
$key = $this->getCacheKey($query, $options['where']['AND'][$pk]);
}
$data = $options['data'];
$query->setOption('limit', 1);
if (empty($options['fetch_sql']) && !empty($options['cache'])) {
// 判断查询缓存
@ -819,7 +823,7 @@ abstract class Connection
if (is_string($cache['key'])) {
$key = $cache['key'];
} elseif (!isset($key)) {
} else {
$key = $this->getCacheKey($query, $data);
}
@ -841,7 +845,6 @@ abstract class Connection
}
$query->setOption('data', $data);
$query->setOption('limit', 1);
// 生成查询SQL
$sql = $this->builder->select($query);
@ -976,7 +979,7 @@ abstract class Connection
}
// 执行操作
$result = $this->execute($sql, $bind);
$result = '' == $sql ? 0 : $this->execute($sql, $bind, $query);
if ($result) {
$sequence = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null);
@ -1037,7 +1040,7 @@ abstract class Connection
if (!empty($options['fetch_sql'])) {
$fetchSql[] = $this->getRealSql($sql, $bind);
} else {
$count += $this->execute($sql, $bind);
$count += $this->execute($sql, $bind, $query);
}
}
@ -1061,7 +1064,7 @@ abstract class Connection
return $this->getRealSql($sql, $bind);
}
return $this->execute($sql, $bind);
return $this->execute($sql, $bind, $query);
}
/**
@ -1088,7 +1091,7 @@ abstract class Connection
return $this->getRealSql($sql, $bind);
}
return $this->execute($sql, $bind);
return $this->execute($sql, $bind, $query);
}
/**
@ -1138,8 +1141,12 @@ abstract class Connection
$options['where']['AND'] = $where;
$query->setOption('where', ['AND' => $where]);
}
} elseif (!isset($key) && is_string($pk) && isset($options['where']['AND'][$pk])) {
$key = $this->getCacheKey($query, $options['where']['AND'][$pk]);
} elseif (!isset($key) && is_string($pk) && isset($options['where']['AND'])) {
foreach ($options['where']['AND'] as $val) {
if (is_array($val) && $val[0] == $pk) {
$key = $this->getCacheKey($query, $val);
}
}
}
// 更新数据
@ -1165,7 +1172,7 @@ abstract class Connection
}
// 执行操作
$result = '' == $sql ? 0 : $this->execute($sql, $bind);
$result = '' == $sql ? 0 : $this->execute($sql, $bind, $query);
if ($result) {
if (is_string($pk) && isset($where[$pk])) {
@ -1201,8 +1208,12 @@ abstract class Connection
$key = $options['cache']['key'];
} elseif (!is_null($data) && true !== $data && !is_array($data)) {
$key = $this->getCacheKey($query, $data);
} elseif (is_string($pk) && isset($options['where']['AND'][$pk])) {
$key = $this->getCacheKey($query, $options['where']['AND'][$pk]);
} elseif (is_string($pk) && isset($options['where']['AND'])) {
foreach ($options['where']['AND'] as $val) {
if (is_array($val) && $val[0] == $pk) {
$key = $this->getCacheKey($query, $val);
}
}
}
if (true !== $data && empty($options['where'])) {
@ -1231,7 +1242,7 @@ abstract class Connection
}
// 执行操作
$result = $this->execute($sql, $bind);
$result = $this->execute($sql, $bind, $query);
if ($result) {
if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) {
@ -1261,8 +1272,8 @@ abstract class Connection
$options = $query->getOptions();
if (empty($options['fetch_sql']) && !empty($options['cache'])) {
$result = $this->getCacheData($query, $options['cache'], $field, $key);
$cache = $options['cache'];
$result = $this->getCacheData($query, $cache, null, $key);
if (false !== $result) {
return $result;
@ -1313,7 +1324,7 @@ abstract class Connection
*/
public function aggregate(Query $query, $aggregate, $field)
{
$field = $aggregate . '(' . $this->builder->parseKey($query, $field) . ') AS tp_' . strtolower($aggregate);
$field = $aggregate . '(' . $this->builder->parseKey($query, $field, true) . ') AS tp_' . strtolower($aggregate);
return $this->value($query, $field, 0);
}
@ -1615,6 +1626,42 @@ abstract class Connection
}
}
/**
* 启动XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function startTransXa($xid)
{}
/**
* 预编译XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function prepareXa($xid)
{}
/**
* 提交XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function commitXa($xid)
{}
/**
* 回滚XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function rollbackXa($xid)
{}
/**
* 启动事务
* @access public
@ -1867,9 +1914,10 @@ abstract class Connection
* @access protected
* @param boolean $start 调试开始标记 true 开始 false 结束
* @param string $sql 执行的SQL语句 留空自动获取
* @param bool $master 主从标记
* @return void
*/
protected function debug($start, $sql = '')
protected function debug($start, $sql = '', $master = false)
{
if (!empty($this->config['debug'])) {
// 开启数据库调试模式
@ -1890,7 +1938,7 @@ abstract class Connection
}
// SQL监听
$this->triggerSql($sql, $runtime, $result);
$this->triggerSql($sql, $runtime, $result, $master);
}
}
}
@ -1912,19 +1960,27 @@ abstract class Connection
* @param string $sql SQL语句
* @param float $runtime SQL运行时间
* @param mixed $explain SQL分析
* @return bool
* @param bool $master 主从标记
* @return void
*/
protected function triggerSql($sql, $runtime, $explain = [])
protected function triggerSql($sql, $runtime, $explain = [], $master = false)
{
if (!empty(self::$event)) {
foreach (self::$event as $callback) {
if (is_callable($callback)) {
call_user_func_array($callback, [$sql, $runtime, $explain]);
call_user_func_array($callback, [$sql, $runtime, $explain, $master]);
}
}
} else {
if ($this->config['deploy']) {
// 分布式记录当前操作的主从
$master = $master ? 'master|' : 'slave|';
} else {
$master = '';
}
// 未注册监听则记录到日志中
$this->log('[ SQL ] ' . $sql . ' [ RunTime:' . $runtime . 's ]');
$this->log('[ SQL ] ' . $sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]');
if (!empty($explain)) {
$this->log('[ EXPLAIN : ' . var_export($explain, true) . ' ]');

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

@ -88,6 +88,12 @@ class Query
*/
private static $extend = [];
/**
* 读取主库的表
* @var array
*/
private static $readMaster = [];
/**
* 日期查询表达式
* @var array
@ -242,6 +248,21 @@ class Query
return $this->model ? $this->model->setQuery($this) : null;
}
/**
* 设置从主库读取数据
* @access public
* @param bool $all 是否所有表有效
* @return $this
*/
public function readMaster($all = false)
{
$table = $all ? '*' : $this->getTable();
static::$readMaster[$table] = true;
return $this;
}
/**
* 指定当前数据表名（不含前缀）
* @access public
@ -376,6 +397,62 @@ class Query
return $this->connection->getLastSql();
}
/**
* 执行数据库Xa事务
* @access public
* @param callable $callback 数据操作方法回调
* @param array $dbs 多个查询对象或者连接对象
* @return mixed
* @throws PDOException
* @throws \Exception
* @throws \Throwable
*/
public function transactionXa($callback, array $dbs = [])
{
$xid = uniqid('xa');
if (empty($dbs)) {
$dbs[] = $this->getConnection();
}
foreach ($dbs as $key => $db) {
if ($db instanceof Query) {
$db = $db->getConnection();
$dbs[$key] = $db;
}
$db->startTransXa($xid);
}
try {
$result = null;
if (is_callable($callback)) {
$result = call_user_func_array($callback, [$this]);
}
foreach ($dbs as $db) {
$db->prepareXa($xid);
}
foreach ($dbs as $db) {
$db->commitXa($xid);
}
return $result;
} catch (\Exception $e) {
foreach ($dbs as $db) {
$db->rollbackXa($xid);
}
throw $e;
} catch (\Throwable $e) {
foreach ($dbs as $db) {
$db->rollbackXa($xid);
}
throw $e;
}
}
/**
* 执行数据库事务
* @access public
@ -542,13 +619,7 @@ class Query
{
$this->parseOptions();
$result = $this->connection->value($this, $field, $default);
if (!empty($this->options['fetch_sql'])) {
return $result;
}
return $result;
return $this->connection->value($this, $field, $default);
}
/**
@ -1086,7 +1157,7 @@ class Query
* @access public
* @param string|array $table 数据表
* @param string|array $field 查询字段
* @param string|array $on JOIN条件
* @param mixed $on JOIN条件
* @param string $type JOIN类型
* @return $this
*/
@ -1339,20 +1410,27 @@ class Query
/**
* 比较两个字段
* @access public
* @param string $field1 查询字段
* @param string $operator 比较操作符
* @param string $field2 比较字段
* @param string $logic 查询逻辑 and or xor
* @param string|array $field1 查询字段
* @param string $operator 比较操作符
* @param string $field2 比较字段
* @param string $logic 查询逻辑 and or xor
* @return $this
*/
public function whereColumn($field1, $operator, $field2 = null, $logic = 'AND')
public function whereColumn($field1, $operator = null, $field2 = null, $logic = 'AND')
{
if (is_array($field1)) {
foreach ($field1 as $item) {
$this->whereColumn($item[0], $item[1], isset($item[2]) ? $item[2] : null);
}
return $this;
}
if (is_null($field2)) {
$field2 = $operator;
$operator = '=';
}
return $this->whereExp($field1, $operator . ' ' . $field2, [], $logic);
return $this->parseWhereExp($logic, $field1, 'COLUMN', [$operator, $field2], [], true);
}
/**
@ -1504,7 +1582,7 @@ class Query
} elseif (in_array(strtoupper($op), ['REGEXP', 'NOT REGEXP', 'EXISTS', 'NOT EXISTS', 'NOTEXISTS'], true)) {
$where = [$field, $op, is_string($condition) ? $this->raw($condition) : $condition];
} else {
$where = $field ? [$field, $op, $condition] : null;
$where = $field ? [$field, $op, $condition, isset($param[2]) ? $param[2] : null] : null;
}
return $where;
@ -1522,7 +1600,13 @@ class Query
if (key($field) !== 0) {
$where = [];
foreach ($field as $key => $val) {
$where[] = is_null($val) ? [$key, 'NULL', ''] : [$key, '=', $val];
if ($val instanceof Expression) {
$where[] = [$key, 'exp', $val];
} elseif (is_null($val)) {
$where[] = [$key, 'NULL', ''];
} else {
$where[] = [$key, is_array($val) ? 'IN' : '=', $val];
}
}
} else {
// 数组批量查询
@ -2076,6 +2160,29 @@ class Query
return $this;
}
/**
* 设置字段类型信息
* @access public
* @param array $type 字段类型信息
* @return $this
*/
public function setJsonFieldType(array $type)
{
$this->options['field_type'] = $type;
return $this;
}
/**
* 获取字段类型信息
* @access public
* @param string $field 字段名
* @return string|null
*/
public function getJsonFieldType($field)
{
return isset($this->options['field_type'][$field]) ? $this->options['field_type'][$field] : null;
}
/**
* 添加查询范围
* @access public
@ -3028,7 +3135,6 @@ class Query
public function parsePkWhere($data)
{
$pk = $this->getPk($this->options);
// 获取当前数据表
$table = is_array($this->options['table']) ? key($this->options['table']) : $this->options['table'];
@ -3108,6 +3214,10 @@ class Query
}
}
if (isset(static::$readMaster['*']) || (is_string($options['table']) && isset(static::$readMaster[$options['table']]))) {
$options['master'] = true;
}
foreach (['join', 'union', 'group', 'having', 'limit', 'force', 'comment'] as $name) {
if (!isset($options[$name])) {
$options[$name] = '';

8
thinkphp/library/think/db/builder/Mysql.php
View File

@ -32,6 +32,7 @@ class Mysql extends Builder
'parseBetweenTime' => ['BETWEEN TIME', 'NOT BETWEEN TIME'],
'parseTime' => ['< TIME', '> TIME', '<= TIME', '>= TIME'],
'parseExists' => ['NOT EXISTS', 'EXISTS'],
'parseColumn' => ['COLUMN'],
];
protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES %DATA% %COMMENT%';
@ -105,15 +106,18 @@ class Mysql extends Builder
* 字段和表名处理
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param mixed $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key, $strict = false)
{
if (is_int($key)) {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key);
if (strpos($key, '->') && false === strpos($key, '(')) {

8
thinkphp/library/think/db/builder/Pgsql.php
View File

@ -50,12 +50,18 @@ class Pgsql extends Builder
* 字段和表名处理
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param mixed $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key, $strict = false)
{
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key);
if (strpos($key, '->') && false === strpos($key, '(')) {

9
thinkphp/library/think/db/builder/Sqlite.php
View File

@ -58,13 +58,20 @@ class Sqlite extends Builder
* 字段和表名处理
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param mixed $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key, $strict = false)
{
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key);
if (strpos($key, '.')) {
list($table, $key) = explode('.', $key, 2);

6
thinkphp/library/think/db/builder/Sqlsrv.php
View File

@ -77,14 +77,16 @@ class Sqlsrv extends Builder
* 字段和表名处理
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param mixed $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key, $strict = false)
{
if (is_int($key)) {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key);

52
thinkphp/library/think/db/connector/Mysql.php
View File

@ -154,4 +154,56 @@ class Mysql extends Connection
return true;
}
/**
* 启动XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function startTransXa($xid)
{
$this->initConnect(true);
if (!$this->linkID) {
return false;
}
$this->execute("XA START '$xid'");
}
/**
* 预编译XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function prepareXa($xid)
{
$this->initConnect(true);
$this->execute("XA END '$xid'");
$this->execute("XA PREPARE '$xid'");
}
/**
* 提交XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function commitXa($xid)
{
$this->initConnect(true);
$this->execute("XA COMMIT '$xid'");
}
/**
* 回滚XA事务
* @access public
* @param string $xid XA事务id
* @return void
*/
public function rollbackXa($xid)
{
$this->initConnect(true);
$this->execute("XA ROLLBACK '$xid'");
}
}

2
thinkphp/library/think/facade/Request.php
View File

@ -66,7 +66,7 @@ use think\Facade;
* @method bool isMobile() static 检测是否使用手机访问
* @method string scheme() static 当前URL地址中的scheme参数
* @method string query() static 当前请求URL地址中的query参数
* @method string host() static 当前请求的host
* @method string host(bool $stric = false) static 当前请求的host
* @method string port() static 当前请求URL地址中的port参数
* @method string protocol() static 当前请求 SERVER_PROTOCOL
* @method string remotePort() static 当前请求 REMOTE_PORT

12
thinkphp/library/think/model/Collection.php
View File

@ -16,6 +16,18 @@ use think\Model;
class Collection extends BaseCollection
{
/**
* 返回数组中指定的一列
* @access public
* @param string $column_key
* @param string|null $index_key
* @return array
*/
public function column($column_key, $index_key = null)
{
return array_column($this->toArray(), $column_key, $index_key);
}
/**
* 延迟预载入关联查询
* @access public

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

@ -36,6 +36,12 @@ trait Attribute
*/
protected $json = [];
/**
* JSON数据表字段类型
* @var array
*/
protected $jsonType = [];
/**
* 数据表废弃字段
* @var array

81
thinkphp/library/think/model/concern/ModelEvent.php
View File

@ -12,6 +12,7 @@
namespace think\model\concern;
use think\Container;
use think\Loader;
/**
* 模型事件处理
@ -24,6 +25,24 @@ trait ModelEvent
*/
private static $event = [];
/**
* 模型事件观察
* @var array
*/
protected static $observe = ['before_write', 'after_write', 'before_insert', 'after_insert', 'before_update', 'after_update', 'before_delete', 'after_delete', 'before_restore', 'after_restore'];
/**
* 绑定模型事件观察者类
* @var array
*/
protected $observerClass;
/**
* 是否需要事件响应
* @var bool
*/
private $withEvent = true;
/**
* 注册回调方法
* @access public
@ -43,6 +62,45 @@ trait ModelEvent
self::$event[$class][$event][] = $callback;
}
/**
* 清除回调方法
* @access public
* @return void
*/
public static function flushEvent()
{
self::$event[static::class] = [];
}
/**
* 注册一个模型观察者
*
* @param object|string $class
* @return void
*/
public static function observe($class)
{
foreach (static::$observe as $event) {
$eventFuncName = Loader::parseName($event, 1, false);
if (method_exists($class, $eventFuncName)) {
static::event($event, [$class, $eventFuncName]);
}
}
}
/**
* 当前操作的事件响应
* @access protected
* @param bool $event 是否需要事件响应
* @return $this
*/
public function withEvent($event)
{
$this->withEvent = $event;
return $this;
}
/**
* 触发事件
* @access protected
@ -53,7 +111,7 @@ trait ModelEvent
{
$class = static::class;
if (isset(self::$event[$class][$event])) {
if ($this->withEvent && isset(self::$event[$class][$event])) {
foreach (self::$event[$class][$event] as $callback) {
$result = Container::getInstance()->invoke($callback, [$this]);
@ -154,4 +212,25 @@ trait ModelEvent
self::event('after_delete', $callback, $override);
}
/**
* 模型before_restore事件快捷方法
* @access protected
* @param callable $callback
* @param bool $override
*/
protected static function beforeRestore($callback, $override = false)
{
self::event('before_restore', $callback, $override);
}
/**
* 模型after_restore事件快捷方法
* @access protected
* @param callable $callback
* @param bool $override
*/
protected static function afterRestore($callback, $override = false)
{
self::event('after_restore', $callback, $override);
}
}

11
thinkphp/library/think/model/concern/SoftDelete.php
View File

@ -161,11 +161,20 @@ trait SoftDelete
}
if ($name) {
if (false === $this->trigger('before_restore')) {
return false;
}
// 恢复删除
return $this->db(false)
$result = $this->db(false)
->where($where)
->useSoftDelete($name, $this->getWithTrashedExp())
->update([$name => $this->defaultSoftDelete]);
$this->trigger('after_restore');
return $result;
}
return 0;

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

@ -67,22 +67,37 @@ class BelongsToMany extends Relation
return $this;
}
/**
* 获取中间表更新条件
* @param $data
* @return array
*/
protected function getUpdateWhere($data)
{
return [
$this->localKey => $data[$this->localKey],
$this->foreignKey => $data[$this->foreignKey],
];
}
/**
* 实例化中间表模型
* @access public
* @param $data
* @param array $data
* @param bool $isUpdate
* @return Pivot
* @throws Exception
*/
protected function newPivot($data = [])
protected function newPivot($data = [], $isUpdate = false)
{
$class = $this->pivotName ?: '\\think\\model\\Pivot';
$pivot = new $class($data, $this->parent, $this->middle);
if ($pivot instanceof Pivot) {
return $pivot;
} else {
throw new Exception('pivot model must extends: \think\model\Pivot');
return $isUpdate ? $pivot->isUpdate(true, $this->getUpdateWhere($data)) : $pivot;
}
throw new Exception('pivot model must extends: \think\model\Pivot');
}
/**
@ -106,7 +121,7 @@ class BelongsToMany extends Relation
}
}
$model->setRelation('pivot', $this->newPivot($pivot));
$model->setRelation('pivot', $this->newPivot($pivot, true));
}
}
@ -398,7 +413,7 @@ class BelongsToMany extends Relation
}
}
$set->setRelation('pivot', $this->newPivot($pivot));
$set->setRelation('pivot', $this->newPivot($pivot, true));
$data[$pivot[$this->localKey]][] = $set;
}
@ -509,7 +524,7 @@ class BelongsToMany extends Relation
foreach ($ids as $id) {
$pivot[$this->foreignKey] = $id;
$this->pivot->insert($pivot, true);
$result[] = $this->newPivot($pivot);
$result[] = $this->newPivot($pivot, true);
}
if (count($result) == 1) {

74
thinkphp/library/think/paginator/Collection.php
View File

@ -1,74 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: zhangyajun <448901948@qq.com>
// +----------------------------------------------------------------------
namespace think\paginator;
use Exception;
use think\Paginator;
/**
* Class Collection
* @package think\paginator
* @method integer total()
* @method integer listRows()
* @method integer currentPage()
* @method string render()
* @method Paginator fragment($fragment)
* @method Paginator appends($key, $value)
* @method integer lastPage()
* @method boolean hasPages()
*/
class Collection extends \think\Collection
{
/** @var Paginator */
protected $paginator;
public function __construct($items = [], Paginator $paginator = null)
{
$this->paginator = $paginator;
parent::__construct($items);
}
public static function make($items = [], Paginator $paginator = null)
{
return new static($items, $paginator);
}
public function toArray()
{
if ($this->paginator) {
try {
$total = $this->total();
} catch (Exception $e) {
$total = null;
}
return [
'total' => $total,
'per_page' => $this->listRows(),
'current_page' => $this->currentPage(),
'data' => parent::toArray(),
];
} else {
return parent::toArray();
}
}
public function __call($method, $args)
{
if ($this->paginator && method_exists($this->paginator, $method)) {
return call_user_func_array([$this->paginator, $method], $args);
} else {
throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
}
}
}

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

@ -387,6 +387,17 @@ abstract class Rule
return $this->option('pjax', $pjax);
}
/**
* 检查是否为手机访问
* @access public
* @param bool $mobile
* @return $this
*/
public function mobile($mobile = true)
{
return $this->option('mobile', $mobile);
}
/**
* 当前路由到一个模板地址 当使用数组的时候可以传入模板变量
* @access public
@ -884,7 +895,7 @@ abstract class Rule
}
// AJAX PJAX 请求检查
foreach (['ajax', 'pjax'] as $item) {
foreach (['ajax', 'pjax', 'mobile'] as $item) {
if (isset($option[$item])) {
$call = 'is' . $item;
if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
@ -900,7 +911,7 @@ abstract class Rule
}
// 域名检查
if ((isset($option['domain']) && !in_array($option['domain'], [$_SERVER['HTTP_HOST'], $request->subDomain()]))) {
if ((isset($option['domain']) && !in_array($option['domain'], [$request->host(true), $request->subDomain()]))) {
return false;
}

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

@ -78,15 +78,8 @@ class Module extends Dispatch
} else {
throw new HttpException(404, 'module not exists:' . $module);
}
} else {
// 单一模块部署
$module = '';
$this->app['request']->module($module);
}
// 当前模块路径
$this->app->setModulePath($this->app->getAppPath() . ($module ? $module . DIRECTORY_SEPARATOR : ''));
// 是否自动转换控制器和操作名
$convert = is_bool($this->convert) ? $this->convert : $this->app->config('app.url_convert');
// 获取控制器名

36
thinkphp/library/think/session/driver/Redis.php
View File

@ -44,23 +44,31 @@ class Redis implements SessionHandlerInterface
*/
public function open($savePath, $sessName)
{
// 检测php环境
if (!extension_loaded('redis')) {
throw new Exception('not support:redis');
}
if (extension_loaded('redis')) {
$this->handler = new \Redis;
$this->handler = new \Redis;
// 建立连接
$func = $this->config['persistent'] ? 'pconnect' : 'connect';
$this->handler->$func($this->config['host'], $this->config['port'], $this->config['timeout']);
// 建立连接
$func = $this->config['persistent'] ? 'pconnect' : 'connect';
$this->handler->$func($this->config['host'], $this->config['port'], $this->config['timeout']);
if ('' != $this->config['password']) {
$this->handler->auth($this->config['password']);
}
if ('' != $this->config['password']) {
$this->handler->auth($this->config['password']);
}
if (0 != $this->config['select']) {
$this->handler->select($this->config['select']);
if (0 != $this->config['select']) {
$this->handler->select($this->config['select']);
}
} elseif (class_exists('\Predis\Client')) {
$params = [];
foreach ($this->config as $key => $val) {
if (in_array($key, ['aggregate', 'cluster', 'connections', 'exceptions', 'prefix', 'profile', 'replication'])) {
$params[$key] = $val;
unset($this->config[$key]);
}
}
$this->handler = new \Predis\Client($this->config, $params);
} else {
throw new \BadFunctionCallException('not support: redis');
}
return true;

6
thinkphp/library/think/template/driver/File.php
View File

@ -15,6 +15,8 @@ use think\Exception;
class File
{
protected $cacheFile;
/**
* 写入编译缓存
* @access public
@ -46,13 +48,15 @@ class File
*/
public function read($cacheFile, $vars = [])
{
$this->cacheFile = $cacheFile;
if (!empty($vars) && is_array($vars)) {
// 模板阵列变量分解成为独立变量
extract($vars, EXTR_OVERWRITE);
}
//载入模版缓存文件
include $cacheFile;
include $this->cacheFile;
}
/**

27
thinkphp/library/think/view/driver/Php.php
View File

@ -31,6 +31,9 @@ class Php
'view_depr' => DIRECTORY_SEPARATOR,
];
protected $template;
protected $content;
public function __construct($config = [])
{
$this->config = array_merge($this->config, (array) $config);
@ -71,18 +74,14 @@ class Php
throw new TemplateNotFoundException('template not exists:' . $template, $template);
}
$this->template = $template;
// 记录视图信息
Container::get('app')
->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
if (isset($data['template'])) {
$__template__ = $template;
extract($data, EXTR_OVERWRITE);
include $__template__;
} else {
extract($data, EXTR_OVERWRITE);
include $template;
}
extract($data, EXTR_OVERWRITE);
include $this->template;
}
/**
@ -94,14 +93,10 @@ class Php
*/
public function display($content, $data = [])
{
if (isset($data['content'])) {
$__content__ = $content;
extract($data, EXTR_OVERWRITE);
eval('?>' . $__content__);
} else {
extract($data, EXTR_OVERWRITE);
eval('?>' . $content);
}
$this->content = $content;
extract($data, EXTR_OVERWRITE);
eval('?>' . $this->content);
}
/**

2
vendor/autoload.php vendored
View File

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

18
vendor/composer/autoload_classmap.php vendored
View File

@ -96,18 +96,17 @@ return array(
'Qiniu\\Processing\\ImageUrlBuilder' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php',
'Qiniu\\Processing\\Operation' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Processing/Operation.php',
'Qiniu\\Processing\\PersistentFop' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php',
'Qiniu\\Rtc\\AppClient' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Rtc/AppClient.php',
'Qiniu\\Storage\\BucketManager' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php',
'Qiniu\\Storage\\FormUploader' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php',
'Qiniu\\Storage\\ResumeUploader' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Storage/ResumeUploader.php',
'Qiniu\\Storage\\UploadManager' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Storage/UploadManager.php',
'Qiniu\\Zone' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Zone.php',
'Symfony\\Component\\OptionsResolver\\Debug\\OptionsResolverIntrospector' => $vendorDir . '/symfony/options-resolver/Debug/OptionsResolverIntrospector.php',
'Symfony\\Component\\OptionsResolver\\Exception\\AccessException' => $vendorDir . '/symfony/options-resolver/Exception/AccessException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/options-resolver/Exception/ExceptionInterface.php',
'Symfony\\Component\\OptionsResolver\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/options-resolver/Exception/InvalidArgumentException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\InvalidOptionsException' => $vendorDir . '/symfony/options-resolver/Exception/InvalidOptionsException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\MissingOptionsException' => $vendorDir . '/symfony/options-resolver/Exception/MissingOptionsException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\NoConfigurationException' => $vendorDir . '/symfony/options-resolver/Exception/NoConfigurationException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\NoSuchOptionException' => $vendorDir . '/symfony/options-resolver/Exception/NoSuchOptionException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\OptionDefinitionException' => $vendorDir . '/symfony/options-resolver/Exception/OptionDefinitionException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\UndefinedOptionsException' => $vendorDir . '/symfony/options-resolver/Exception/UndefinedOptionsException.php',
@ -127,6 +126,7 @@ return array(
'WeChat\\Limit' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Limit.php',
'WeChat\\Media' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Media.php',
'WeChat\\Menu' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Menu.php',
'WeChat\\Mini' => $vendorDir . '/zoujingli/weopen-developer/WeChat/Mini.php',
'WeChat\\Oauth' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Oauth.php',
'WeChat\\Pay' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Pay.php',
'WeChat\\Product' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Product.php',
@ -139,6 +139,20 @@ return array(
'WeChat\\Template' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Template.php',
'WeChat\\User' => $vendorDir . '/zoujingli/wechat-developer/WeChat/User.php',
'WeChat\\Wifi' => $vendorDir . '/zoujingli/wechat-developer/WeChat/Wifi.php',
'WeMini\\Account' => $vendorDir . '/zoujingli/weopen-developer/WeMini/Account.php',
'WeMini\\Basic' => $vendorDir . '/zoujingli/weopen-developer/WeMini/Basic.php',
'WeMini\\Code' => $vendorDir . '/zoujingli/weopen-developer/WeMini/Code.php',
'WeMini\\Crypt' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Crypt.php',
'WeMini\\Domain' => $vendorDir . '/zoujingli/weopen-developer/WeMini/Domain.php',
'WeMini\\Plugs' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Plugs.php',
'WeMini\\Poi' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Poi.php',
'WeMini\\Qrcode' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Qrcode.php',
'WeMini\\Template' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Template.php',
'WeMini\\Tester' => $vendorDir . '/zoujingli/weopen-developer/WeMini/Tester.php',
'WeMini\\Total' => $vendorDir . '/zoujingli/wechat-developer/WeMini/Total.php',
'WeMini\\User' => $vendorDir . '/zoujingli/weopen-developer/WeMini/User.php',
'WeOpen\\Login' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/Login.php',
'WeOpen\\MiniApp' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/MiniApp.php',
'WeOpen\\Service' => $vendorDir . '/zoujingli/weopen-developer/WeOpen/Service.php',
'app\\admin\\controller\\Auth' => $baseDir . '/application/admin/controller/Auth.php',
'app\\admin\\controller\\Config' => $baseDir . '/application/admin/controller/Config.php',

3
vendor/composer/autoload_psr4.php vendored
View File

@ -10,7 +10,8 @@ return array(
'think\\captcha\\' => array($vendorDir . '/topthink/think-captcha/src'),
'app\\' => array($baseDir . '/application'),
'WeOpen\\' => array($vendorDir . '/zoujingli/weopen-developer/WeOpen'),
'WeChat\\' => array($vendorDir . '/zoujingli/wechat-developer/WeChat'),
'WeMini\\' => array($vendorDir . '/zoujingli/wechat-developer/WeMini', $vendorDir . '/zoujingli/weopen-developer/WeMini'),
'WeChat\\' => array($vendorDir . '/zoujingli/wechat-developer/WeChat', $vendorDir . '/zoujingli/weopen-developer/WeChat'),
'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
'Qiniu\\' => array($vendorDir . '/qiniu/php-sdk/src/Qiniu'),
'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'),

14
vendor/composer/autoload_real.php vendored
View File

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

33
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
class ComposerStaticInit4621279012993c03ca2d0ad074d7ad05
{
public static $files = array (
'1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
@ -24,6 +24,7 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
'W' =>
array (
'WeOpen\\' => 7,
'WeMini\\' => 7,
'WeChat\\' => 7,
),
'S' =>
@ -61,9 +62,15 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
array (
0 => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen',
),
'WeMini\\' =>
array (
0 => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini',
1 => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini',
),
'WeChat\\' =>
array (
0 => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat',
1 => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeChat',
),
'Symfony\\Component\\OptionsResolver\\' =>
array (
@ -174,18 +181,17 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
'Qiniu\\Processing\\ImageUrlBuilder' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Processing/ImageUrlBuilder.php',
'Qiniu\\Processing\\Operation' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Processing/Operation.php',
'Qiniu\\Processing\\PersistentFop' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Processing/PersistentFop.php',
'Qiniu\\Rtc\\AppClient' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Rtc/AppClient.php',
'Qiniu\\Storage\\BucketManager' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php',
'Qiniu\\Storage\\FormUploader' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Storage/FormUploader.php',
'Qiniu\\Storage\\ResumeUploader' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Storage/ResumeUploader.php',
'Qiniu\\Storage\\UploadManager' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Storage/UploadManager.php',
'Qiniu\\Zone' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Zone.php',
'Symfony\\Component\\OptionsResolver\\Debug\\OptionsResolverIntrospector' => __DIR__ . '/..' . '/symfony/options-resolver/Debug/OptionsResolverIntrospector.php',
'Symfony\\Component\\OptionsResolver\\Exception\\AccessException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/AccessException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/ExceptionInterface.php',
'Symfony\\Component\\OptionsResolver\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/InvalidArgumentException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\InvalidOptionsException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/InvalidOptionsException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\MissingOptionsException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/MissingOptionsException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\NoConfigurationException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/NoConfigurationException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\NoSuchOptionException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/NoSuchOptionException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\OptionDefinitionException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/OptionDefinitionException.php',
'Symfony\\Component\\OptionsResolver\\Exception\\UndefinedOptionsException' => __DIR__ . '/..' . '/symfony/options-resolver/Exception/UndefinedOptionsException.php',
@ -205,6 +211,7 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
'WeChat\\Limit' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Limit.php',
'WeChat\\Media' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Media.php',
'WeChat\\Menu' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Menu.php',
'WeChat\\Mini' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeChat/Mini.php',
'WeChat\\Oauth' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Oauth.php',
'WeChat\\Pay' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Pay.php',
'WeChat\\Product' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Product.php',
@ -217,6 +224,20 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
'WeChat\\Template' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Template.php',
'WeChat\\User' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/User.php',
'WeChat\\Wifi' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeChat/Wifi.php',
'WeMini\\Account' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/Account.php',
'WeMini\\Basic' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/Basic.php',
'WeMini\\Code' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/Code.php',
'WeMini\\Crypt' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Crypt.php',
'WeMini\\Domain' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/Domain.php',
'WeMini\\Plugs' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Plugs.php',
'WeMini\\Poi' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Poi.php',
'WeMini\\Qrcode' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Qrcode.php',
'WeMini\\Template' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Template.php',
'WeMini\\Tester' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/Tester.php',
'WeMini\\Total' => __DIR__ . '/..' . '/zoujingli/wechat-developer/WeMini/Total.php',
'WeMini\\User' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeMini/User.php',
'WeOpen\\Login' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/Login.php',
'WeOpen\\MiniApp' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/MiniApp.php',
'WeOpen\\Service' => __DIR__ . '/..' . '/zoujingli/weopen-developer/WeOpen/Service.php',
'app\\admin\\controller\\Auth' => __DIR__ . '/../..' . '/application/admin/controller/Auth.php',
'app\\admin\\controller\\Config' => __DIR__ . '/../..' . '/application/admin/controller/Config.php',
@ -258,9 +279,9 @@ class ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7f21c27a120d47e6491fd4a016f044cb::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit4621279012993c03ca2d0ad074d7ad05::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit4621279012993c03ca2d0ad074d7ad05::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit4621279012993c03ca2d0ad074d7ad05::$classMap;
}, null, ClassLoader::class);
}

83
vendor/composer/installed.json vendored
View File

@ -1,17 +1,17 @@
[
{
"name": "topthink/think-installer",
"version": "v1.0.12",
"version_normalized": "1.0.12.0",
"version": "v2.0.0",
"version_normalized": "2.0.0.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/think-installer.git",
"reference": "1be326e68f63de4e95977ed50f46ae75f017556d"
"reference": "f5400a12c60e513911aef41fe443fa6920952675"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/think-installer/1be326e68f63de4e95977ed50f46ae75f017556d.zip",
"reference": "1be326e68f63de4e95977ed50f46ae75f017556d",
"url": "https://files.phpcomposer.com/files/top-think/think-installer/f5400a12c60e513911aef41fe443fa6920952675.zip",
"reference": "f5400a12c60e513911aef41fe443fa6920952675",
"shasum": ""
},
"require": {
@ -20,7 +20,7 @@
"require-dev": {
"composer/composer": "1.0.*@dev"
},
"time": "2017-05-27T06:58:09+00:00",
"time": "2018-05-11T06:45:42+00:00",
"type": "composer-plugin",
"extra": {
"class": "think\\composer\\Plugin"
@ -80,17 +80,17 @@
},
{
"name": "zoujingli/wechat-developer",
"version": "v1.0.5",
"version_normalized": "1.0.5.0",
"version": "v1.1.6",
"version_normalized": "1.1.6.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "e05fe6bb24438d15259a6af4915bd0638dc3914a"
"reference": "095471bdc61e3389135f69b1849069c19d439f22"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/e05fe6bb24438d15259a6af4915bd0638dc3914a.zip",
"reference": "e05fe6bb24438d15259a6af4915bd0638dc3914a",
"url": "https://files.phpcomposer.com/files/zoujingli/WeChatDeveloper/095471bdc61e3389135f69b1849069c19d439f22.zip",
"reference": "095471bdc61e3389135f69b1849069c19d439f22",
"shasum": ""
},
"require": {
@ -98,12 +98,13 @@
"ext-openssl": "*",
"php": ">=5.4"
},
"time": "2018-04-09T11:07:00+00:00",
"time": "2018-05-11T09:54:48+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"WeChat\\": "WeChat"
"WeChat\\": "WeChat",
"WeMini\\": "WeMini"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -132,26 +133,28 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeOpenDeveloper.git",
"reference": "8bb75bc08488a43964c00f027b21b93ed58e8d5a"
"reference": "fac7e7596edecd2abb7aad2168db3f253566cbf8"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/zoujingli/WeOpenDeveloper/8bb75bc08488a43964c00f027b21b93ed58e8d5a.zip",
"reference": "8bb75bc08488a43964c00f027b21b93ed58e8d5a",
"url": "https://files.phpcomposer.com/files/zoujingli/WeOpenDeveloper/fac7e7596edecd2abb7aad2168db3f253566cbf8.zip",
"reference": "fac7e7596edecd2abb7aad2168db3f253566cbf8",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-openssl": "*",
"php": ">=5.4",
"zoujingli/wechat-developer": "^1.0.0"
"zoujingli/wechat-developer": "^1.0"
},
"time": "2018-03-21T05:06:35+00:00",
"time": "2018-05-12T07:54:53+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
"psr-4": {
"WeOpen\\": "WeOpen"
"WeOpen\\": "WeOpen",
"WeChat\\": "WeChat",
"WeMini\\": "WeMini"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -175,22 +178,22 @@
},
{
"name": "topthink/framework",
"version": "v5.1.10",
"version_normalized": "5.1.10.0",
"version": "v5.1.13",
"version_normalized": "5.1.13.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "66b546f7cac130712d1e08fe2620105228f4bd8a"
"reference": "1cc81707dab128e360405aa4811a27b7a5403a78"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/framework/66b546f7cac130712d1e08fe2620105228f4bd8a.zip",
"reference": "66b546f7cac130712d1e08fe2620105228f4bd8a",
"url": "https://files.phpcomposer.com/files/top-think/framework/1cc81707dab128e360405aa4811a27b7a5403a78.zip",
"reference": "1cc81707dab128e360405aa4811a27b7a5403a78",
"shasum": ""
},
"require": {
"php": ">=5.6.0",
"topthink/think-installer": "~1.0"
"topthink/think-installer": "2.*"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.0",
@ -201,7 +204,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-04-16T05:33:00+00:00",
"time": "2018-05-11T07:50:00+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@ -269,27 +272,27 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.4.8",
"version_normalized": "3.4.8.0",
"version": "v3.3.6",
"version_normalized": "3.3.6.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e"
"reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/symfony/options-resolver/f3109a6aedd20e35c3a33190e932c2b063b7b50e.zip",
"reference": "f3109a6aedd20e35c3a33190e932c2b063b7b50e",
"url": "https://files.phpcomposer.com/files/symfony/options-resolver/ff48982d295bcac1fd861f934f041ebc73ae40f0.zip",
"reference": "ff48982d295bcac1fd861f934f041ebc73ae40f0",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
"php": ">=5.5.9"
},
"time": "2018-01-11T07:56:07+00:00",
"time": "2017-04-12T14:14:56+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "3.3-dev"
}
},
"installation-source": "dist",
@ -430,17 +433,17 @@
},
{
"name": "qiniu/php-sdk",
"version": "v7.2.3",
"version_normalized": "7.2.3.0",
"version": "v7.2.5",
"version_normalized": "7.2.5.0",
"source": {
"type": "git",
"url": "https://github.com/qiniu/php-sdk.git",
"reference": "67852ba9cdd7f48e0e080961abebafee134fb329"
"reference": "0a6e6c75cbc0429fac69ba9aaadb1f5d6c676fb0"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/qiniu/php-sdk/67852ba9cdd7f48e0e080961abebafee134fb329.zip",
"reference": "67852ba9cdd7f48e0e080961abebafee134fb329",
"url": "https://files.phpcomposer.com/files/qiniu/php-sdk/0a6e6c75cbc0429fac69ba9aaadb1f5d6c676fb0.zip",
"reference": "0a6e6c75cbc0429fac69ba9aaadb1f5d6c676fb0",
"shasum": ""
},
"require": {
@ -450,7 +453,7 @@
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2.3"
},
"time": "2018-02-20T13:59:54+00:00",
"time": "2018-05-10T09:26:30+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

7
vendor/qiniu/php-sdk/CHANGELOG.md vendored
View File

@ -1,5 +1,12 @@
# Changelog
## 7.2.5 (2018-05-10)
* 修复表单上传中多余的参数checkCrc导致的fname错位问题
## 7.2.4 (2018-05-09)
### 增加
* 连麦功能
## 7.2.3 (2018-01-20)
### 增加
* 新加坡机房

4
vendor/qiniu/php-sdk/src/Qiniu/Config.php vendored
View File

@ -3,7 +3,7 @@ namespace Qiniu;
final class Config
{
const SDK_VER = '7.2.3';
const SDK_VER = '7.2.5';
const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
@ -11,6 +11,8 @@ final class Config
const API_HOST = 'api.qiniu.com';
const RS_HOST = 'rs.qiniu.com'; //RS Host
const UC_HOST = 'https://api.qiniu.com'; //UC Host
const RTCAPI_HOST = 'http://rtc.qiniuapi.com';
const RTCAPI_VERSION = 'v3';
// Zone 空间对应的机房
public $zone;

13
vendor/qiniu/php-sdk/src/Qiniu/Http/Client.php vendored
View File

@ -13,6 +13,12 @@ final class Client
return self::sendRequest($request);
}
public static function delete($url, array $headers = array())
{
$request = new Request('DELETE', $url, $headers);
return self::sendRequest($request);
}
public static function post($url, $body, array $headers = array())
{
$request = new Request('POST', $url, $headers, $body);
@ -129,7 +135,7 @@ final class Client
$headerLine = trim($line);
$kv = explode(':', $headerLine);
if (count($kv) > 1) {
$kv[0] = ucwords($kv[0], '-');
$kv[0] =self::ucwordsHyphen($kv[0]);
$headers[$kv[0]] = trim($kv[1]);
}
}
@ -142,4 +148,9 @@ final class Client
$replace = array("\\\\", "\\\"");
return str_replace($find, $replace, $str);
}
private static function ucwordsHyphen($str)
{
return str_replace('- ', '-', ucwords(str_replace('-', '- ', $str)));
}
}

17
vendor/qiniu/php-sdk/src/Qiniu/Storage/BucketManager.php vendored
View File

@ -225,6 +225,23 @@ final class BucketManager
return $error;
}
/**
* 修改文件的存储状态，即禁用状态和启用状态间的的互相转换
*
* @param $bucket 待操作资源所在空间
* @param $key 待操作资源文件名
* @param $status 待操作文件目标文件类型
*
* @return mixed 成功返回NULL，失败返回对象Qiniu\Http\Error
* @link https://developer.qiniu.com/kodo/api/4173/modify-the-file-status
*/
public function changeStatus($bucket, $key, $status)
{
$resource = \Qiniu\entry($bucket, $key);
$path = '/chstatus/' . $resource . '/status/' . $status;
list(, $error) = $this->rsPost($path);
return $error;
}
/**
* 从指定URL抓取资源，并将该资源存储到指定空间中

1
vendor/qiniu/php-sdk/src/Qiniu/Storage/UploadManager.php vendored
View File

@ -108,7 +108,6 @@ final class UploadManager
$this->config,
$params,
$mime,
$checkCrc,
basename($filePath)
);
}

10
vendor/symfony/options-resolver/CHANGELOG.md vendored
View File

@ -1,12 +1,6 @@
CHANGELOG
=========
3.4.0
-----
* added `OptionsResolverIntrospector` to inspect options definitions inside an `OptionsResolver` instance
* added array of types support in allowed types (e.g int[])
2.6.0
-----
@ -31,7 +25,7 @@ CHANGELOG
* deprecated OptionsResolver::isKnown() in favor of isDefined()
* [BC BREAK] OptionsResolver::isRequired() returns true now if a required
option has a default value set
* [BC BREAK] merged Options into OptionsResolver and turned Options into an
* [BC BREAK] merged Options into OptionsResolver and turned Options into an
interface
* deprecated Options::overload() (now in OptionsResolver)
* deprecated Options::set() (now in OptionsResolver)
@ -42,7 +36,7 @@ CHANGELOG
lazy option/normalizer closures now
* [BC BREAK] removed Traversable interface from Options since using within
lazy option/normalizer closures resulted in exceptions
* [BC BREAK] removed Options::all() since using within lazy option/normalizer
* [BC BREAK] removed Options::all() since using within lazy option/normalizer
closures resulted in exceptions
* [BC BREAK] OptionDefinitionException now extends LogicException instead of
RuntimeException

102
vendor/symfony/options-resolver/Debug/OptionsResolverIntrospector.php vendored
View File

@ -1,102 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\OptionsResolver\Debug;
use Symfony\Component\OptionsResolver\Exception\NoConfigurationException;
use Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
*
* @final
*/
class OptionsResolverIntrospector
{
private $get;
public function __construct(OptionsResolver $optionsResolver)
{
$this->get = \Closure::bind(function ($property, $option, $message) {
/** @var OptionsResolver $this */
if (!$this->isDefined($option)) {
throw new UndefinedOptionsException(sprintf('The option "%s" does not exist.', $option));
}
if (!array_key_exists($option, $this->{$property})) {
throw new NoConfigurationException($message);
}
return $this->{$property}[$option];
}, $optionsResolver, $optionsResolver);
}
/**
* @param string $option
*
* @return mixed
*
* @throws NoConfigurationException on no configured value
*/
public function getDefault($option)
{
return call_user_func($this->get, 'defaults', $option, sprintf('No default value was set for the "%s" option.', $option));
}
/**
* @param string $option
*
* @return \Closure[]
*
* @throws NoConfigurationException on no configured closures
*/
public function getLazyClosures($option)
{
return call_user_func($this->get, 'lazy', $option, sprintf('No lazy closures were set for the "%s" option.', $option));
}
/**
* @param string $option
*
* @return string[]
*
* @throws NoConfigurationException on no configured types
*/
public function getAllowedTypes($option)
{
return call_user_func($this->get, 'allowedTypes', $option, sprintf('No allowed types were set for the "%s" option.', $option));
}
/**
* @param string $option
*
* @return mixed[]
*
* @throws NoConfigurationException on no configured values
*/
public function getAllowedValues($option)
{
return call_user_func($this->get, 'allowedValues', $option, sprintf('No allowed values were set for the "%s" option.', $option));
}
/**
* @param string $option
*
* @return \Closure
*
* @throws NoConfigurationException on no configured normalizer
*/
public function getNormalizer($option)
{
return call_user_func($this->get, 'normalizers', $option, sprintf('No normalizer was set for the "%s" option.', $option));
}
}

26
vendor/symfony/options-resolver/Exception/NoConfigurationException.php vendored
View File

@ -1,26 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\OptionsResolver\Exception;
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
/**
* Thrown when trying to introspect an option definition property
* for which no value was configured inside the OptionsResolver instance.
*
* @see OptionsResolverIntrospector
*
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
*/
class NoConfigurationException extends \RuntimeException implements ExceptionInterface
{
}

2
vendor/symfony/options-resolver/LICENSE vendored
View File

@ -1,4 +1,4 @@
Copyright (c) 2004-2018 Fabien Potencier
Copyright (c) 2004-2017 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

108
vendor/symfony/options-resolver/OptionsResolver.php vendored
View File

@ -28,21 +28,29 @@ class OptionsResolver implements Options
{
/**
* The names of all defined options.
*
* @var array
*/
private $defined = array();
/**
* The default option values.
*
* @var array
*/
private $defaults = array();
/**
* The names of required options.
*
* @var array
*/
private $required = array();
/**
* The resolved option values.
*
* @var array
*/
private $resolved = array();
@ -55,16 +63,22 @@ class OptionsResolver implements Options
/**
* A list of accepted values for each option.
*
* @var array
*/
private $allowedValues = array();
/**
* A list of accepted types for each option.
*
* @var array
*/
private $allowedTypes = array();
/**
* A list of closures for evaluating lazy options.
*
* @var array
*/
private $lazy = array();
@ -72,6 +86,8 @@ class OptionsResolver implements Options
* A list of lazy options whose closure is currently being called.
*
* This list helps detecting circular dependencies between lazy options.
*
* @var array
*/
private $calling = array();
@ -82,6 +98,8 @@ class OptionsResolver implements Options
* necessary in order to avoid inconsistencies during the resolving
* process. If any option is changed after being read, all evaluated
* lazy options that depend on this option would become invalid.
*
* @var bool
*/
private $locked = false;
@ -774,12 +792,21 @@ class OptionsResolver implements Options
// Validate the type of the resolved option
if (isset($this->allowedTypes[$option])) {
$valid = false;
$invalidTypes = array();
foreach ($this->allowedTypes[$option] as $type) {
$type = isset(self::$typeAliases[$type]) ? self::$typeAliases[$type] : $type;
if ($valid = $this->verifyTypes($type, $value, $invalidTypes)) {
if (function_exists($isFunction = 'is_'.$type)) {
if ($isFunction($value)) {
$valid = true;
break;
}
continue;
}
if ($value instanceof $type) {
$valid = true;
break;
}
}
@ -791,7 +818,7 @@ class OptionsResolver implements Options
$option,
$this->formatValue($value),
implode('" or "', $this->allowedTypes[$option]),
implode('|', array_keys($invalidTypes))
$this->formatTypeOf($value)
));
}
}
@ -868,45 +895,6 @@ class OptionsResolver implements Options
return $value;
}
/**
* @param string $type
* @param mixed $value
* @param array &$invalidTypes
*
* @return bool
*/
private function verifyTypes($type, $value, array &$invalidTypes)
{
if ('[]' === substr($type, -2) && is_array($value)) {
$originalType = $type;
$type = substr($type, 0, -2);
$invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array
$value,
function ($value) use ($type) {
return !self::isValueValidType($type, $value);
}
);
if (!$invalidValues) {
return true;
}
$invalidTypes[$this->formatTypeOf($value, $originalType)] = true;
return false;
}
if (self::isValueValidType($type, $value)) {
return true;
}
if (!$invalidTypes) {
$invalidTypes[$this->formatTypeOf($value, null)] = true;
}
return false;
}
/**
* Returns whether a resolved option with the given name exists.
*
@ -975,38 +963,13 @@ class OptionsResolver implements Options
* parameters should usually not be included in messages aimed at
* non-technical people.
*
* @param mixed $value The value to return the type of
* @param string $type
* @param mixed $value The value to return the type of
*
* @return string The type of the value
*/
private function formatTypeOf($value, $type)
private function formatTypeOf($value)
{
$suffix = '';
if ('[]' === substr($type, -2)) {
$suffix = '[]';
$type = substr($type, 0, -2);
while ('[]' === substr($type, -2)) {
$type = substr($type, 0, -2);
$value = array_shift($value);
if (!is_array($value)) {
break;
}
$suffix .= '[]';
}
if (is_array($value)) {
$subTypes = array();
foreach ($value as $val) {
$subTypes[$this->formatTypeOf($val, null)] = true;
}
return implode('|', array_keys($subTypes)).$suffix;
}
}
return (is_object($value) ? get_class($value) : gettype($value)).$suffix;
return is_object($value) ? get_class($value) : gettype($value);
}
/**
@ -1073,9 +1036,4 @@ class OptionsResolver implements Options
return implode(', ', $values);
}
private static function isValueValidType($type, $value)
{
return (function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
}
}

203
vendor/symfony/options-resolver/Tests/Debug/OptionsResolverIntrospectorTest.php vendored
View File

@ -1,203 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\OptionsResolver\Tests\Debug;
use PHPUnit\Framework\TestCase;
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
class OptionsResolverIntrospectorTest extends TestCase
{
public function testGetDefault()
{
$resolver = new OptionsResolver();
$resolver->setDefault($option = 'foo', 'bar');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getDefault($option));
}
public function testGetDefaultNull()
{
$resolver = new OptionsResolver();
$resolver->setDefault($option = 'foo', null);
$debug = new OptionsResolverIntrospector($resolver);
$this->assertNull($debug->getDefault($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
* @expectedExceptionMessage No default value was set for the "foo" option.
*/
public function testGetDefaultThrowsOnNoConfiguredValue()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getDefault($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
* @expectedExceptionMessage The option "foo" does not exist.
*/
public function testGetDefaultThrowsOnNotDefinedOption()
{
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getDefault('foo'));
}
public function testGetLazyClosures()
{
$resolver = new OptionsResolver();
$closures = array();
$resolver->setDefault($option = 'foo', $closures[] = function (Options $options) {});
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame($closures, $debug->getLazyClosures($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
* @expectedExceptionMessage No lazy closures were set for the "foo" option.
*/
public function testGetLazyClosuresThrowsOnNoConfiguredValue()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getLazyClosures($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
* @expectedExceptionMessage The option "foo" does not exist.
*/
public function testGetLazyClosuresThrowsOnNotDefinedOption()
{
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getLazyClosures('foo'));
}
public function testGetAllowedTypes()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$resolver->setAllowedTypes($option = 'foo', $allowedTypes = array('string', 'bool'));
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame($allowedTypes, $debug->getAllowedTypes($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
* @expectedExceptionMessage No allowed types were set for the "foo" option.
*/
public function testGetAllowedTypesThrowsOnNoConfiguredValue()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getAllowedTypes($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
* @expectedExceptionMessage The option "foo" does not exist.
*/
public function testGetAllowedTypesThrowsOnNotDefinedOption()
{
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getAllowedTypes('foo'));
}
public function testGetAllowedValues()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$resolver->setAllowedValues($option = 'foo', $allowedValues = array('bar', 'baz'));
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame($allowedValues, $debug->getAllowedValues($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
* @expectedExceptionMessage No allowed values were set for the "foo" option.
*/
public function testGetAllowedValuesThrowsOnNoConfiguredValue()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getAllowedValues($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
* @expectedExceptionMessage The option "foo" does not exist.
*/
public function testGetAllowedValuesThrowsOnNotDefinedOption()
{
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getAllowedValues('foo'));
}
public function testGetNormalizer()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$resolver->setNormalizer($option = 'foo', $normalizer = function () {});
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame($normalizer, $debug->getNormalizer($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
* @expectedExceptionMessage No normalizer was set for the "foo" option.
*/
public function testGetNormalizerThrowsOnNoConfiguredValue()
{
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getNormalizer($option));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
* @expectedExceptionMessage The option "foo" does not exist.
*/
public function testGetNormalizerThrowsOnNotDefinedOption()
{
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
$this->assertSame('bar', $debug->getNormalizer('foo'));
}
}

106
vendor/symfony/options-resolver/Tests/OptionsResolverTest.php vendored
View File

@ -486,15 +486,6 @@ class OptionsResolverTest extends TestCase
$this->resolver->setAllowedTypes('foo', 'string');
}
public function testResolveTypedArray()
{
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'string[]');
$options = $this->resolver->resolve(array('foo' => array('bar', 'baz')));
$this->assertSame(array('foo' => array('bar', 'baz')), $options);
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
*/
@ -509,65 +500,6 @@ class OptionsResolverTest extends TestCase
$this->resolver->resolve();
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
* @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "DateTime[]".
*/
public function testResolveFailsIfInvalidTypedArray()
{
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$this->resolver->resolve(array('foo' => array(new \DateTime())));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
* @expectedExceptionMessage The option "foo" with value "bar" is expected to be of type "int[]", but is of type "string".
*/
public function testResolveFailsWithNonArray()
{
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$this->resolver->resolve(array('foo' => 'bar'));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
* @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but is of type "integer|stdClass|array|DateTime[]".
*/
public function testResolveFailsIfTypedArrayContainsInvalidTypes()
{
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$values = range(1, 5);
$values[] = new \stdClass();
$values[] = array();
$values[] = new \DateTime();
$values[] = 123;
$this->resolver->resolve(array('foo' => $values));
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
* @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[][]", but is of type "double[][]".
*/
public function testResolveFailsWithCorrectLevelsButWrongScalar()
{
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[][]');
$this->resolver->resolve(
array(
'foo' => array(
array(1.2),
),
)
);
}
/**
* @dataProvider provideInvalidTypes
*/
@ -636,32 +568,6 @@ class OptionsResolverTest extends TestCase
$this->assertNotEmpty($this->resolver->resolve());
}
public function testResolveSucceedsIfTypedArray()
{
$this->resolver->setDefault('foo', null);
$this->resolver->setAllowedTypes('foo', array('null', 'DateTime[]'));
$data = array(
'foo' => array(
new \DateTime(),
new \DateTime(),
),
);
$result = $this->resolver->resolve($data);
$this->assertEquals($data, $result);
}
/**
* @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
public function testResolveFailsIfNotInstanceOfClass()
{
$this->resolver->setDefault('foo', 'bar');
$this->resolver->setAllowedTypes('foo', '\stdClass');
$this->resolver->resolve();
}
////////////////////////////////////////////////////////////////////////////
// addAllowedTypes()
////////////////////////////////////////////////////////////////////////////
@ -1513,12 +1419,12 @@ class OptionsResolverTest extends TestCase
});
$this->resolver->setDefault('lazy2', function (Options $options) {
Assert::assertArrayHasKey('default1', $options);
Assert::assertArrayHasKey('default2', $options);
Assert::assertArrayHasKey('required', $options);
Assert::assertArrayHasKey('lazy1', $options);
Assert::assertArrayHasKey('lazy2', $options);
Assert::assertArrayNotHasKey('defined', $options);
Assert::assertTrue(isset($options['default1']));
Assert::assertTrue(isset($options['default2']));
Assert::assertTrue(isset($options['required']));
Assert::assertTrue(isset($options['lazy1']));
Assert::assertTrue(isset($options['lazy2']));
Assert::assertFalse(isset($options['defined']));
Assert::assertSame(0, $options['default1']);
Assert::assertSame(42, $options['default2']);

4
vendor/symfony/options-resolver/composer.json vendored
View File

@ -16,7 +16,7 @@
}
],
"require": {
"php": "^5.5.9|>=7.0.8"
"php": ">=5.5.9"
},
"autoload": {
"psr-4": { "Symfony\\Component\\OptionsResolver\\": "" },
@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
"dev-master": "3.3-dev"
}
}
}

39
vendor/topthink/think-installer/src/ThinkExtend.php vendored
View File

@ -39,33 +39,28 @@ class ThinkExtend extends LibraryInstaller
if (!empty($extra['think-config'])) {
$composerExtra = $this->composer->getPackage()->getExtra();
$configDir = 'config';
$appDir = !empty($composerExtra['app-path']) ? $composerExtra['app-path'] : 'application';
$this->filesystem->ensureDirectoryExists($configDir);
if (is_dir($appDir)) {
//配置文件
foreach ((array) $extra['think-config'] as $name => $config) {
$target = $configDir . DIRECTORY_SEPARATOR . $name . '.php';
$source = $this->getInstallPath($package) . DIRECTORY_SEPARATOR . $config;
$extraDir = $appDir . DIRECTORY_SEPARATOR . 'extra';
$this->filesystem->ensureDirectoryExists($extraDir);
//配置文件
foreach ((array) $extra['think-config'] as $name => $config) {
$target = $extraDir . DIRECTORY_SEPARATOR . $name . '.php';
$source = $this->getInstallPath($package) . DIRECTORY_SEPARATOR . $config;
if (is_file($target)) {
$this->io->write("<info>File {$target} exist!</info>");
continue;
}
if (!is_file($source)) {
$this->io->write("<info>File {$target} not exist!</info>");
continue;
}
copy($source, $target);
if (is_file($target)) {
$this->io->write("<info>File {$target} exist!</info>");
continue;
}
if (!is_file($source)) {
$this->io->write("<info>File {$target} not exist!</info>");
continue;
}
copy($source, $target);
}
}
}
}

3
vendor/zoujingli/wechat-developer/.gitignore vendored
View File

@ -2,4 +2,5 @@
/.git
/.DS_Store
/vendor
/WeChat/Cache
/Cache
/Test/cert

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

@ -1,4 +1,4 @@
[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/wechat-developer) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/wechat-developer)
[![Latest Stable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/stable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/wechat-developer/v/unstable)](https://packagist.org/packages/zoujingli/wechat-developer) [![Total Downloads](https://poser.pugx.org/zoujingli/wechat-developer/downloads)](https://packagist.org/packages/wechat-developer) [![License](https://poser.pugx.org/zoujingli/wechat-developer/license)](https://packagist.org/packages/wechat-developer)
WeChatDeveloper for PHP
--
@ -16,20 +16,20 @@ PHP开发技术交流（QQ群 513350915）
[![PHP微信开发群 (SDK)](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a)
> WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先阅读微信官方文档。
>* 微信官方文档：http://mp.weixin.qq.com/wiki
>* 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
WeChatDeveloper 是基于官方接口封装，在做微信开发前，必需先阅读微信官方文档。
* 微信官方文档：https://mp.weixin.qq.com/wiki
* 商户支付文档：https://pay.weixin.qq.com/wiki/doc/api/index.html
> 针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
>* 开发文档地址：http://www.kancloud.cn/zoujingli/wechat-developer
>* Think.Admin：https://github.com/zoujingli/Think.Admin
针对 WeChatDeveloper 也有一准备了帮助资料可供参考。
* ThinkAdmin：https://github.com/zoujingli/Think.Admin
* 开发文档地址：https://www.kancloud.cn/zoujingli/wechat-developer
Repositorie
--
WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
>* GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
>* OSChina 托管地址：http://git.oschina.net/zoujingli/WeChatDeveloper
WeChatDeveloper 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
* Gitee 托管地址：https://gitee.com/zoujingli/WeChatDeveloper
* GitHub 托管地址：https://github.com/zoujingli/WeChatDeveloper
Install
@ -39,7 +39,7 @@ Install
# 首次安装 线上版本（稳定）
composer require zoujingli/wechat-developer
# 首次安装 开发版本
# 首次安装 开发版本（开发）
composer require zoujingli/wechat-developer dev-master
# 更新 WeChatDeveloper

6
vendor/zoujingli/wechat-developer/Test/config.php vendored
View File

@ -19,10 +19,10 @@ return [
'encodingaeskey' => 'BJIUzE0gqlWy0GxfPp4J1oPTBmOrNDIGPNav1YFH5Z5',
// 配置商户支付参数
'mch_id' => "1332187001",
'mch_key' => '11bd3d66d85f322a1e803cb587d18c3f',
'mch_key' => 'A82DC5BD1F3359081049C568D8502BC5',
// 配置商户支付双向证书目录
'ssl_key' => '',
'ssl_cer' => '',
'ssl_key' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
'ssl_cer' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
// 配置缓存目录，需要拥有写权限
'cache_path' => '',
];

8
vendor/zoujingli/wechat-developer/Test/pay-order-create.php vendored
View File

@ -33,10 +33,18 @@ try {
'notify_url' => 'http://a.com/text.html',
'spbill_create_ip' => '127.0.0.1',
];
// 生成预支付码
$result = $wechat->createOrder($options);
// 创建JSAPI参数签名
$options = $wechat->createParamsForJsApi($result['prepay_id']);
echo '<pre>';
echo "\n--- 创建预支付码 ---\n";
var_export($result);
echo "\n\n--- JSAPI 及 H5 参数 ---\n";
var_export($options);
} catch (Exception $e) {
// 出错啦，处理下吧

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

@ -105,7 +105,7 @@ class BasicWeChat
if (!empty($result['access_token'])) {
Tools::setCache($cache, $result['access_token'], 7000);
}
return $result['access_token'];
return $this->access_token = $result['access_token'];
}
/**
@ -122,6 +122,7 @@ class BasicWeChat
* 以GET获取接口数据并转为数组
* @param string $url 接口地址
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
*/
protected function httpGetForJson($url)
{
@ -133,6 +134,7 @@ class BasicWeChat
$this->isTry = true;
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
throw new InvalidResponseException($e->getMessage(), $e->getCode());
}
}
@ -142,6 +144,7 @@ class BasicWeChat
* @param array $data 请求数据
* @param bool $buildToJson
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
*/
protected function httpPostForJson($url, array $data, $buildToJson = true)
{
@ -149,10 +152,10 @@ class BasicWeChat
return Tools::json2arr(Tools::post($url, $buildToJson ? Tools::arr2json($data) : $data));
} catch (InvalidResponseException $e) {
if (!$this->isTry && in_array($e->getCode(), ['40014', '40001', '41001', '42001'])) {
$this->delAccessToken();
$this->isTry = true;
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
throw new InvalidResponseException($e->getMessage(), $e->getCode());
}
}

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

@ -306,7 +306,7 @@ class Tools
private static function getCacheName($name)
{
if (empty(self::$cache_path)) {
self::$cache_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
self::$cache_path = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR . 'Cache' . DIRECTORY_SEPARATOR;
}
self::$cache_path = rtrim(self::$cache_path, '/\\') . DIRECTORY_SEPARATOR;
file_exists(self::$cache_path) || mkdir(self::$cache_path, 0755, true);

22
vendor/zoujingli/wechat-developer/WeChat/Media.php vendored
View File

@ -46,15 +46,20 @@ class Media extends BasicWeChat
/**
* 获取临时素材
* @param string $media_id
* @return bool|string
* @param string $outType 返回处理函数
* @return array|string
* @throws Exceptions\LocalCacheException
* @throws InvalidResponseException
*/
public function get($media_id)
public function get($media_id, $outType = null)
{
$url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
$this->registerApi($url, __FUNCTION__, func_get_args());
return Tools::get($url);
$result = Tools::get($url);
if (json_decode($result)) {
return Tools::json2arr($result);
}
return is_null($outType) ? $result : $outType($result);
}
/**
@ -124,15 +129,20 @@ class Media extends BasicWeChat
/**
* 获取永久素材
* @param string $media_id
* @return array
* @param null|string $outType 输出类型
* @return array|string
* @throws Exceptions\LocalCacheException
* @throws InvalidResponseException
*/
public function getMaterial($media_id)
public function getMaterial($media_id, $outType = null)
{
$url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->httpPostForJson($url, ['media_id' => $media_id]);
$result = Tools::post($url, ['media_id' => $media_id]);
if (json_decode($result)) {
return Tools::json2arr($result);
}
return is_null($outType) ? $result : $outType($result);
}
/**

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

@ -59,9 +59,6 @@ class Menu extends BasicWeChat
*/
public function create(array $data)
{
try {
} catch (\Exception $e) {
}
$url = "https://api.weixin.qq.com/cgi-bin/menu/create?access_token=ACCESS_TOKEN";
$this->registerApi($url, __FUNCTION__, func_get_args());
return $this->httpPostForJson($url, $data);

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

@ -17,6 +17,7 @@ namespace WeChat;
use WeChat\Contracts\DataArray;
use WeChat\Contracts\Tools;
use WeChat\Exceptions\InvalidArgumentException;
use WeChat\Exceptions\InvalidDecryptException;
use WeChat\Exceptions\InvalidResponseException;
/**
@ -75,7 +76,44 @@ class Pay
public function createOrder(array $options)
{
$url = 'https://api.mch.weixin.qq.com/pay/unifiedorder';
return $this->callPostApi($url, $options);
return $this->callPostApi($url, $options, false, 'MD5');
}
/**
* 创建JsApi及H5支付参数
* @param string $prepay_id 统一下单预支付码
* @return array
*/
public function createParamsForJsApi($prepay_id)
{
$option = [];
$option["appId"] = $this->config->get('appid');
$option["timeStamp"] = (string)time();
$option["nonceStr"] = Tools::createNoncestr();
$option["package"] = "prepay_id={$prepay_id}";
$option["signType"] = "MD5";
$option["paySign"] = $this->getPaySign($option, 'MD5');
$option['timestamp'] = $option['timeStamp'];
return $option;
}
/**
* 获取支付规则二维码
* @param string $product_id 商户定义的商品id 或者订单号
* @return string
*/
public function createParamsForRuleQrc($product_id)
{
$data = [
'appid' => $this->config->get('appid'),
'mch_id' => $this->config->get('mch_id'),
'time_stamp' => (string)time(),
'nonce_str' => Tools::createNoncestr(),
'product_id' => (string)$product_id,
];
$data['sign'] = $this->getPaySign($data, 'MD5');
return "weixin://wxpay/bizpayurl?" . http_build_query($data);
}
/**
@ -191,10 +229,14 @@ class Pay
* 企业付款到零钱
* @param array $options
* @return array
* @throws InvalidResponseException
* @throws Exceptions\InvalidResponseException
*/
public function createTransfers(array $options)
{
$this->params->set('mchid', $this->config->get('mch_id'));
$this->params->set('mch_appid', $this->config->get('appid'));
$this->params->offsetUnset('appid');
$this->params->offsetUnset('mch_id');
$url = 'https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers';
return $this->callPostApi($url, $options, true, 'MD5', false);
}
@ -211,6 +253,98 @@ class Pay
return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
}
/**
* 企业付款到银行卡
* @param array $options
* @return array
* @throws Exceptions\LocalCacheException
* @throws Exceptions\InvalidDecryptException
* @throws Exceptions\InvalidResponseException
*/
public function createTransfersBank(array $options)
{
if (!isset($options['partner_trade_no'])) {
throw new InvalidArgumentException('Missing Options -- [partner_trade_no]');
}
if (!isset($options['enc_bank_no'])) {
throw new InvalidArgumentException('Missing Options -- [enc_bank_no]');
}
if (!isset($options['enc_true_name'])) {
throw new InvalidArgumentException('Missing Options -- [enc_true_name]');
}
if (!isset($options['bank_code'])) {
throw new InvalidArgumentException('Missing Options -- [bank_code]');
}
if (!isset($options['amount'])) {
throw new InvalidArgumentException('Missing Options -- [amount]');
}
isset($options['desc']) && $this->config['desc'] = $options['desc'];
$this->params->offsetUnset('appid');
return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
'amount' => $options['amount'],
'bank_code' => $options['bank_code'],
'partner_trade_no' => $options['partner_trade_no'],
'enc_bank_no' => $this->rsaEncode($options['enc_bank_no']),
'enc_true_name' => $this->rsaEncode($options['enc_true_name']),
], true, 'MD5', false);
}
/**
* 商户企业付款到银行卡操作进行结果查询
* @param string $partner_trade_no 商户订单号，需保持唯一
* @return array
* @throws InvalidResponseException
*/
public function queryTransFresBank($partner_trade_no)
{
$url = 'https://api.mch.weixin.qq.com/mmpaysptrans/query_bank';
return $this->callPostApi($url, ['partner_trade_no' => $partner_trade_no], true, 'MD5', false);
}
/**
* RSA加密处理
* @param string $string
* @param string $encrypted
* @return string
* @throws Exceptions\LocalCacheException
* @throws Exceptions\InvalidDecryptException
* @throws Exceptions\InvalidResponseException
*/
private function rsaEncode($string, $encrypted = '')
{
$search = ['-----BEGIN RSA PUBLIC KEY-----', '-----END RSA PUBLIC KEY-----', "\n", "\r"];
$pkc1 = str_replace($search, '', $this->getRsaContent());
$publicKey = '-----BEGIN PUBLIC KEY-----' . PHP_EOL .
wordwrap('MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A' . $pkc1, 64, PHP_EOL, true) . PHP_EOL .
'-----END PUBLIC KEY-----';
if (!openssl_public_encrypt("{$string}", $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING)) {
throw new InvalidDecryptException('Rsa Encrypt Error.');
}
return base64_encode($encrypted);
}
/**
* 获取签名文件内容
* @return string
* @throws Exceptions\LocalCacheException
* @throws Exceptions\InvalidResponseException
*/
private function getRsaContent()
{
$cacheKey = "pub_ras_key_" . $this->config->get('mch_id');
if (($pub_key = Tools::getCache($cacheKey))) {
return $pub_key;
}
$data = $this->callPostApi('https://fraud.mch.weixin.qq.com/risk/getpublickey', [], true, 'MD5');
if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS' || $data['result_code'] !== 'SUCCESS') {
$error = 'ResultError:' . $data['return_msg'];
$error .= isset($data['err_code_des']) ? ' - ' . $data['err_code_des'] : '';
throw new InvalidResponseException($error, 20000, $data);
}
Tools::setCache($cacheKey, $data['pub_key'], 600);
return $data['pub_key'];
}
/**
* 获取微信支付通知
* @return array
@ -229,22 +363,23 @@ class Pay
/**
* 生成支付签名
* @param array $data
* @param string $signType
* @param array $data 参与签名的数据
* @param string $signType 参与签名的类型
* @param string $buff 参与签名字符串前缀
* @return string
*/
public function getPaySign(array $data, $signType = 'MD5')
public function getPaySign(array $data, $signType = 'MD5', $buff = '')
{
unset($data['sign']);
ksort($data);
list($key, $str) = [$this->config->get('mch_key'), ''];
foreach ($data as $k => $v) {
$str .= "{$k}={$v}&";
$buff .= "{$k}={$v}&";
}
if ($signType === 'MD5') {
return strtoupper(md5("{$str}key={$key}"));
$buff .= ("key=" . $this->config->get('mch_key'));
if (strtoupper($signType) === 'MD5') {
return strtoupper(md5($buff));
}
return strtoupper(hash_hmac('SHA256', "{$str}key={$key}", $key));
return strtoupper(hash_hmac('SHA256', $buff, $this->config->get('mch_key')));
}
/**
@ -261,18 +396,15 @@ class Pay
{
$option = [];
if ($isCert) {
foreach (['ssl_cer', 'ssl_key'] as $key) {
if (empty($options[$key])) {
throw new InvalidArgumentException("Missing Config -- [{$key}]", '0');
}
}
$option['ssl_cer'] = $this->config->get('ssl_cer');
$option['ssl_key'] = $this->config->get('ssl_key');
if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
}
$params = $this->params->merge($data);
if ($needSignType) {
$params['sign_type'] = strtoupper($signType);
}
$needSignType && ($params['sign_type'] = strtoupper($signType));
$params['sign'] = $this->getPaySign($params, $signType);
$result = Tools::xml2arr(Tools::post($url, Tools::arr2xml($params), $option));
if ($result['return_code'] !== 'SUCCESS') {

3
vendor/zoujingli/wechat-developer/composer.json vendored
View File

@ -23,7 +23,8 @@
},
"autoload": {
"psr-4": {
"WeChat\\": "WeChat"
"WeChat\\": "WeChat",
"WeMini\\": "WeMini"
}
}
}

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

@ -14,8 +14,14 @@
// 动态注册SDK自动加载
spl_autoload_register(function ($classname) {
$filename = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $classname) . '.php';
if (stripos($classname, 'WeChat') === 0 && file_exists($filename)) {
include $filename;
$separator = DIRECTORY_SEPARATOR;
$filename = __DIR__ . $separator . str_replace('\\', $separator, $classname) . '.php';
if (file_exists($filename)) {
if (stripos($classname, 'WeChat') === 0) {
include $filename;
}
if (stripos($classname, 'WeMini') === 0) {
include $filename;
}
}
});

30
vendor/zoujingli/weopen-developer/WeOpen/Service.php vendored
View File

@ -269,19 +269,39 @@ class Service
$component_appid = $this->config->get('component_appid');
$component_access_token = $this->getComponentAccessToken();
$url = "https://api.weixin.qq.com/sns/oauth2/component/access_token?appid={$authorizer_appid}&code={$_GET['code']}&grant_type=authorization_code&component_appid={$component_appid}&component_access_token={$component_access_token}";
$result = $this->httpGetForJson($url);
return $result !== false ? $result : false;
return $this->httpGetForJson($url);
}
/**
* 取当前所有已授权的帐号基本信息
* @param integer $count 拉取数量，最大为500
* @param integer $offset 偏移位置/起始位置
* @return array|bool
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function getAuthorizerList($count = 500, $offset = 0)
{
$component_appid = $this->config->get('component_appid');
$component_access_token = $this->getComponentAccessToken();
$url = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list?component_access_token={$component_access_token}";
return $this->httpPostForJson($url, [
'count' => $count,
'offset' => $offset,
'component_appid' => $component_appid,
]);
}
/**
* 创建指定授权公众号接口实例
* @param string $type 需要加载的接口实例名称
* @param string $name 需要加载的接口实例名称
* @param string $authorizer_appid 授权公众号的appid
* @param string $type 加载SDK类型 WeChat|WeMini
* @return \WeChat\Card|\WeChat\Custom|\WeChat\Media|\WeChat\Menu|\WeChat\Oauth|\WeChat\Pay|\WeChat\Product|\WeChat\Qrcode|\WeChat\Receive|\WeChat\Scan|\WeChat\Script|\WeChat\Shake|\WeChat\Tags|\WeChat\Template|\WeChat\User|\WeChat\Wifi
*/
public function instance($type, $authorizer_appid)
public function instance($name, $authorizer_appid, $type = 'WeChat')
{
$className = 'WeChat\\' . ucfirst(strtolower($type));
$className = "{$type}\\" . ucfirst(strtolower($name));
return new $className($this->getConfig($authorizer_appid));
}

6
vendor/zoujingli/weopen-developer/composer.json vendored
View File

@ -20,11 +20,13 @@
"php": ">=5.4",
"ext-curl": "*",
"ext-openssl": "*",
"zoujingli/wechat-developer": "^1.0.0"
"zoujingli/wechat-developer": "^1.0"
},
"autoload": {
"psr-4": {
"WeOpen\\": "WeOpen"
"WeOpen\\": "WeOpen",
"WeChat\\": "WeChat",
"WeMini\\": "WeMini"
}
}
}