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

[更新]ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-02-18 15:20:02 +08:00
parent 4a80dc8ffe
commit 1e3fd91243
405 changed files with 3420 additions and 2271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.cmd
View File

@ -1,13 +0,0 @@
:: Composer 安装更新脚本
@echo off
title Composer Plugs Install And Optimize
echo.
echo ========= 1. 清理已安装插件 =========
rmdir /s/q vendor thinkphp runtime
echo.
echo ========= 2. 下载并安装插件 =========
composer update --profile --prefer-dist --optimize-autoloader
echo.
echo ========= 3. 压缩并发布插件 =========
composer dump-autoload --optimize
exit

2
composer.json
View File

@ -24,7 +24,7 @@
"topthink/think-captcha": "^1.0", "topthink/think-captcha": "^1.0",
"topthink/think-mongo": "^1.1", "topthink/think-mongo": "^1.1",
"topthink/think-queue": "^1.0", "topthink/think-queue": "^1.0",
"endroid/qrcode": "^1.9", "endroid/qr-code": "^1.9",
"aliyuncs/oss-sdk-php": "^2.2" "aliyuncs/oss-sdk-php": "^2.2"
}, },
"extra": { "extra": {

2
thinkphp/README.md
View File

@ -92,7 +92,7 @@ www WEB部署目录（或者子目录）
## 命名规范 ## 命名规范
ThinkPHP5的命名规范遵循PSR-2规范以及PSR-4自动加载规范。 ThinkPHP5的命名规范遵循`PSR-2`规范以及`PSR-4`自动加载规范。
## 参与开发 ## 参与开发
注册并登录 Github 帐号， fork 本项目并进行改动。 注册并登录 Github 帐号， fork 本项目并进行改动。

2
thinkphp/base.php
View File

@ -9,7 +9,7 @@
// | Author: liu21st <liu21st@gmail.com> // | Author: liu21st <liu21st@gmail.com>
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
define('THINK_VERSION', '5.0.15'); define('THINK_VERSION', '5.0.24');
define('THINK_START_TIME', microtime(true)); define('THINK_START_TIME', microtime(true));
define('THINK_START_MEM', memory_get_usage()); define('THINK_START_MEM', memory_get_usage());
define('EXT', '.php'); define('EXT', '.php');

9
thinkphp/convention.php
View File

@ -116,6 +116,8 @@ return [
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
'template' => [ 'template' => [
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
'auto_rule' => 1,
// 模板引擎类型 支持 php think 支持扩展 // 模板引擎类型 支持 php think 支持扩展
'type' => 'Think', 'type' => 'Think',
// 视图基础目录，配置目录为所有模块的视图起始目录 // 视图基础目录，配置目录为所有模块的视图起始目录
@ -286,4 +288,11 @@ return [
'list_rows' => 15, 'list_rows' => 15,
], ],
//控制台配置
'console' => [
'name' => 'Think Console',
'version' => '0.1',
'user' => null,
],
]; ];

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

@ -48,6 +48,7 @@ return [
'KVDB init error' => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务', 'KVDB init error' => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务',
'fields not exists' => '数据表字段不存在', 'fields not exists' => '数据表字段不存在',
'where express error' => '查询表达式错误', 'where express error' => '查询表达式错误',
'not support data' => '不支持的数据表达式',
'no data to update' => '没有任何数据需要更新', 'no data to update' => '没有任何数据需要更新',
'miss data to insert' => '缺少需要写入的数据', 'miss data to insert' => '缺少需要写入的数据',
'miss complex primary data' => '缺少复合主键数据', 'miss complex primary data' => '缺少复合主键数据',
@ -66,6 +67,7 @@ return [
'relation data not exists' => '关联数据不存在', 'relation data not exists' => '关联数据不存在',
'relation not support' => '关联不支持', 'relation not support' => '关联不支持',
'chunk not support order' => 'Chunk不支持调用order方法', 'chunk not support order' => 'Chunk不支持调用order方法',
'closure not support cache(true)' => '使用闭包查询不支持cache(true)，请指定缓存Key',
// 上传错误信息 // 上传错误信息
'unknown upload error' => '未知上传错误！', 'unknown upload error' => '未知上传错误！',

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

@ -551,11 +551,20 @@ class App
// 获取控制器名 // 获取控制器名
$controller = strip_tags($result[1] ?: $config['default_controller']); $controller = strip_tags($result[1] ?: $config['default_controller']);
if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
throw new HttpException(404, 'controller not exists:' . $controller);
}
$controller = $convert ? strtolower($controller) : $controller; $controller = $convert ? strtolower($controller) : $controller;
// 获取操作名 // 获取操作名
$actionName = strip_tags($result[2] ?: $config['default_action']); $actionName = strip_tags($result[2] ?: $config['default_action']);
$actionName = $convert ? strtolower($actionName) : $actionName; if (!empty($config['action_convert'])) {
$actionName = Loader::parseName($actionName, 1);
} else {
$actionName = $convert ? strtolower($actionName) : $actionName;
}
// 设置当前请求的控制器、操作 // 设置当前请求的控制器、操作
$request->controller(Loader::parseName($controller, 1))->action($actionName); $request->controller(Loader::parseName($controller, 1))->action($actionName);
@ -581,6 +590,13 @@ class App
if (is_callable([$instance, $action])) { if (is_callable([$instance, $action])) {
// 执行操作方法 // 执行操作方法
$call = [$instance, $action]; $call = [$instance, $action];
// 严格获取当前操作方法名
$reflect = new \ReflectionMethod($instance, $action);
$methodName = $reflect->getName();
$suffix = $config['action_suffix'];
$actionName = $suffix ? substr($methodName, 0, -strlen($suffix)) : $methodName;
$request->action($actionName);
} elseif (is_callable([$instance, '_empty'])) { } elseif (is_callable([$instance, '_empty'])) {
// 空操作 // 空操作
$call = [$instance, '_empty']; $call = [$instance, '_empty'];

14
thinkphp/library/think/Collection.php
View File

@ -99,6 +99,16 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static(array_keys($this->items)); return new static(array_keys($this->items));
} }
/**
* 返回数组中所有的值组成的新 Collection 实例
* @access public
* @return static
*/
public function values()
{
return new static(array_values($this->items));
}
/** /**
* 合并数组并返回一个新的 Collection 实例 * 合并数组并返回一个新的 Collection 实例
* @access public * @access public
@ -273,7 +283,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
$result = []; $result = [];
foreach ($this->items as $row) { foreach ($this->items as $row) {
$key = $value = null; $key = $value = null;
$keySet = $valueSet = false; $keySet = $valueSet = false;
if (null !== $indexKey && array_key_exists($indexKey, $row)) { if (null !== $indexKey && array_key_exists($indexKey, $row)) {
@ -309,7 +319,7 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
*/ */
public function sort(callable $callback = null) public function sort(callable $callback = null)
{ {
$items = $this->items; $items = $this->items;
$callback = $callback ?: function ($a, $b) { $callback = $callback ?: function ($a, $b) {
return $a == $b ? 0 : (($a < $b) ? -1 : 1); return $a == $b ? 0 : (($a < $b) ? -1 : 1);
}; };

39
thinkphp/library/think/Console.php
View File

@ -79,14 +79,19 @@ class Console
/** /**
* Console constructor. * Console constructor.
* @access public * @access public
* @param string $name 名称 * @param string $name 名称
* @param string $version 版本 * @param string $version 版本
* @param null|string $user 执行用户
*/ */
public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN') public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', $user = null)
{ {
$this->name = $name; $this->name = $name;
$this->version = $version; $this->version = $version;
if ($user) {
$this->setUser($user);
}
$this->defaultCommand = 'list'; $this->defaultCommand = 'list';
$this->definition = $this->getDefaultInputDefinition(); $this->definition = $this->getDefaultInputDefinition();
@ -95,6 +100,19 @@ class Console
} }
} }
/**
* 设置执行用户
* @param $user
*/
public function setUser($user)
{
$user = posix_getpwnam($user);
if ($user) {
posix_setuid($user['uid']);
posix_setgid($user['gid']);
}
}
/** /**
* 初始化 Console * 初始化 Console
* @access public * @access public
@ -106,8 +124,9 @@ class Console
static $console; static $console;
if (!$console) { if (!$console) {
$config = Config::get('console');
// 实例化 console // 实例化 console
$console = new self('Think Console', '0.1'); $console = new self($config['name'], $config['version'], $config['user']);
// 读取指令集 // 读取指令集
if (is_file(CONF_PATH . 'command' . EXT)) { if (is_file(CONF_PATH . 'command' . EXT)) {
@ -479,7 +498,7 @@ class Console
}, $namespace); }, $namespace);
$allNamespaces = $this->getNamespaces(); $allNamespaces = $this->getNamespaces();
$namespaces = preg_grep('{^' . $expr . '}', $allNamespaces); $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
if (empty($namespaces)) { if (empty($namespaces)) {
$message = sprintf( $message = sprintf(
@ -527,7 +546,7 @@ class Console
}, $name); }, $name);
$allCommands = array_keys($this->commands); $allCommands = array_keys($this->commands);
$commands = preg_grep('{^' . $expr . '}', $allCommands); $commands = preg_grep('{^' . $expr . '}', $allCommands);
if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) { if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
if (false !== ($pos = strrpos($name, ':'))) { if (false !== ($pos = strrpos($name, ':'))) {
@ -550,7 +569,7 @@ class Console
if (count($commands) > 1) { if (count($commands) > 1) {
$commandList = $this->commands; $commandList = $this->commands;
$commands = array_filter($commands, function ($nameOrAlias) use ($commandList, $commands) { $commands = array_filter($commands, function ($nameOrAlias) use ($commandList, $commands) {
$commandName = $commandList[$nameOrAlias]->getName(); $commandName = $commandList[$nameOrAlias]->getName();
return $commandName === $nameOrAlias || !in_array($commandName, $commands); return $commandName === $nameOrAlias || !in_array($commandName, $commands);
@ -601,7 +620,7 @@ class Console
$abbrevs = []; $abbrevs = [];
foreach ($names as $name) { foreach ($names as $name) {
for ($len = strlen($name); $len > 0; --$len) { for ($len = strlen($name); $len > 0; --$len) {
$abbrev = substr($name, 0, $len); $abbrev = substr($name, 0, $len);
$abbrevs[$abbrev][] = $name; $abbrevs[$abbrev][] = $name;
} }
} }
@ -754,8 +773,8 @@ class Console
*/ */
private function findAlternatives($name, $collection) private function findAlternatives($name, $collection)
{ {
$threshold = 1e3; $threshold = 1e3;
$alternatives = []; $alternatives = [];
$collectionParts = []; $collectionParts = [];
foreach ($collection as $item) { foreach ($collection as $item) {

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

@ -52,7 +52,7 @@ class Controller
*/ */
public function __construct(Request $request = null) public function __construct(Request $request = null)
{ {
$this->view = View::instance(Config::get('template'), Config::get('view_replace_str')); $this->view = View::instance(Config::get('template'), Config::get('view_replace_str'));
$this->request = is_null($request) ? Request::instance() : $request; $this->request = is_null($request) ? Request::instance() : $request;
// 控制器初始化 // 控制器初始化
@ -202,9 +202,15 @@ class Controller
} }
// 批量验证 // 批量验证
if ($batch || $this->batchValidate) $v->batch(true); if ($batch || $this->batchValidate) {
$v->batch(true);
}
// 设置错误信息 // 设置错误信息
if (is_array($message)) $v->message($message); if (is_array($message)) {
$v->message($message);
}
// 使用回调验证 // 使用回调验证
if ($callback && is_callable($callback)) { if ($callback && is_callable($callback)) {
call_user_func_array($callback, [$v, &$data]); call_user_func_array($callback, [$v, &$data]);

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

@ -23,7 +23,7 @@ class Loader
/** /**
* @var array 类名映射 * @var array 类名映射
*/ */
protected static $map = []; protected static $classMap = [];
/** /**
* @var array 命名空间别名 * @var array 命名空间别名
@ -56,9 +56,9 @@ class Loader
private static $fallbackDirsPsr0 = []; private static $fallbackDirsPsr0 = [];
/** /**
* @var array 自动加载的文件 * @var array 需要加载的文件
*/ */
private static $autoloadFiles = []; private static $files = [];
/** /**
* 自动加载 * 自动加载
@ -99,8 +99,8 @@ class Loader
private static function findFile($class) private static function findFile($class)
{ {
// 类库映射 // 类库映射
if (!empty(self::$map[$class])) { if (!empty(self::$classMap[$class])) {
return self::$map[$class]; return self::$classMap[$class];
} }
// 查找 PSR-4 // 查找 PSR-4
@ -156,7 +156,7 @@ class Loader
} }
// 找不到则设置映射为 false 并返回 // 找不到则设置映射为 false 并返回
return self::$map[$class] = false; return self::$classMap[$class] = false;
} }
/** /**
@ -169,9 +169,9 @@ class Loader
public static function addClassMap($class, $map = '') public static function addClassMap($class, $map = '')
{ {
if (is_array($class)) { if (is_array($class)) {
self::$map = array_merge(self::$map, $class); self::$classMap = array_merge(self::$classMap, $class);
} else { } else {
self::$map[$class] = $map; self::$classMap[$class] = $map;
} }
} }
@ -284,6 +284,24 @@ class Loader
// 注册系统自动加载 // 注册系统自动加载
spl_autoload_register($autoload ?: 'think\\Loader::autoload', true, true); spl_autoload_register($autoload ?: 'think\\Loader::autoload', true, true);
// Composer 自动加载支持
if (is_dir(VENDOR_PATH . 'composer')) {
if (PHP_VERSION_ID >= 50600 && is_file(VENDOR_PATH . 'composer' . DS . 'autoload_static.php')) {
require VENDOR_PATH . 'composer' . DS . 'autoload_static.php';
$declaredClass = get_declared_classes();
$composerClass = array_pop($declaredClass);
foreach (['prefixLengthsPsr4', 'prefixDirsPsr4', 'fallbackDirsPsr4', 'prefixesPsr0', 'fallbackDirsPsr0', 'classMap', 'files'] as $attr) {
if (property_exists($composerClass, $attr)) {
self::${$attr} = $composerClass::${$attr};
}
}
} else {
self::registerComposerLoader();
}
}
// 注册命名空间定义 // 注册命名空间定义
self::addNamespace([ self::addNamespace([
'think' => LIB_PATH . 'think' . DS, 'think' => LIB_PATH . 'think' . DS,
@ -296,10 +314,7 @@ class Loader
self::addClassMap(__include_file(RUNTIME_PATH . 'classmap' . EXT)); self::addClassMap(__include_file(RUNTIME_PATH . 'classmap' . EXT));
} }
// Composer 自动加载支持 self::loadComposerAutoloadFiles();
if (is_dir(VENDOR_PATH . 'composer')) {
self::registerComposerLoader();
}
// 自动加载 extend 目录 // 自动加载 extend 目录
self::$fallbackDirsPsr4[] = rtrim(EXTEND_PATH, DS); self::$fallbackDirsPsr4[] = rtrim(EXTEND_PATH, DS);
@ -331,16 +346,21 @@ class Loader
if ($classMap) { if ($classMap) {
self::addClassMap($classMap); self::addClassMap($classMap);
} }
} }
if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) { if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) {
$includeFiles = require VENDOR_PATH . 'composer/autoload_files.php'; self::$files = require VENDOR_PATH . 'composer/autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) { }
if (empty(self::$autoloadFiles[$fileIdentifier])) { }
__require_file($file);
self::$autoloadFiles[$fileIdentifier] = true; // 加载composer autofile文件
} public static function loadComposerAutoloadFiles()
{
foreach (self::$files as $fileIdentifier => $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
__require_file($file);
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
} }
} }
} }

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

@ -176,7 +176,7 @@ class Log
} }
} }
if ($result = self::$driver->save($log)) { if ($result = self::$driver->save($log, true)) {
self::$log = []; self::$log = [];
} }
@ -211,7 +211,7 @@ class Log
is_null(self::$driver) && self::init(Config::get('log')); is_null(self::$driver) && self::init(Config::get('log'));
// 写入日志 // 写入日志
if ($result = self::$driver->save($log)) { if ($result = self::$driver->save($log, false)) {
self::$log = []; self::$log = [];
} }

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

@ -94,6 +94,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
protected $type = []; protected $type = [];
// 是否为更新数据 // 是否为更新数据
protected $isUpdate = false; protected $isUpdate = false;
// 是否使用Replace
protected $replace = false;
// 是否强制更新所有数据 // 是否强制更新所有数据
protected $force = false; protected $force = false;
// 更新条件 // 更新条件
@ -116,6 +118,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
protected static $initialized = []; protected static $initialized = [];
/**
* 是否从主库读取（主从分布式有效）
* @var array
*/
protected static $readMaster;
/** /**
* 构造方法 * 构造方法
* @access public * @access public
@ -171,6 +179,20 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->initialize(); $this->initialize();
} }
/**
* 是否从主库读取数据（主从分布有效）
* @access public
* @param bool $all 是否所有模型生效
* @return $this
*/
public function readMaster($all = false)
{
$model = $all ? '*' : $this->class;
static::$readMaster[$model] = true;
return $this;
}
/** /**
* 创建模型的查询对象 * 创建模型的查询对象
* @access protected * @access protected
@ -194,6 +216,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$queryClass = $this->query ?: $con->getConfig('query'); $queryClass = $this->query ?: $con->getConfig('query');
$query = new $queryClass($con, $this); $query = new $queryClass($con, $this);
if (isset(static::$readMaster['*']) || isset(static::$readMaster[$this->class])) {
$query->master(true);
}
// 设置当前数据表和模型名 // 设置当前数据表和模型名
if (!empty($this->table)) { if (!empty($this->table)) {
$query->setTable($this->table); $query->setTable($this->table);
@ -679,7 +705,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = empty($value) ? new \stdClass() : json_decode($value); $value = empty($value) ? new \stdClass() : json_decode($value);
break; break;
case 'serialize': case 'serialize':
$value = unserialize($value); try {
$value = unserialize($value);
} catch (\Exception $e) {
$value = null;
}
break; break;
default: default:
if (false !== strpos($type, '\\')) { if (false !== strpos($type, '\\')) {
@ -985,6 +1015,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return false; return false;
} }
/**
* 新增数据是否使用Replace
* @access public
* @param bool $replace
* @return $this
*/
public function replace($replace = true)
{
$this->replace = $replace;
return $this;
}
/** /**
* 保存当前数据对象 * 保存当前数据对象
* @access public * @access public
@ -1000,19 +1042,21 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$data = []; $data = [];
} }
// 数据自动验证
if (!empty($data)) { if (!empty($data)) {
// 数据自动验证
if (!$this->validateData($data)) { if (!$this->validateData($data)) {
return false; return false;
} }
// 数据对象赋值 // 数据对象赋值
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$this->setAttr($key, $value, $data); $this->setAttr($key, $value, $data);
} }
if (!empty($where)) { }
$this->isUpdate = true;
$this->updateWhere = $where; if (!empty($where)) {
} $this->isUpdate = true;
$this->updateWhere = $where;
} }
// 自动关联写入 // 自动关联写入
@ -1135,9 +1179,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 检测字段 // 检测字段
$allowFields = $this->checkAllowField(array_merge($this->auto, $this->insert)); $allowFields = $this->checkAllowField(array_merge($this->auto, $this->insert));
if (!empty($allowFields)) { if (!empty($allowFields)) {
$result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data, false, false, $sequence); $result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data, $this->replace, false, $sequence);
} else { } else {
$result = $this->getQuery()->insert($this->data, false, false, $sequence); $result = $this->getQuery()->insert($this->data, $this->replace, false, $sequence);
} }
// 获取自动增长主键 // 获取自动增长主键

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

@ -128,7 +128,7 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
} }
$url = $path; $url = $path;
if (!empty($parameters)) { if (!empty($parameters)) {
$url .= '?' . urldecode(http_build_query($parameters, null, '&')); $url .= '?' . http_build_query($parameters, null, '&');
} }
return $url . $this->buildFragment(); return $url . $this->buildFragment();
} }
@ -395,7 +395,15 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
public function __call($name, $arguments) 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;
} }
} }

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

@ -121,6 +121,11 @@ class Request
protected $cache; protected $cache;
// 缓存是否检查 // 缓存是否检查
protected $isCheckCache; protected $isCheckCache;
/**
* 是否合并Param
* @var bool
*/
protected $mergeParam = false;
/** /**
* 构造函数 * 构造函数
@ -155,8 +160,8 @@ class Request
/** /**
* Hook 方法注入 * Hook 方法注入
* @access public * @access public
* @param string|array $method 方法名 * @param string|array $method 方法名
* @param mixed $callback callable * @param mixed $callback callable
* @return void * @return void
*/ */
public static function hook($method, $callback = null) public static function hook($method, $callback = null)
@ -182,16 +187,28 @@ class Request
return self::$instance; return self::$instance;
} }
/**
* 销毁当前请求对象
* @access public
* @return void
*/
public static function destroy()
{
if (!is_null(self::$instance)) {
self::$instance = null;
}
}
/** /**
* 创建一个URL请求 * 创建一个URL请求
* @access public * @access public
* @param string $uri URL地址 * @param string $uri URL地址
* @param string $method 请求类型 * @param string $method 请求类型
* @param array $params 请求参数 * @param array $params 请求参数
* @param array $cookie * @param array $cookie
* @param array $files * @param array $files
* @param array $server * @param array $server
* @param string $content * @param string $content
* @return \think\Request * @return \think\Request
*/ */
public static function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null) public static function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null)
@ -232,7 +249,7 @@ class Request
parse_str(html_entity_decode($info['query']), $query); parse_str(html_entity_decode($info['query']), $query);
if (!empty($params)) { if (!empty($params)) {
$params = array_replace($query, $params); $params = array_replace($query, $params);
$queryString = http_build_query($query, '', '&'); $queryString = http_build_query($params, '', '&');
} else { } else {
$params = $query; $params = $query;
$queryString = $info['query']; $queryString = $info['query'];
@ -479,8 +496,8 @@ class Request
/** /**
* 设置资源类型 * 设置资源类型
* @access public * @access public
* @param string|array $type 资源类型名 * @param string|array $type 资源类型名
* @param string $val 资源类型 * @param string $val 资源类型
* @return void * @return void
*/ */
public function mimeType($type, $val = '') public function mimeType($type, $val = '')
@ -495,22 +512,28 @@ class Request
/** /**
* 当前的请求类型 * 当前的请求类型
* @access public * @access public
* @param bool $method true 获取原始请求类型 * @param bool $method true 获取原始请求类型
* @return string * @return string
*/ */
public function method($method = false) public function method($method = false)
{ {
if (true === $method) { if (true === $method) {
// 获取原始请求类型 // 获取原始请求类型
return IS_CLI ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']); return $this->server('REQUEST_METHOD') ?: 'GET';
} elseif (!$this->method) { } elseif (!$this->method) {
if (isset($_POST[Config::get('var_method')])) { if (isset($_POST[Config::get('var_method')])) {
$this->method = strtoupper($_POST[Config::get('var_method')]); $method = strtoupper($_POST[Config::get('var_method')]);
$this->{$this->method}($_POST); if (in_array($method, ['GET', 'POST', 'DELETE', 'PUT', 'PATCH'])) {
$this->method = $method;
$this->{$this->method}($_POST);
} else {
$this->method = 'POST';
}
unset($_POST[Config::get('var_method')]);
} elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) { } elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
$this->method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']); $this->method = strtoupper($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
} else { } else {
$this->method = IS_CLI ? 'GET' : (isset($this->server['REQUEST_METHOD']) ? $this->server['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']); $this->method = $this->server('REQUEST_METHOD') ?: 'GET';
} }
} }
return $this->method; return $this->method;
@ -609,14 +632,14 @@ class Request
/** /**
* 获取当前请求的参数 * 获取当前请求的参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function param($name = '', $default = null, $filter = '') public function param($name = '', $default = null, $filter = '')
{ {
if (empty($this->param)) { if (empty($this->mergeParam)) {
$method = $this->method(true); $method = $this->method(true);
// 自动获取请求变量 // 自动获取请求变量
switch ($method) { switch ($method) {
@ -632,7 +655,8 @@ class Request
$vars = []; $vars = [];
} }
// 当前请求参数和URL地址中的参数合并 // 当前请求参数和URL地址中的参数合并
$this->param = array_merge($this->get(false), $vars, $this->route(false)); $this->param = array_merge($this->param, $this->get(false), $vars, $this->route(false));
$this->mergeParam = true;
} }
if (true === $name) { if (true === $name) {
// 获取包含文件上传信息的数组 // 获取包含文件上传信息的数组
@ -646,15 +670,16 @@ class Request
/** /**
* 设置获取路由参数 * 设置获取路由参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function route($name = '', $default = null, $filter = '') public function route($name = '', $default = null, $filter = '')
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = []; $this->param = [];
$this->mergeParam = false;
return $this->route = array_merge($this->route, $name); return $this->route = array_merge($this->route, $name);
} }
return $this->input($this->route, $name, $default, $filter); return $this->input($this->route, $name, $default, $filter);
@ -663,9 +688,9 @@ class Request
/** /**
* 设置获取GET参数 * 设置获取GET参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function get($name = '', $default = null, $filter = '') public function get($name = '', $default = null, $filter = '')
@ -675,6 +700,7 @@ class Request
} }
if (is_array($name)) { if (is_array($name)) {
$this->param = []; $this->param = [];
$this->mergeParam = false;
return $this->get = array_merge($this->get, $name); return $this->get = array_merge($this->get, $name);
} }
return $this->input($this->get, $name, $default, $filter); return $this->input($this->get, $name, $default, $filter);
@ -683,9 +709,9 @@ class Request
/** /**
* 设置获取POST参数 * 设置获取POST参数
* @access public * @access public
* @param string $name 变量名 * @param string $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function post($name = '', $default = null, $filter = '') public function post($name = '', $default = null, $filter = '')
@ -700,6 +726,7 @@ class Request
} }
if (is_array($name)) { if (is_array($name)) {
$this->param = []; $this->param = [];
$this->mergeParam = false;
return $this->post = array_merge($this->post, $name); return $this->post = array_merge($this->post, $name);
} }
return $this->input($this->post, $name, $default, $filter); return $this->input($this->post, $name, $default, $filter);
@ -708,9 +735,9 @@ class Request
/** /**
* 设置获取PUT参数 * 设置获取PUT参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function put($name = '', $default = null, $filter = '') public function put($name = '', $default = null, $filter = '')
@ -725,6 +752,7 @@ class Request
} }
if (is_array($name)) { if (is_array($name)) {
$this->param = []; $this->param = [];
$this->mergeParam = false;
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name); return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
} }
@ -734,9 +762,9 @@ class Request
/** /**
* 设置获取DELETE参数 * 设置获取DELETE参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function delete($name = '', $default = null, $filter = '') public function delete($name = '', $default = null, $filter = '')
@ -747,9 +775,9 @@ class Request
/** /**
* 设置获取PATCH参数 * 设置获取PATCH参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function patch($name = '', $default = null, $filter = '') public function patch($name = '', $default = null, $filter = '')
@ -759,9 +787,9 @@ class Request
/** /**
* 获取request变量 * 获取request变量
* @param string $name 数据名称 * @param string $name 数据名称
* @param string $default 默认值 * @param string $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function request($name = '', $default = null, $filter = '') public function request($name = '', $default = null, $filter = '')
@ -771,6 +799,7 @@ class Request
} }
if (is_array($name)) { if (is_array($name)) {
$this->param = []; $this->param = [];
$this->mergeParam = false;
return $this->request = array_merge($this->request, $name); return $this->request = array_merge($this->request, $name);
} }
return $this->input($this->request, $name, $default, $filter); return $this->input($this->request, $name, $default, $filter);
@ -779,9 +808,9 @@ class Request
/** /**
* 获取session数据 * 获取session数据
* @access public * @access public
* @param string|array $name 数据名称 * @param string|array $name 数据名称
* @param string $default 默认值 * @param string $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function session($name = '', $default = null, $filter = '') public function session($name = '', $default = null, $filter = '')
@ -798,9 +827,9 @@ class Request
/** /**
* 获取cookie参数 * 获取cookie参数
* @access public * @access public
* @param string|array $name 数据名称 * @param string|array $name 数据名称
* @param string $default 默认值 * @param string $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function cookie($name = '', $default = null, $filter = '') public function cookie($name = '', $default = null, $filter = '')
@ -831,9 +860,9 @@ class Request
/** /**
* 获取server参数 * 获取server参数
* @access public * @access public
* @param string|array $name 数据名称 * @param string|array $name 数据名称
* @param string $default 默认值 * @param string $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function server($name = '', $default = null, $filter = '') public function server($name = '', $default = null, $filter = '')
@ -909,9 +938,9 @@ class Request
/** /**
* 获取环境变量 * 获取环境变量
* @param string|array $name 数据名称 * @param string|array $name 数据名称
* @param string $default 默认值 * @param string $default 默认值
* @param string|array $filter 过滤方法 * @param string|array $filter 过滤方法
* @return mixed * @return mixed
*/ */
public function env($name = '', $default = null, $filter = '') public function env($name = '', $default = null, $filter = '')
@ -928,8 +957,8 @@ class Request
/** /**
* 设置或者获取当前的Header * 设置或者获取当前的Header
* @access public * @access public
* @param string|array $name header名称 * @param string|array $name header名称
* @param string $default 默认值 * @param string $default 默认值
* @return string * @return string
*/ */
public function header($name = '', $default = null) public function header($name = '', $default = null)
@ -967,10 +996,10 @@ class Request
/** /**
* 获取变量 支持过滤和默认值 * 获取变量 支持过滤和默认值
* @param array $data 数据源 * @param array $data 数据源
* @param string|false $name 字段名 * @param string|false $name 字段名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @param string|array $filter 过滤函数 * @param string|array $filter 过滤函数
* @return mixed * @return mixed
*/ */
public function input($data = [], $name = '', $default = null, $filter = '') public function input($data = [], $name = '', $default = null, $filter = '')
@ -1051,9 +1080,9 @@ class Request
/** /**
* 递归过滤给定的值 * 递归过滤给定的值
* @param mixed $value 键值 * @param mixed $value 键值
* @param mixed $key 键名 * @param mixed $key 键名
* @param array $filters 过滤方法+默认值 * @param array $filters 过滤方法+默认值
* @return mixed * @return mixed
*/ */
private function filterValue(&$value, $key, $filters) private function filterValue(&$value, $key, $filters)
@ -1093,7 +1122,7 @@ class Request
public function filterExp(&$value) public function filterExp(&$value)
{ {
// 过滤查询特殊字符 // 过滤查询特殊字符
if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT LIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) { if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT LIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOT EXISTS|NOTEXISTS|EXISTS|NOT NULL|NOTNULL|NULL|BETWEEN TIME|NOT BETWEEN TIME|NOTBETWEEN TIME|NOTIN|NOT IN|IN)$/i', $value)) {
$value .= ' '; $value .= ' ';
} }
// TODO 其他安全过滤 // TODO 其他安全过滤
@ -1138,9 +1167,9 @@ class Request
/** /**
* 是否存在某个请求参数 * 是否存在某个请求参数
* @access public * @access public
* @param string $name 变量名 * @param string $name 变量名
* @param string $type 变量类型 * @param string $type 变量类型
* @param bool $checkEmpty 是否检测空值 * @param bool $checkEmpty 是否检测空值
* @return mixed * @return mixed
*/ */
public function has($name, $type = 'param', $checkEmpty = false) public function has($name, $type = 'param', $checkEmpty = false)
@ -1164,8 +1193,8 @@ class Request
/** /**
* 获取指定的参数 * 获取指定的参数
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param string $type 变量类型 * @param string $type 变量类型
* @return mixed * @return mixed
*/ */
public function only($name, $type = 'param') public function only($name, $type = 'param')
@ -1186,8 +1215,8 @@ class Request
/** /**
* 排除指定参数获取 * 排除指定参数获取
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param string $type 变量类型 * @param string $type 变量类型
* @return mixed * @return mixed
*/ */
public function except($name, $type = 'param') public function except($name, $type = 'param')
@ -1229,7 +1258,7 @@ class Request
/** /**
* 当前是否Ajax请求 * 当前是否Ajax请求
* @access public * @access public
* @param bool $ajax true 获取原始ajax请求 * @param bool $ajax true 获取原始ajax请求
* @return bool * @return bool
*/ */
public function isAjax($ajax = false) public function isAjax($ajax = false)
@ -1239,14 +1268,16 @@ class Request
if (true === $ajax) { if (true === $ajax) {
return $result; return $result;
} else { } else {
return $this->param(Config::get('var_ajax')) ? true : $result; $result = $this->param(Config::get('var_ajax')) ? true : $result;
$this->mergeParam = false;
return $result;
} }
} }
/** /**
* 当前是否Pjax请求 * 当前是否Pjax请求
* @access public * @access public
* @param bool $pjax true 获取原始pjax请求 * @param bool $pjax true 获取原始pjax请求
* @return bool * @return bool
*/ */
public function isPjax($pjax = false) public function isPjax($pjax = false)
@ -1255,14 +1286,16 @@ class Request
if (true === $pjax) { if (true === $pjax) {
return $result; return $result;
} else { } else {
return $this->param(Config::get('var_pjax')) ? true : $result; $result = $this->param(Config::get('var_pjax')) ? true : $result;
$this->mergeParam = false;
return $result;
} }
} }
/** /**
* 获取客户端IP地址 * 获取客户端IP地址
* @param integer $type 返回类型 0 返回IP地址 1 返回IPV4地址数字 * @param integer $type 返回类型 0 返回IP地址 1 返回IPV4地址数字
* @param boolean $adv 是否进行高级模式获取（有可能被伪装） * @param boolean $adv 是否进行高级模式获取（有可能被伪装）
* @return mixed * @return mixed
*/ */
public function ip($type = 0, $adv = true) public function ip($type = 0, $adv = true)
@ -1273,7 +1306,11 @@ class Request
return $ip[$type]; return $ip[$type];
} }
if ($adv) { $httpAgentIp = Config::get('http_agent_ip');
if ($httpAgentIp && isset($_SERVER[$httpAgentIp])) {
$ip = $_SERVER[$httpAgentIp];
} elseif ($adv) {
if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) { if (isset($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); $arr = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
$pos = array_search('unknown', $arr); $pos = array_search('unknown', $arr);
@ -1338,14 +1375,18 @@ class Request
/** /**
* 当前请求的host * 当前请求的host
* @access public * @access public
* @param bool $strict true 仅仅获取HOST
* @return string * @return string
*/ */
public function host() public function host($strict = false)
{ {
if (isset($_SERVER['HTTP_X_REAL_HOST'])) { 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;
} }
/** /**
@ -1415,7 +1456,7 @@ class Request
/** /**
* 设置或者获取当前请求的调度信息 * 设置或者获取当前请求的调度信息
* @access public * @access public
* @param array $dispatch 调度信息 * @param array $dispatch 调度信息
* @return array * @return array
*/ */
public function dispatch($dispatch = null) public function dispatch($dispatch = null)
@ -1466,11 +1507,12 @@ class Request
*/ */
public function action($action = null) public function action($action = null)
{ {
if (!is_null($action)) { if (!is_null($action) && !is_bool($action)) {
$this->action = $action; $this->action = $action;
return $this; return $this;
} else { } else {
return $this->action ?: ''; $name = $this->action ?: '';
return true === $action ? $name : strtolower($name);
} }
} }
@ -1534,7 +1576,7 @@ class Request
/** /**
* 设置当前地址的请求缓存 * 设置当前地址的请求缓存
* @access public * @access public
* @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id * @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
* @param mixed $expire 缓存有效期 * @param mixed $expire 缓存有效期
* @param array $except 缓存排除 * @param array $except 缓存排除
* @param string $tag 缓存标签 * @param string $tag 缓存标签
@ -1619,7 +1661,7 @@ class Request
* 设置当前请求绑定的对象实例 * 设置当前请求绑定的对象实例
* @access public * @access public
* @param string|array $name 绑定的对象标识 * @param string|array $name 绑定的对象标识
* @param mixed $obj 绑定的对象实例 * @param mixed $obj 绑定的对象实例
* @return mixed * @return mixed
*/ */
public function bind($name, $obj = null) public function bind($name, $obj = null)

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

@ -69,9 +69,7 @@ class Response
*/ */
public static function create($data = '', $type = '', $code = 200, array $header = [], $options = []) public static function create($data = '', $type = '', $code = 200, array $header = [], $options = [])
{ {
$type = empty($type) ? 'null' : strtolower($type); $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
$class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst($type);
if (class_exists($class)) { if (class_exists($class)) {
$response = new $class($data, $code, $header, $options); $response = new $class($data, $code, $header, $options);
} else { } else {

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

@ -68,8 +68,8 @@ class Route
/** /**
* 注册变量规则 * 注册变量规则
* @access public * @access public
* @param string|array $name 变量名 * @param string|array $name 变量名
* @param string $rule 变量规则 * @param string $rule 变量规则
* @return void * @return void
*/ */
public static function pattern($name = null, $rule = '') public static function pattern($name = null, $rule = '')
@ -84,10 +84,10 @@ class Route
/** /**
* 注册子域名部署规则 * 注册子域名部署规则
* @access public * @access public
* @param string|array $domain 子域名 * @param string|array $domain 子域名
* @param mixed $rule 路由规则 * @param mixed $rule 路由规则
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function domain($domain, $rule = '', $option = [], $pattern = []) public static function domain($domain, $rule = '', $option = [], $pattern = [])
@ -121,8 +121,8 @@ class Route
/** /**
* 设置路由绑定 * 设置路由绑定
* @access public * @access public
* @param mixed $bind 绑定信息 * @param mixed $bind 绑定信息
* @param string $type 绑定类型 默认为module 支持 namespace class controller * @param string $type 绑定类型 默认为module 支持 namespace class controller
* @return mixed * @return mixed
*/ */
public static function bind($bind, $type = 'module') public static function bind($bind, $type = 'module')
@ -133,8 +133,8 @@ class Route
/** /**
* 设置或者获取路由标识 * 设置或者获取路由标识
* @access public * @access public
* @param string|array $name 路由命名标识 数组表示批量设置 * @param string|array $name 路由命名标识 数组表示批量设置
* @param array $value 路由地址及变量信息 * @param array $value 路由地址及变量信息
* @return array * @return array
*/ */
public static function name($name = '', $value = null) public static function name($name = '', $value = null)
@ -154,7 +154,7 @@ class Route
/** /**
* 读取路由绑定 * 读取路由绑定
* @access public * @access public
* @param string $type 绑定类型 * @param string $type 绑定类型
* @return mixed * @return mixed
*/ */
public static function getBind($type) public static function getBind($type)
@ -165,8 +165,8 @@ class Route
/** /**
* 导入配置文件的路由规则 * 导入配置文件的路由规则
* @access public * @access public
* @param array $rule 路由规则 * @param array $rule 路由规则
* @param string $type 请求类型 * @param string $type 请求类型
* @return void * @return void
*/ */
public static function import(array $rule, $type = '*') public static function import(array $rule, $type = '*')
@ -222,11 +222,11 @@ class Route
/** /**
* 注册路由规则 * 注册路由规则
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $type 请求类型 * @param string $type 请求类型
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = []) public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
@ -270,12 +270,12 @@ class Route
/** /**
* 设置路由规则 * 设置路由规则
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $type 请求类型 * @param string $type 请求类型
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @param string $group 所属分组 * @param string $group 所属分组
* @return void * @return void
*/ */
protected static function setRule($rule, $route, $type = '*', $option = [], $pattern = [], $group = '') protected static function setRule($rule, $route, $type = '*', $option = [], $pattern = [], $group = '')
@ -348,7 +348,7 @@ class Route
/** /**
* 设置当前执行的参数信息 * 设置当前执行的参数信息
* @access public * @access public
* @param array $options 参数信息 * @param array $options 参数信息
* @return mixed * @return mixed
*/ */
protected static function setOption($options = []) protected static function setOption($options = [])
@ -369,7 +369,7 @@ class Route
/** /**
* 获取当前的分组信息 * 获取当前的分组信息
* @access public * @access public
* @param string $type 分组信息名称 name option pattern * @param string $type 分组信息名称 name option pattern
* @return mixed * @return mixed
*/ */
public static function getGroup($type) public static function getGroup($type)
@ -384,9 +384,9 @@ class Route
/** /**
* 设置当前的路由分组 * 设置当前的路由分组
* @access public * @access public
* @param string $name 分组名称 * @param string $name 分组名称
* @param array $option 分组路由参数 * @param array $option 分组路由参数
* @param array $pattern 分组变量规则 * @param array $pattern 分组变量规则
* @return void * @return void
*/ */
public static function setGroup($name, $option = [], $pattern = []) public static function setGroup($name, $option = [], $pattern = [])
@ -399,10 +399,10 @@ class Route
/** /**
* 注册路由分组 * 注册路由分组
* @access public * @access public
* @param string|array $name 分组名称或者参数 * @param string|array $name 分组名称或者参数
* @param array|\Closure $routes 路由地址 * @param array|\Closure $routes 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function group($name, $routes, $option = [], $pattern = []) public static function group($name, $routes, $option = [], $pattern = [])
@ -487,10 +487,10 @@ class Route
/** /**
* 注册路由 * 注册路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function any($rule, $route = '', $option = [], $pattern = []) public static function any($rule, $route = '', $option = [], $pattern = [])
@ -501,10 +501,10 @@ class Route
/** /**
* 注册GET路由 * 注册GET路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function get($rule, $route = '', $option = [], $pattern = []) public static function get($rule, $route = '', $option = [], $pattern = [])
@ -515,10 +515,10 @@ class Route
/** /**
* 注册POST路由 * 注册POST路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function post($rule, $route = '', $option = [], $pattern = []) public static function post($rule, $route = '', $option = [], $pattern = [])
@ -529,10 +529,10 @@ class Route
/** /**
* 注册PUT路由 * 注册PUT路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function put($rule, $route = '', $option = [], $pattern = []) public static function put($rule, $route = '', $option = [], $pattern = [])
@ -543,10 +543,10 @@ class Route
/** /**
* 注册DELETE路由 * 注册DELETE路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function delete($rule, $route = '', $option = [], $pattern = []) public static function delete($rule, $route = '', $option = [], $pattern = [])
@ -557,10 +557,10 @@ class Route
/** /**
* 注册PATCH路由 * 注册PATCH路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function patch($rule, $route = '', $option = [], $pattern = []) public static function patch($rule, $route = '', $option = [], $pattern = [])
@ -571,10 +571,10 @@ class Route
/** /**
* 注册资源路由 * 注册资源路由
* @access public * @access public
* @param string|array $rule 路由规则 * @param string|array $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function resource($rule, $route = '', $option = [], $pattern = []) public static function resource($rule, $route = '', $option = [], $pattern = [])
@ -618,10 +618,10 @@ class Route
/** /**
* 注册控制器路由 操作方法对应不同的请求后缀 * 注册控制器路由 操作方法对应不同的请求后缀
* @access public * @access public
* @param string $rule 路由规则 * @param string $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function controller($rule, $route = '', $option = [], $pattern = []) public static function controller($rule, $route = '', $option = [], $pattern = [])
@ -634,9 +634,9 @@ class Route
/** /**
* 注册别名路由 * 注册别名路由
* @access public * @access public
* @param string|array $rule 路由别名 * @param string|array $rule 路由别名
* @param string $route 路由地址 * @param string $route 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @return void * @return void
*/ */
public static function alias($rule = null, $route = '', $option = []) public static function alias($rule = null, $route = '', $option = [])
@ -651,8 +651,8 @@ class Route
/** /**
* 设置不同请求类型下面的方法前缀 * 设置不同请求类型下面的方法前缀
* @access public * @access public
* @param string $method 请求类型 * @param string $method 请求类型
* @param string $prefix 类型前缀 * @param string $prefix 类型前缀
* @return void * @return void
*/ */
public static function setMethodPrefix($method, $prefix = '') public static function setMethodPrefix($method, $prefix = '')
@ -667,8 +667,8 @@ class Route
/** /**
* rest方法定义和修改 * rest方法定义和修改
* @access public * @access public
* @param string|array $name 方法名称 * @param string|array $name 方法名称
* @param array|bool $resource 资源 * @param array|bool $resource 资源
* @return void * @return void
*/ */
public static function rest($name, $resource = []) public static function rest($name, $resource = [])
@ -683,9 +683,9 @@ class Route
/** /**
* 注册未匹配路由规则后的处理 * 注册未匹配路由规则后的处理
* @access public * @access public
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $method 请求类型 * @param string $method 请求类型
* @param array $option 路由参数 * @param array $option 路由参数
* @return void * @return void
*/ */
public static function miss($route, $method = '*', $option = []) public static function miss($route, $method = '*', $option = [])
@ -696,7 +696,7 @@ class Route
/** /**
* 注册一个自动解析的URL路由 * 注册一个自动解析的URL路由
* @access public * @access public
* @param string $route 路由地址 * @param string $route 路由地址
* @return void * @return void
*/ */
public static function auto($route) public static function auto($route)
@ -726,9 +726,9 @@ class Route
/** /**
* 检测子域名部署 * 检测子域名部署
* @access public * @access public
* @param Request $request Request请求对象 * @param Request $request Request请求对象
* @param array $currentRules 当前路由规则 * @param array $currentRules 当前路由规则
* @param string $method 请求类型 * @param string $method 请求类型
* @return void * @return void
*/ */
public static function checkDomain($request, &$currentRules, $method = 'get') public static function checkDomain($request, &$currentRules, $method = 'get')
@ -737,7 +737,7 @@ class Route
$rules = self::$rules['domain']; $rules = self::$rules['domain'];
// 开启子域名部署 支持二级和三级域名 // 开启子域名部署 支持二级和三级域名
if (!empty($rules)) { if (!empty($rules)) {
$host = $request->host(); $host = $request->host(true);
if (isset($rules[$host])) { if (isset($rules[$host])) {
// 完整域名或者IP配置 // 完整域名或者IP配置
$item = $rules[$host]; $item = $rules[$host];
@ -827,14 +827,23 @@ class Route
/** /**
* 检测URL路由 * 检测URL路由
* @access public * @access public
* @param Request $request Request请求对象 * @param Request $request Request请求对象
* @param string $url URL地址 * @param string $url URL地址
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @param bool $checkDomain 是否检测域名规则 * @param bool $checkDomain 是否检测域名规则
* @return false|array * @return false|array
*/ */
public static function check($request, $url, $depr = '/', $checkDomain = false) public static function check($request, $url, $depr = '/', $checkDomain = false)
{ {
//检查解析缓存
if (!App::$debug && Config::get('route_check_cache')) {
$key = self::getCheckCacheKey($request);
if (Cache::has($key)) {
list($rule, $route, $pathinfo, $option, $matches) = Cache::get($key);
return self::parseRule($rule, $route, $pathinfo, $option, $matches, true);
}
}
// 分隔符替换 确保路由定义使用统一的分隔符 // 分隔符替换 确保路由定义使用统一的分隔符
$url = str_replace($depr, '|', $url); $url = str_replace($depr, '|', $url);
@ -888,12 +897,12 @@ class Route
/** /**
* 检测路由规则 * 检测路由规则
* @access private * @access private
* @param Request $request * @param Request $request
* @param array $rules 路由规则 * @param array $rules 路由规则
* @param string $url URL地址 * @param string $url URL地址
* @param string $depr URL分割符 * @param string $depr URL分割符
* @param string $group 路由分组名 * @param string $group 路由分组名
* @param array $options 路由参数（分组） * @param array $options 路由参数（分组）
* @return mixed * @return mixed
*/ */
private static function checkRoute($request, $rules, $url, $depr = '/', $group = '', $options = []) private static function checkRoute($request, $rules, $url, $depr = '/', $group = '', $options = [])
@ -971,9 +980,9 @@ class Route
/** /**
* 检测路由别名 * 检测路由别名
* @access private * @access private
* @param Request $request * @param Request $request
* @param string $url URL地址 * @param string $url URL地址
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return mixed * @return mixed
*/ */
private static function checkRouteAlias($request, $url, $depr) private static function checkRouteAlias($request, $url, $depr)
@ -1018,9 +1027,9 @@ class Route
/** /**
* 检测URL绑定 * 检测URL绑定
* @access private * @access private
* @param string $url URL地址 * @param string $url URL地址
* @param array $rules 路由规则 * @param array $rules 路由规则
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return mixed * @return mixed
*/ */
private static function checkUrlBind(&$url, &$rules, $depr = '/') private static function checkUrlBind(&$url, &$rules, $depr = '/')
@ -1049,9 +1058,9 @@ class Route
/** /**
* 绑定到类 * 绑定到类
* @access public * @access public
* @param string $url URL地址 * @param string $url URL地址
* @param string $class 类名（带命名空间） * @param string $class 类名（带命名空间）
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return array * @return array
*/ */
public static function bindToClass($url, $class, $depr = '/') public static function bindToClass($url, $class, $depr = '/')
@ -1068,9 +1077,9 @@ class Route
/** /**
* 绑定到命名空间 * 绑定到命名空间
* @access public * @access public
* @param string $url URL地址 * @param string $url URL地址
* @param string $namespace 命名空间 * @param string $namespace 命名空间
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return array * @return array
*/ */
public static function bindToNamespace($url, $namespace, $depr = '/') public static function bindToNamespace($url, $namespace, $depr = '/')
@ -1088,9 +1097,9 @@ class Route
/** /**
* 绑定到控制器类 * 绑定到控制器类
* @access public * @access public
* @param string $url URL地址 * @param string $url URL地址
* @param string $controller 控制器名 （支持带模块名 index/user ） * @param string $controller 控制器名 （支持带模块名 index/user ）
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return array * @return array
*/ */
public static function bindToController($url, $controller, $depr = '/') public static function bindToController($url, $controller, $depr = '/')
@ -1107,9 +1116,9 @@ class Route
/** /**
* 绑定到模块/控制器 * 绑定到模块/控制器
* @access public * @access public
* @param string $url URL地址 * @param string $url URL地址
* @param string $controller 控制器类名（带命名空间） * @param string $controller 控制器类名（带命名空间）
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @return array * @return array
*/ */
public static function bindToModule($url, $controller, $depr = '/') public static function bindToModule($url, $controller, $depr = '/')
@ -1126,8 +1135,8 @@ class Route
/** /**
* 路由参数有效性检查 * 路由参数有效性检查
* @access private * @access private
* @param array $option 路由参数 * @param array $option 路由参数
* @param Request $request Request对象 * @param Request $request Request对象
* @return bool * @return bool
*/ */
private static function checkOption($option, $request) private static function checkOption($option, $request)
@ -1153,12 +1162,12 @@ class Route
/** /**
* 检测路由规则 * 检测路由规则
* @access private * @access private
* @param string $rule 路由规则 * @param string $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $url URL地址 * @param string $url URL地址
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @param array $option 路由参数 * @param array $option 路由参数
* @param string $depr URL分隔符（全局） * @param string $depr URL分隔符（全局）
* @return array|false * @return array|false
*/ */
private static function checkRule($rule, $route, $url, $pattern, $option, $depr) private static function checkRule($rule, $route, $url, $pattern, $option, $depr)
@ -1200,9 +1209,9 @@ class Route
/** /**
* 解析模块的URL地址 [模块/控制器/操作?]参数1=值1&参数2=值2... * 解析模块的URL地址 [模块/控制器/操作?]参数1=值1&参数2=值2...
* @access public * @access public
* @param string $url URL地址 * @param string $url URL地址
* @param string $depr URL分隔符 * @param string $depr URL分隔符
* @param bool $autoSearch 是否自动深度搜索控制器 * @param bool $autoSearch 是否自动深度搜索控制器
* @return array * @return array
*/ */
public static function parseUrl($url, $depr = '/', $autoSearch = false) public static function parseUrl($url, $depr = '/', $autoSearch = false)
@ -1269,7 +1278,7 @@ class Route
/** /**
* 解析URL的pathinfo参数和变量 * 解析URL的pathinfo参数和变量
* @access private * @access private
* @param string $url URL地址 * @param string $url URL地址
* @return array * @return array
*/ */
private static function parseUrlPath($url) private static function parseUrlPath($url)
@ -1295,9 +1304,9 @@ class Route
/** /**
* 检测URL和规则路由是否匹配 * 检测URL和规则路由是否匹配
* @access private * @access private
* @param string $url URL地址 * @param string $url URL地址
* @param string $rule 路由规则 * @param string $rule 路由规则
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return array|false * @return array|false
*/ */
private static function match($url, $rule, $pattern) private static function match($url, $rule, $pattern)
@ -1370,16 +1379,28 @@ class Route
/** /**
* 解析规则路由 * 解析规则路由
* @access private * @access private
* @param string $rule 路由规则 * @param string $rule 路由规则
* @param string $route 路由地址 * @param string $route 路由地址
* @param string $pathinfo URL地址 * @param string $pathinfo URL地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param array $matches 匹配的变量 * @param array $matches 匹配的变量
* @param bool $fromCache 通过缓存解析
* @return array * @return array
*/ */
private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = []) private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = [], $fromCache = false)
{ {
$request = Request::instance(); $request = Request::instance();
//保存解析缓存
if (Config::get('route_check_cache') && !$fromCache) {
try {
$key = self::getCheckCacheKey($request);
Cache::tag('route_check')->set($key, [$rule, $route, $pathinfo, $option, $matches]);
} catch (\Exception $e) {
}
}
// 解析路由规则 // 解析路由规则
if ($rule) { if ($rule) {
$rule = explode('/', $rule); $rule = explode('/', $rule);
@ -1506,7 +1527,7 @@ class Route
App::$modulePath = APP_PATH . (Config::get('app_multi_module') ? $request->module() . DS : ''); App::$modulePath = APP_PATH . (Config::get('app_multi_module') ? $request->module() . DS : '');
} else { } else {
// 路由到模块/控制器/操作 // 路由到模块/控制器/操作
$result = self::parseModule($route); $result = self::parseModule($route, isset($option['convert']) ? $option['convert'] : false);
} }
// 开启请求缓存 // 开启请求缓存
if ($request->isGet() && isset($option['cache'])) { if ($request->isGet() && isset($option['cache'])) {
@ -1526,10 +1547,11 @@ class Route
/** /**
* 解析URL地址为 模块/控制器/操作 * 解析URL地址为 模块/控制器/操作
* @access private * @access private
* @param string $url URL地址 * @param string $url URL地址
* @param bool $convert 是否自动转换URL地址
* @return array * @return array
*/ */
private static function parseModule($url) private static function parseModule($url, $convert = false)
{ {
list($path, $var) = self::parseUrlPath($url); list($path, $var) = self::parseUrlPath($url);
$action = array_pop($path); $action = array_pop($path);
@ -1543,14 +1565,14 @@ class Route
// 设置当前请求的路由变量 // 设置当前请求的路由变量
Request::instance()->route($var); Request::instance()->route($var);
// 路由到模块/控制器/操作 // 路由到模块/控制器/操作
return ['type' => 'module', 'module' => [$module, $controller, $action], 'convert' => false]; return ['type' => 'module', 'module' => [$module, $controller, $action], 'convert' => $convert];
} }
/** /**
* 解析URL地址中的参数Request对象 * 解析URL地址中的参数Request对象
* @access private * @access private
* @param string $url 路由规则 * @param string $url 路由规则
* @param array $var 变量 * @param array $var 变量
* @return void * @return void
*/ */
private static function parseUrlParams($url, &$var = []) private static function parseUrlParams($url, &$var = [])
@ -1600,4 +1622,24 @@ class Route
} }
return $var; return $var;
} }
/**
* 获取路由解析缓存的key
* @param Request $request
* @return string
*/
private static function getCheckCacheKey(Request $request)
{
static $key;
if (empty($key)) {
if ($callback = Config::get('route_check_cache_key')) {
$key = call_user_func($callback, $request);
} else {
$key = "{$request->host(true)}|{$request->method()}|{$request->path()}";
}
}
return $key;
}
} }

28
thinkphp/library/think/Template.php
View File

@ -64,14 +64,16 @@ class Template
*/ */
public function __construct(array $config = []) public function __construct(array $config = [])
{ {
$this->config['cache_path'] = TEMP_PATH; $this->config['cache_path'] = TEMP_PATH;
$this->config = array_merge($this->config, $config); $this->config = array_merge($this->config, $config);
$this->config['taglib_begin_origin'] = $this->config['taglib_begin']; $this->config['taglib_begin_origin'] = $this->config['taglib_begin'];
$this->config['taglib_end_origin'] = $this->config['taglib_end']; $this->config['taglib_end_origin'] = $this->config['taglib_end'];
$this->config['taglib_begin'] = $this->stripPreg($this->config['taglib_begin']);
$this->config['taglib_end'] = $this->stripPreg($this->config['taglib_end']); $this->config['taglib_begin'] = preg_quote($this->config['taglib_begin'], '/');
$this->config['tpl_begin'] = $this->stripPreg($this->config['tpl_begin']); $this->config['taglib_end'] = preg_quote($this->config['taglib_end'], '/');
$this->config['tpl_end'] = $this->stripPreg($this->config['tpl_end']); $this->config['tpl_begin'] = preg_quote($this->config['tpl_begin'], '/');
$this->config['tpl_end'] = preg_quote($this->config['tpl_end'], '/');
// 初始化模板编译存储器 // 初始化模板编译存储器
$type = $this->config['compile_type'] ? $this->config['compile_type'] : 'File'; $type = $this->config['compile_type'] ? $this->config['compile_type'] : 'File';
@ -79,20 +81,6 @@ class Template
$this->storage = new $class(); $this->storage = new $class();
} }
/**
* 字符串替换 避免正则混淆
* @access private
* @param string $str
* @return string
*/
private function stripPreg($str)
{
return str_replace(
['{', '}', '(', ')', '|', '[', ']', '-', '+', '*', '.', '^', '?'],
['\{', '\}', '\(', '\)', '\|', '\[', '\]', '\-', '\+', '\*', '\.', '\^', '\?'],
$str);
}
/** /**
* 模板变量赋值 * 模板变量赋值
* @access public * @access public

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

@ -302,7 +302,7 @@ class Url
foreach ($rule as $item) { foreach ($rule as $item) {
list($url, $pattern, $domain, $suffix) = $item; list($url, $pattern, $domain, $suffix) = $item;
if (empty($pattern)) { if (empty($pattern)) {
return [$url, $domain, $suffix]; return [rtrim($url, '$'), $domain, $suffix];
} }
$type = Config::get('url_common_param'); $type = Config::get('url_common_param');
foreach ($pattern as $key => $val) { foreach ($pattern as $key => $val) {

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

@ -42,7 +42,6 @@ class Validate
'float' => ':attribute must be float', 'float' => ':attribute must be float',
'boolean' => ':attribute must be bool', 'boolean' => ':attribute must be bool',
'email' => ':attribute not a valid email address', 'email' => ':attribute not a valid email address',
'mobile' => ':attribute not a valid mobile',
'array' => ':attribute must be a array', 'array' => ':attribute must be a array',
'accepted' => ':attribute must be yes,on or 1', 'accepted' => ':attribute must be yes,on or 1',
'date' => ':attribute not a valid datetime', 'date' => ':attribute not a valid datetime',
@ -68,6 +67,8 @@ class Validate
'min' => 'min size of :attribute must be :rule', 'min' => 'min size of :attribute must be :rule',
'after' => ':attribute cannot be less than :rule', 'after' => ':attribute cannot be less than :rule',
'before' => ':attribute cannot exceed :rule', 'before' => ':attribute cannot exceed :rule',
'afterWith' => ':attribute cannot be less than :rule',
'beforeWith' => ':attribute cannot exceed :rule',
'expire' => ':attribute not within :rule', 'expire' => ':attribute not within :rule',
'allowIp' => 'access IP is not allowed', 'allowIp' => 'access IP is not allowed',
'denyIp' => 'access IP denied', 'denyIp' => 'access IP denied',
@ -879,12 +880,16 @@ class Validate
// 支持多个字段验证 // 支持多个字段验证
$fields = explode('^', $key); $fields = explode('^', $key);
foreach ($fields as $key) { foreach ($fields as $key) {
$map[$key] = $data[$key]; if (isset($data[$key])) {
$map[$key] = $data[$key];
}
} }
} elseif (strpos($key, '=')) { } elseif (strpos($key, '=')) {
parse_str($key, $map); parse_str($key, $map);
} else { } elseif (isset($data[$field])) {
$map[$key] = $data[$field]; $map[$key] = $data[$field];
} else {
$map = [];
} }
$pk = isset($rule[3]) ? $rule[3] : $db->getPk(); $pk = isset($rule[3]) ? $rule[3] : $db->getPk();
@ -1114,9 +1119,10 @@ class Validate
* @access protected * @access protected
* @param mixed $value 字段值 * @param mixed $value 字段值
* @param mixed $rule 验证规则 * @param mixed $rule 验证规则
* @param array $data 数据
* @return bool * @return bool
*/ */
protected function after($value, $rule) protected function after($value, $rule, $data)
{ {
return strtotime($value) >= strtotime($rule); return strtotime($value) >= strtotime($rule);
} }
@ -1126,13 +1132,42 @@ class Validate
* @access protected * @access protected
* @param mixed $value 字段值 * @param mixed $value 字段值
* @param mixed $rule 验证规则 * @param mixed $rule 验证规则
* @param array $data 数据
* @return bool * @return bool
*/ */
protected function before($value, $rule) protected function before($value, $rule, $data)
{ {
return strtotime($value) <= strtotime($rule); return strtotime($value) <= strtotime($rule);
} }
/**
* 验证日期字段
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function afterWith($value, $rule, $data)
{
$rule = $this->getDataValue($data, $rule);
return !is_null($rule) && strtotime($value) >= strtotime($rule);
}
/**
* 验证日期字段
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function beforeWith($value, $rule, $data)
{
$rule = $this->getDataValue($data, $rule);
return !is_null($rule) && strtotime($value) <= strtotime($rule);
}
/** /**
* 验证有效期 * 验证有效期
* @access protected * @access protected
@ -1196,7 +1231,7 @@ class Validate
// 不是正则表达式则两端补上/ // 不是正则表达式则两端补上/
$rule = '/^' . $rule . '$/'; $rule = '/^' . $rule . '$/';
} }
return 1 === preg_match($rule, (string) $value); return is_scalar($value) && 1 === preg_match($rule, (string) $value);
} }
/** /**

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

@ -215,7 +215,10 @@ class File extends Driver
public function rm($name) public function rm($name)
{ {
$filename = $this->getCacheKey($name); $filename = $this->getCacheKey($name);
return $this->unlink($filename); try {
return $this->unlink($filename);
} catch (\Exception $e) {
}
} }
/** /**

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

@ -63,7 +63,7 @@ class Memcache extends Driver
public function has($name) public function has($name)
{ {
$key = $this->getCacheKey($name); $key = $this->getCacheKey($name);
return $this->handler->get($key) ? true : false; return false !== $this->handler->get($key);
} }
/** /**

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

@ -70,7 +70,7 @@ class Redis extends Driver
*/ */
public function has($name) public function has($name)
{ {
return $this->handler->get($this->getCacheKey($name)) ? true : false; return $this->handler->exists($this->getCacheKey($name));
} }
/** /**

13
thinkphp/library/think/console/command/Clear.php
View File

@ -10,8 +10,10 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace think\console\command; namespace think\console\command;
use think\Cache;
use think\console\Command; use think\console\Command;
use think\console\Input; use think\console\Input;
use think\console\input\Argument;
use think\console\input\Option; use think\console\input\Option;
use think\console\Output; use think\console\Output;
@ -22,6 +24,7 @@ class Clear extends Command
// 指令配置 // 指令配置
$this $this
->setName('clear') ->setName('clear')
->addArgument('type', Argument::OPTIONAL, 'type to clear', null)
->addOption('path', 'd', Option::VALUE_OPTIONAL, 'path to clear', null) ->addOption('path', 'd', Option::VALUE_OPTIONAL, 'path to clear', null)
->setDescription('Clear runtime file'); ->setDescription('Clear runtime file');
} }
@ -30,8 +33,14 @@ class Clear extends Command
{ {
$path = $input->getOption('path') ?: RUNTIME_PATH; $path = $input->getOption('path') ?: RUNTIME_PATH;
if (is_dir($path)) { $type = $input->getArgument('type');
$this->clearPath($path);
if ($type == 'route') {
Cache::clear('route_check');
} else {
if (is_dir($path)) {
$this->clearPath($path);
}
} }
$output->writeln("<info>Clear Successed</info>"); $output->writeln("<info>Clear Successed</info>");

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

@ -11,7 +11,6 @@
namespace think\db; namespace think\db;
use BadMethodCallException;
use PDO; use PDO;
use think\Exception; use think\Exception;
@ -99,8 +98,15 @@ abstract class Builder
$result = []; $result = [];
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
$item = $this->parseKey($key, $options); if ('*' != $options['field'] && !in_array($key, $fields, true)) {
if (is_object($val) && method_exists($val, '__toString')) { continue;
}
$item = $this->parseKey($key, $options, true);
if ($val instanceof Expression) {
$result[$item] = $val->getValue();
continue;
} elseif (is_object($val) && method_exists($val, '__toString')) {
// 对象数据写入 // 对象数据写入
$val = $val->__toString(); $val = $val->__toString();
} }
@ -111,16 +117,15 @@ abstract class Builder
} elseif (is_null($val)) { } elseif (is_null($val)) {
$result[$item] = 'NULL'; $result[$item] = 'NULL';
} elseif (is_array($val) && !empty($val)) { } elseif (is_array($val) && !empty($val)) {
switch ($val[0]) { switch (strtolower($val[0])) {
case 'exp':
$result[$item] = $val[1];
break;
case 'inc': case 'inc':
$result[$item] = $this->parseKey($val[1]) . '+' . floatval($val[2]); $result[$item] = $item . '+' . floatval($val[1]);
break; break;
case 'dec': case 'dec':
$result[$item] = $this->parseKey($val[1]) . '-' . floatval($val[2]); $result[$item] = $item . '-' . floatval($val[1]);
break; break;
case 'exp':
throw new Exception('not support data:[' . $val[0] . ']');
} }
} elseif (is_scalar($val)) { } elseif (is_scalar($val)) {
// 过滤非标量数据 // 过滤非标量数据
@ -143,7 +148,7 @@ abstract class Builder
* @param array $options * @param array $options
* @return string * @return string
*/ */
protected function parseKey($key, $options = []) protected function parseKey($key, $options = [], $strict = false)
{ {
return $key; return $key;
} }
@ -184,8 +189,10 @@ abstract class Builder
// 支持 'field1'=>'field2' 这样的字段别名定义 // 支持 'field1'=>'field2' 这样的字段别名定义
$array = []; $array = [];
foreach ($fields as $key => $field) { foreach ($fields as $key => $field) {
if (!is_numeric($key)) { if ($field instanceof Expression) {
$array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options); $array[] = $field->getValue();
} elseif (!is_numeric($key)) {
$array[] = $this->parseKey($key, $options) . ' AS ' . $this->parseKey($field, $options, true);
} else { } else {
$array[] = $this->parseKey($field, $options); $array[] = $this->parseKey($field, $options);
} }
@ -264,7 +271,9 @@ abstract class Builder
foreach ($where as $key => $val) { foreach ($where as $key => $val) {
$str = []; $str = [];
foreach ($val as $field => $value) { foreach ($val as $field => $value) {
if ($value instanceof \Closure) { if ($value instanceof Expression) {
$str[] = ' ' . $key . ' ( ' . $value->getValue() . ' )';
} elseif ($value instanceof \Closure) {
// 使用闭包查询 // 使用闭包查询
$query = new Query($this->connection); $query = new Query($this->connection);
call_user_func_array($value, [ & $query]); call_user_func_array($value, [ & $query]);
@ -305,7 +314,7 @@ abstract class Builder
protected function parseWhereItem($field, $val, $rule = '', $options = [], $binds = [], $bindName = null) protected function parseWhereItem($field, $val, $rule = '', $options = [], $binds = [], $bindName = null)
{ {
// 字段分析 // 字段分析
$key = $field ? $this->parseKey($field, $options) : ''; $key = $field ? $this->parseKey($field, $options, true) : '';
// 查询规则和条件 // 查询规则和条件
if (!is_array($val)) { if (!is_array($val)) {
@ -338,13 +347,15 @@ abstract class Builder
throw new Exception('where express error:' . $exp); throw new Exception('where express error:' . $exp);
} }
} }
$bindName = $bindName ?: 'where_' . str_replace(['.', '-'], '_', $field); $bindName = $bindName ?: 'where_' . $rule . '_' . str_replace(['.', '-'], '_', $field);
if (preg_match('/\W/', $bindName)) { if (preg_match('/\W/', $bindName)) {
// 处理带非单词字符的字段名 // 处理带非单词字符的字段名
$bindName = md5($bindName); $bindName = md5($bindName);
} }
if (is_object($value) && method_exists($value, '__toString')) { if ($value instanceof Expression) {
} elseif (is_object($value) && method_exists($value, '__toString')) {
// 对象数据写入 // 对象数据写入
$value = $value->__toString(); $value = $value->__toString();
} }
@ -381,7 +392,11 @@ abstract class Builder
} }
} elseif ('EXP' == $exp) { } elseif ('EXP' == $exp) {
// 表达式查询 // 表达式查询
$whereStr .= '( ' . $key . ' ' . $value . ' )'; if ($value instanceof Expression) {
$whereStr .= '( ' . $key . ' ' . $value->getValue() . ' )';
} else {
throw new Exception('where express error:' . $exp);
}
} elseif (in_array($exp, ['NOT NULL', 'NULL'])) { } elseif (in_array($exp, ['NOT NULL', 'NULL'])) {
// NULL 查询 // NULL 查询
$whereStr .= $key . ' IS ' . $exp; $whereStr .= $key . ' IS ' . $exp;
@ -499,6 +514,11 @@ abstract class Builder
} }
} }
$bindName = $bindName ?: $key; $bindName = $bindName ?: $key;
if ($this->query->isBind($bindName)) {
$bindName .= '_' . str_replace('.', '_', uniqid('', true));
}
$this->query->bind($bindName, $value, $bindType); $this->query->bind($bindName, $value, $bindType);
return ':' . $bindName; return ':' . $bindName;
} }
@ -529,7 +549,9 @@ abstract class Builder
list($table, $type, $on) = $item; list($table, $type, $on) = $item;
$condition = []; $condition = [];
foreach ((array) $on as $val) { foreach ((array) $on as $val) {
if (strpos($val, '=')) { if ($val instanceof Expression) {
$condition[] = $val->getValue();
} elseif (strpos($val, '=')) {
list($val1, $val2) = explode('=', $val, 2); list($val1, $val2) = explode('=', $val, 2);
$condition[] = $this->parseKey($val1, $options) . '=' . $this->parseKey($val2, $options); $condition[] = $this->parseKey($val1, $options) . '=' . $this->parseKey($val2, $options);
} else { } else {
@ -553,28 +575,29 @@ abstract class Builder
*/ */
protected function parseOrder($order, $options = []) protected function parseOrder($order, $options = [])
{ {
if (is_array($order)) { if (empty($order)) {
$array = []; return '';
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if ('[rand]' == $val) {
if (method_exists($this, 'parseRand')) {
$array[] = $this->parseRand();
} else {
throw new BadMethodCallException('method not exists:' . get_class($this) . '-> parseRand');
}
} elseif (false === strpos($val, '(')) {
$array[] = $this->parseKey($val, $options);
} else {
$array[] = $val;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($key, $options) . ' ' . $sort;
}
}
$order = implode(',', $array);
} }
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand();
} else {
if (is_numeric($key)) {
list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
} else {
$sort = $val;
}
$sort = strtoupper($sort);
$sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($key, $options, true) . $sort;
}
}
$order = implode(',', $array);
return !empty($order) ? ' ORDER BY ' . $order : ''; return !empty($order) ? ' ORDER BY ' . $order : '';
} }
@ -608,6 +631,9 @@ abstract class Builder
*/ */
protected function parseComment($comment) protected function parseComment($comment)
{ {
if (false !== strpos($comment, '*/')) {
$comment = strstr($comment, '*/', true);
}
return !empty($comment) ? ' /* ' . $comment . ' */' : ''; return !empty($comment) ? ' /* ' . $comment . ' */' : '';
} }
@ -657,11 +683,7 @@ abstract class Builder
return ''; return '';
} }
if (is_array($index)) { return sprintf(" FORCE INDEX ( %s ) ", is_array($index) ? implode(',', $index) : $index);
$index = join(",", $index);
}
return sprintf(" FORCE INDEX ( %s ) ", $index);
} }
/** /**
@ -779,10 +801,14 @@ abstract class Builder
$values[] = 'SELECT ' . implode(',', $value); $values[] = 'SELECT ' . implode(',', $value);
if (!isset($insertFields)) { if (!isset($insertFields)) {
$insertFields = array_map([$this, 'parseKey'], array_keys($data)); $insertFields = array_keys($data);
} }
} }
foreach ($insertFields as $field) {
$fields[] = $this->parseKey($field, $options, true);
}
return str_replace( return str_replace(
['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'], ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
[ [

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

@ -90,6 +90,8 @@ abstract class Connection
'master_num' => 1, 'master_num' => 1,
// 指定从服务器序号 // 指定从服务器序号
'slave_no' => '', 'slave_no' => '',
// 模型写入后自动读取主服务器
'read_master' => false,
// 是否严格检查字段是否存在 // 是否严格检查字段是否存在
'fields_strict' => true, 'fields_strict' => true,
// 数据返回类型 // 数据返回类型
@ -359,14 +361,9 @@ abstract class Connection
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
// 释放前次的查询结果
if (!empty($this->PDOStatement)) {
$this->free();
}
// 预处理 // 预处理
if (empty($this->PDOStatement)) { $this->PDOStatement = $this->linkID->prepare($sql);
$this->PDOStatement = $this->linkID->prepare($sql);
}
// 是否为存储过程调用 // 是否为存储过程调用
$procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
// 参数绑定 // 参数绑定
@ -378,7 +375,7 @@ abstract class Connection
// 执行查询 // 执行查询
$this->PDOStatement->execute(); $this->PDOStatement->execute();
// 调试结束 // 调试结束
$this->debug(false); $this->debug(false, '', $master);
// 返回结果集 // 返回结果集
return $this->getResult($pdo, $procedure); return $this->getResult($pdo, $procedure);
} catch (\PDOException $e) { } catch (\PDOException $e) {
@ -402,13 +399,14 @@ abstract class Connection
/** /**
* 执行语句 * 执行语句
* @access public * @access public
* @param string $sql sql指令 * @param string $sql sql指令
* @param array $bind 参数绑定 * @param array $bind 参数绑定
* @param Query $query 查询对象
* @return int * @return int
* @throws PDOException * @throws PDOException
* @throws \Exception * @throws \Exception
*/ */
public function execute($sql, $bind = []) public function execute($sql, $bind = [], Query $query = null)
{ {
$this->initConnect(true); $this->initConnect(true);
if (!$this->linkID) { if (!$this->linkID) {
@ -426,14 +424,9 @@ abstract class Connection
// 调试开始 // 调试开始
$this->debug(true); $this->debug(true);
//释放前次的查询结果
if (!empty($this->PDOStatement) && $this->PDOStatement->queryString != $sql) {
$this->free();
}
// 预处理 // 预处理
if (empty($this->PDOStatement)) { $this->PDOStatement = $this->linkID->prepare($sql);
$this->PDOStatement = $this->linkID->prepare($sql);
}
// 是否为存储过程调用 // 是否为存储过程调用
$procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']); $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
// 参数绑定 // 参数绑定
@ -445,23 +438,27 @@ abstract class Connection
// 执行语句 // 执行语句
$this->PDOStatement->execute(); $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(); $this->numRows = $this->PDOStatement->rowCount();
return $this->numRows; return $this->numRows;
} catch (\PDOException $e) { } catch (\PDOException $e) {
if ($this->isBreak($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()); throw new PDOException($e, $this->config, $this->getLastsql());
} catch (\Throwable $e) { } catch (\Throwable $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind); return $this->close()->execute($sql, $bind, $query);
} }
throw $e; throw $e;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind); return $this->close()->execute($sql, $bind, $query);
} }
throw $e; throw $e;
} }
@ -652,18 +649,15 @@ abstract class Connection
); );
} }
} catch (\PDOException $e) {
if ($this->isBreak($e)) {
return $this->close()->startTrans();
}
throw $e;
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
--$this->transTimes;
return $this->close()->startTrans(); return $this->close()->startTrans();
} }
throw $e; throw $e;
} catch (\Error $e) { } catch (\Error $e) {
if ($this->isBreak($e)) { if ($this->isBreak($e)) {
--$this->transTimes;
return $this->close()->startTrans(); return $this->close()->startTrans();
} }
throw $e; throw $e;
@ -744,7 +738,7 @@ abstract class Connection
* @param array $sqlArray SQL批处理指令 * @param array $sqlArray SQL批处理指令
* @return boolean * @return boolean
*/ */
public function batchQuery($sqlArray = [], $bind = []) public function batchQuery($sqlArray = [], $bind = [], Query $query = null)
{ {
if (!is_array($sqlArray)) { if (!is_array($sqlArray)) {
return false; return false;
@ -753,7 +747,7 @@ abstract class Connection
$this->startTrans(); $this->startTrans();
try { try {
foreach ($sqlArray as $sql) { foreach ($sqlArray as $sql) {
$this->execute($sql, $bind); $this->execute($sql, $bind, $query);
} }
// 提交事务 // 提交事务
$this->commit(); $this->commit();
@ -797,6 +791,8 @@ abstract class Connection
$this->linkWrite = null; $this->linkWrite = null;
$this->linkRead = null; $this->linkRead = null;
$this->links = []; $this->links = [];
// 释放查询
$this->free();
return $this; return $this;
} }
@ -823,6 +819,7 @@ abstract class Connection
'SSL connection has been closed unexpectedly', 'SSL connection has been closed unexpectedly',
'Error writing data to the connection', 'Error writing data to the connection',
'Resource deadlock avoided', 'Resource deadlock avoided',
'failed with errno',
]; ];
$error = $e->getMessage(); $error = $e->getMessage();
@ -903,9 +900,10 @@ abstract class Connection
* @access protected * @access protected
* @param boolean $start 调试开始标记 true 开始 false 结束 * @param boolean $start 调试开始标记 true 开始 false 结束
* @param string $sql 执行的SQL语句 留空自动获取 * @param string $sql 执行的SQL语句 留空自动获取
* @param boolean $master 主从标记
* @return void * @return void
*/ */
protected function debug($start, $sql = '') protected function debug($start, $sql = '', $master = false)
{ {
if (!empty($this->config['debug'])) { if (!empty($this->config['debug'])) {
// 开启数据库调试模式 // 开启数据库调试模式
@ -922,7 +920,7 @@ abstract class Connection
$result = $this->getExplain($sql); $result = $this->getExplain($sql);
} }
// SQL监听 // SQL监听
$this->trigger($sql, $runtime, $result); $this->trigger($sql, $runtime, $result, $master);
} }
} }
} }
@ -944,19 +942,27 @@ abstract class Connection
* @param string $sql SQL语句 * @param string $sql SQL语句
* @param float $runtime SQL运行时间 * @param float $runtime SQL运行时间
* @param mixed $explain SQL分析 * @param mixed $explain SQL分析
* @return bool * @param bool $master 主从标记
* @return void
*/ */
protected function trigger($sql, $runtime, $explain = []) protected function trigger($sql, $runtime, $explain = [], $master = false)
{ {
if (!empty(self::$event)) { if (!empty(self::$event)) {
foreach (self::$event as $callback) { foreach (self::$event as $callback) {
if (is_callable($callback)) { if (is_callable($callback)) {
call_user_func_array($callback, [$sql, $runtime, $explain]); call_user_func_array($callback, [$sql, $runtime, $explain, $master]);
} }
} }
} else { } else {
// 未注册监听则记录到日志中 // 未注册监听则记录到日志中
Log::record('[ SQL ] ' . $sql . ' [ RunTime:' . $runtime . 's ]', 'sql'); if ($this->config['deploy']) {
// 分布式记录当前操作的主从
$master = $master ? 'master|' : 'slave|';
} else {
$master = '';
}
Log::record('[ SQL ] ' . $sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]', 'sql');
if (!empty($explain)) { if (!empty($explain)) {
Log::record('[ EXPLAIN : ' . var_export($explain, true) . ' ]', 'sql'); Log::record('[ EXPLAIN : ' . var_export($explain, true) . ' ]', 'sql');
} }

48
thinkphp/library/think/db/Expression.php Normal file
View File

@ -0,0 +1,48 @@
<?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: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
namespace think\db;
class Expression
{
/**
* 查询表达式
*
* @var string
*/
protected $value;
/**
* 创建一个查询表达式
*
* @param string $value
* @return void
*/
public function __construct($value)
{
$this->value = $value;
}
/**
* 获取表达式
*
* @return string
*/
public function getValue()
{
return $this->value;
}
public function __toString()
{
return (string) $this->value;
}
}

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

@ -53,6 +53,8 @@ class Query
protected static $info = []; protected static $info = [];
// 回调事件 // 回调事件
private static $event = []; private static $event = [];
// 读取主库
protected static $readMaster = [];
/** /**
* 构造函数 * 构造函数
@ -90,6 +92,13 @@ class Query
$name = Loader::parseName(substr($method, 10)); $name = Loader::parseName(substr($method, 10));
$where[$name] = $args[0]; $where[$name] = $args[0];
return $this->where($where)->value($args[1]); return $this->where($where)->value($args[1]);
} elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
// 动态调用命名范围
$method = 'scope' . $method;
array_unshift($args, $this);
call_user_func_array([$this->model, $method], $args);
return $this;
} else { } else {
throw new Exception('method not exist:' . __CLASS__ . '->' . $method); throw new Exception('method not exist:' . __CLASS__ . '->' . $method);
} }
@ -131,7 +140,7 @@ class Query
} }
/** /**
* 获取当前的模型对象名 * 获取当前的模型对象实例
* @access public * @access public
* @return Model|null * @return Model|null
*/ */
@ -140,6 +149,25 @@ class Query
return $this->model; return $this->model;
} }
/**
* 设置后续从主库读取数据
* @access public
* @param bool $allTable
* @return void
*/
public function readMaster($allTable = false)
{
if ($allTable) {
$table = '*';
} else {
$table = isset($this->options['table']) ? $this->options['table'] : $this->getTable();
}
static::$readMaster[$table] = true;
return $this;
}
/** /**
* 获取当前的builder实例对象 * 获取当前的builder实例对象
* @access public * @access public
@ -238,7 +266,7 @@ class Query
*/ */
public function execute($sql, $bind = []) public function execute($sql, $bind = [])
{ {
return $this->connection->execute($sql, $bind); return $this->connection->execute($sql, $bind, $this);
} }
/** /**
@ -403,7 +431,7 @@ class Query
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
$this->options['table'] = $this->getTable(); $this->options['table'] = $this->getTable();
} }
$key = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind)); $key = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . $field . serialize($this->options) . serialize($this->bind));
$result = Cache::get($key); $result = Cache::get($key);
} }
if (false === $result) { if (false === $result) {
@ -415,12 +443,13 @@ class Query
// 返回SQL语句 // 返回SQL语句
return $pdo; return $pdo;
} }
$result = $pdo->fetchColumn(); $result = $pdo->fetchColumn();
if ($force) { if ($force) {
$result += 0; $result = (float) $result;
} }
if (isset($cache)) { if (isset($cache) && false !== $result) {
// 缓存数据 // 缓存数据
$this->cacheData($key, $result, $cache); $this->cacheData($key, $result, $cache);
} }
@ -447,7 +476,7 @@ class Query
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
$this->options['table'] = $this->getTable(); $this->options['table'] = $this->getTable();
} }
$guid = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind)); $guid = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . $field . serialize($this->options) . serialize($this->bind));
$result = Cache::get($guid); $result = Cache::get($guid);
} }
if (false === $result) { if (false === $result) {
@ -510,13 +539,43 @@ class Query
public function count($field = '*') public function count($field = '*')
{ {
if (isset($this->options['group'])) { if (isset($this->options['group'])) {
if (!preg_match('/^[\w\.\*]+$/', $field)) {
throw new Exception('not support data:' . $field);
}
// 支持GROUP // 支持GROUP
$options = $this->getOptions(); $options = $this->getOptions();
$subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql(); $subSql = $this->options($options)->field('count(' . $field . ')')->bind($this->bind)->buildSql();
return $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true);
$count = $this->table([$subSql => '_group_count_'])->value('COUNT(*) AS tp_count', 0, true);
} else {
$count = $this->aggregate('COUNT', $field, true);
} }
return $this->value('COUNT(' . $field . ') AS tp_count', 0, true); return is_string($count) ? $count : (int) $count;
}
/**
* 聚合查询
* @access public
* @param string $aggregate 聚合方法
* @param string $field 字段名
* @param bool $force 强制转为数字类型
* @return mixed
*/
public function aggregate($aggregate, $field, $force = false)
{
if (0 === stripos($field, 'DISTINCT ')) {
list($distinct, $field) = explode(' ', $field);
}
if (!preg_match('/^[\w\.\+\-\*]+$/', $field)) {
throw new Exception('not support data:' . $field);
}
$result = $this->value($aggregate . '(' . (!empty($distinct) ? 'DISTINCT ' : '') . $field . ') AS tp_' . strtolower($aggregate), 0, $force);
return $result;
} }
/** /**
@ -527,7 +586,7 @@ class Query
*/ */
public function sum($field) public function sum($field)
{ {
return $this->value('SUM(' . $field . ') AS tp_sum', 0, true); return $this->aggregate('SUM', $field, true);
} }
/** /**
@ -539,7 +598,7 @@ class Query
*/ */
public function min($field, $force = true) public function min($field, $force = true)
{ {
return $this->value('MIN(' . $field . ') AS tp_min', 0, $force); return $this->aggregate('MIN', $field, $force);
} }
/** /**
@ -551,7 +610,7 @@ class Query
*/ */
public function max($field, $force = true) public function max($field, $force = true)
{ {
return $this->value('MAX(' . $field . ') AS tp_max', 0, $force); return $this->aggregate('MAX', $field, $force);
} }
/** /**
@ -562,7 +621,7 @@ class Query
*/ */
public function avg($field) public function avg($field)
{ {
return $this->value('AVG(' . $field . ') AS tp_avg', 0, true); return $this->aggregate('AVG', $field, true);
} }
/** /**
@ -609,7 +668,7 @@ class Query
return true; return true;
} }
} }
return $this->setField($field, ['inc', $field, $step]); return $this->setField($field, ['inc', $step]);
} }
/** /**
@ -637,9 +696,9 @@ class Query
$this->options = []; $this->options = [];
return true; return true;
} }
return $this->setField($field, ['inc', $field, $step]); return $this->setField($field, ['inc', $step]);
} }
return $this->setField($field, ['dec', $field, $step]); return $this->setField($field, ['dec', $step]);
} }
/** /**
@ -708,6 +767,7 @@ class Query
// 传入的表名为数组 // 传入的表名为数组
if (is_array($join)) { if (is_array($join)) {
$table = $join; $table = $join;
$alias = array_shift($join);
} else { } else {
$join = trim($join); $join = trim($join);
if (false !== strpos($join, '(')) { if (false !== strpos($join, '(')) {
@ -768,8 +828,15 @@ class Query
{ {
if (empty($field)) { if (empty($field)) {
return $this; return $this;
} elseif ($field instanceof Expression) {
$this->options['field'][] = $field;
return $this;
} }
if (is_string($field)) { if (is_string($field)) {
if (preg_match('/[\<\'\"\(]/', $field)) {
return $this->fieldRaw($field);
}
$field = array_map('trim', explode(',', $field)); $field = array_map('trim', explode(',', $field));
} }
if (true === $field) { if (true === $field) {
@ -793,12 +860,30 @@ class Query
} }
if (isset($this->options['field'])) { if (isset($this->options['field'])) {
$field = array_merge($this->options['field'], $field); $field = array_merge((array) $this->options['field'], $field);
} }
$this->options['field'] = array_unique($field); $this->options['field'] = array_unique($field);
return $this; return $this;
} }
/**
* 表达式方式指定查询字段
* @access public
* @param string $field 字段名
* @param array $bind 参数绑定
* @return $this
*/
public function fieldRaw($field, array $bind = [])
{
$this->options['field'][] = $this->raw($field);
if ($bind) {
$this->bind($bind);
}
return $this;
}
/** /**
* 设置数据 * 设置数据
* @access public * @access public
@ -827,7 +912,7 @@ class Query
{ {
$fields = is_string($field) ? explode(',', $field) : $field; $fields = is_string($field) ? explode(',', $field) : $field;
foreach ($fields as $field) { foreach ($fields as $field) {
$this->data($field, ['inc', $field, $step]); $this->data($field, ['inc', $step]);
} }
return $this; return $this;
} }
@ -843,7 +928,7 @@ class Query
{ {
$fields = is_string($field) ? explode(',', $field) : $field; $fields = is_string($field) ? explode(',', $field) : $field;
foreach ($fields as $field) { foreach ($fields as $field) {
$this->data($field, ['dec', $field, $step]); $this->data($field, ['dec', $step]);
} }
return $this; return $this;
} }
@ -857,25 +942,36 @@ class Query
*/ */
public function exp($field, $value) public function exp($field, $value)
{ {
$this->data($field, ['exp', $value]); $this->data($field, $this->raw($value));
return $this; return $this;
} }
/**
* 使用表达式设置数据
* @access public
* @param mixed $value 表达式
* @return Expression
*/
public function raw($value)
{
return new Expression($value);
}
/** /**
* 指定JOIN查询字段 * 指定JOIN查询字段
* @access public * @access public
* @param string|array $table 数据表 * @param string|array $table 数据表
* @param string|array $field 查询字段 * @param string|array $field 查询字段
* @param string|array $on JOIN条件 * @param mixed $on JOIN条件
* @param string $type JOIN类型 * @param string $type JOIN类型
* @return $this * @return $this
*/ */
public function view($join, $field = true, $on = null, $type = 'INNER') public function view($join, $field = true, $on = null, $type = 'INNER')
{ {
$this->options['view'] = true; $this->options['view'] = true;
if (is_array($join) && key($join) !== 0) { if (is_array($join) && key($join) === 0) {
foreach ($join as $key => $val) { foreach ($join as $key => $val) {
$this->view($key, $val[0], isset($val[1]) ? $val[1] : null, isset($val[2]) ? $val[2] : 'INNER'); $this->view($val[0], $val[1], isset($val[2]) ? $val[2] : null, isset($val[3]) ? $val[3] : 'INNER');
} }
} else { } else {
$fields = []; $fields = [];
@ -974,6 +1070,37 @@ class Query
return $this; return $this;
} }
/**
* 指定表达式查询条件
* @access public
* @param string $where 查询条件
* @param array $bind 参数绑定
* @param string $logic 查询逻辑 and or xor
* @return $this
*/
public function whereRaw($where, $bind = [], $logic = 'AND')
{
$this->options['where'][$logic][] = $this->raw($where);
if ($bind) {
$this->bind($bind);
}
return $this;
}
/**
* 指定表达式查询条件 OR
* @access public
* @param string $where 查询条件
* @param array $bind 参数绑定
* @return $this
*/
public function whereOrRaw($where, $bind = [])
{
return $this->whereRaw($where, $bind, 'OR');
}
/** /**
* 指定Null查询条件 * 指定Null查询条件
* @access public * @access public
@ -983,7 +1110,7 @@ class Query
*/ */
public function whereNull($field, $logic = 'AND') public function whereNull($field, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'null', null); $this->parseWhereExp($logic, $field, 'null', null, [], true);
return $this; return $this;
} }
@ -996,7 +1123,7 @@ class Query
*/ */
public function whereNotNull($field, $logic = 'AND') public function whereNotNull($field, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'notnull', null); $this->parseWhereExp($logic, $field, 'notnull', null, [], true);
return $this; return $this;
} }
@ -1036,7 +1163,7 @@ class Query
*/ */
public function whereIn($field, $condition, $logic = 'AND') public function whereIn($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'in', $condition); $this->parseWhereExp($logic, $field, 'in', $condition, [], true);
return $this; return $this;
} }
@ -1050,7 +1177,7 @@ class Query
*/ */
public function whereNotIn($field, $condition, $logic = 'AND') public function whereNotIn($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'not in', $condition); $this->parseWhereExp($logic, $field, 'not in', $condition, [], true);
return $this; return $this;
} }
@ -1064,7 +1191,7 @@ class Query
*/ */
public function whereLike($field, $condition, $logic = 'AND') public function whereLike($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'like', $condition); $this->parseWhereExp($logic, $field, 'like', $condition, [], true);
return $this; return $this;
} }
@ -1078,7 +1205,7 @@ class Query
*/ */
public function whereNotLike($field, $condition, $logic = 'AND') public function whereNotLike($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'not like', $condition); $this->parseWhereExp($logic, $field, 'not like', $condition, [], true);
return $this; return $this;
} }
@ -1092,7 +1219,7 @@ class Query
*/ */
public function whereBetween($field, $condition, $logic = 'AND') public function whereBetween($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'between', $condition); $this->parseWhereExp($logic, $field, 'between', $condition, [], true);
return $this; return $this;
} }
@ -1106,7 +1233,7 @@ class Query
*/ */
public function whereNotBetween($field, $condition, $logic = 'AND') public function whereNotBetween($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'not between', $condition); $this->parseWhereExp($logic, $field, 'not between', $condition, [], true);
return $this; return $this;
} }
@ -1120,7 +1247,7 @@ class Query
*/ */
public function whereExp($field, $condition, $logic = 'AND') public function whereExp($field, $condition, $logic = 'AND')
{ {
$this->parseWhereExp($logic, $field, 'exp', $condition); $this->parseWhereExp($logic, $field, 'exp', $this->raw($condition), [], true);
return $this; return $this;
} }
@ -1147,9 +1274,10 @@ class Query
* @param mixed $op 查询表达式 * @param mixed $op 查询表达式
* @param mixed $condition 查询条件 * @param mixed $condition 查询条件
* @param array $param 查询参数 * @param array $param 查询参数
* @param bool $strict 严格模式
* @return void * @return void
*/ */
protected function parseWhereExp($logic, $field, $op, $condition, $param = []) protected function parseWhereExp($logic, $field, $op, $condition, $param = [], $strict = false)
{ {
$logic = strtoupper($logic); $logic = strtoupper($logic);
if ($field instanceof \Closure) { if ($field instanceof \Closure) {
@ -1160,8 +1288,17 @@ class Query
if (is_string($field) && !empty($this->options['via']) && !strpos($field, '.')) { if (is_string($field) && !empty($this->options['via']) && !strpos($field, '.')) {
$field = $this->options['via'] . '.' . $field; $field = $this->options['via'] . '.' . $field;
} }
if (is_string($field) && preg_match('/[,=\>\<\'\"\(\s]/', $field)) {
$where[] = ['exp', $field]; if ($field instanceof Expression) {
return $this->whereRaw($field, is_array($op) ? $op : []);
} elseif ($strict) {
// 使用严格模式查询
$where[$field] = [$op, $condition];
// 记录一个字段多次查询条件
$this->options['multi'][$logic][$field][] = $where[$field];
} elseif (is_string($field) && preg_match('/[,=\>\<\'\"\(\s]/', $field)) {
$where[] = ['exp', $this->raw($field)];
if (is_array($op)) { if (is_array($op)) {
// 参数绑定 // 参数绑定
$this->bind($op); $this->bind($op);
@ -1182,21 +1319,28 @@ class Query
$where[$field] = $param; $where[$field] = $param;
} elseif (in_array(strtolower($op), ['null', 'notnull', 'not null'])) { } elseif (in_array(strtolower($op), ['null', 'notnull', 'not null'])) {
// null查询 // null查询
$where[$field] = [$op, '']; $where[$field] = [$op, ''];
$this->options['multi'][$logic][$field][] = $where[$field]; $this->options['multi'][$logic][$field][] = $where[$field];
} elseif (is_null($condition)) { } elseif (is_null($condition)) {
// 字段相等查询 // 字段相等查询
$where[$field] = ['eq', $op]; $where[$field] = ['eq', $op];
$this->options['multi'][$logic][$field][] = $where[$field]; $this->options['multi'][$logic][$field][] = $where[$field];
} else { } else {
$where[$field] = [$op, $condition, isset($param[2]) ? $param[2] : null]; if ('exp' == strtolower($op)) {
if ('exp' == strtolower($op) && isset($param[2]) && is_array($param[2])) { $where[$field] = ['exp', $this->raw($condition)];
// 参数绑定 // 参数绑定
$this->bind($param[2]); if (isset($param[2]) && is_array($param[2])) {
$this->bind($param[2]);
}
} else {
$where[$field] = [$op, $condition];
} }
// 记录一个字段多次查询条件 // 记录一个字段多次查询条件
$this->options['multi'][$logic][$field][] = $where[$field]; $this->options['multi'][$logic][$field][] = $where[$field];
} }
if (!empty($where)) { if (!empty($where)) {
if (!isset($this->options['where'][$logic])) { if (!isset($this->options['where'][$logic])) {
$this->options['where'][$logic] = []; $this->options['where'][$logic] = [];
@ -1414,31 +1558,59 @@ class Query
*/ */
public function order($field, $order = null) public function order($field, $order = null)
{ {
if (!empty($field)) { if (empty($field)) {
if (is_string($field)) { return $this;
if (!empty($this->options['via'])) { } elseif ($field instanceof Expression) {
$field = $this->options['via'] . '.' . $field; $this->options['order'][] = $field;
} return $this;
$field = empty($order) ? $field : [$field => $order]; }
} elseif (!empty($this->options['via'])) {
foreach ($field as $key => $val) { if (is_string($field)) {
if (is_numeric($key)) { if (!empty($this->options['via'])) {
$field[$key] = $this->options['via'] . '.' . $val; $field = $this->options['via'] . '.' . $field;
} else {
$field[$this->options['via'] . '.' . $key] = $val;
unset($field[$key]);
}
}
} }
if (!isset($this->options['order'])) { if (strpos($field, ',')) {
$this->options['order'] = []; $field = array_map('trim', explode(',', $field));
}
if (is_array($field)) {
$this->options['order'] = array_merge($this->options['order'], $field);
} else { } else {
$this->options['order'][] = $field; $field = empty($order) ? $field : [$field => $order];
}
} elseif (!empty($this->options['via'])) {
foreach ($field as $key => $val) {
if (is_numeric($key)) {
$field[$key] = $this->options['via'] . '.' . $val;
} else {
$field[$this->options['via'] . '.' . $key] = $val;
unset($field[$key]);
}
} }
} }
if (!isset($this->options['order'])) {
$this->options['order'] = [];
}
if (is_array($field)) {
$this->options['order'] = array_merge($this->options['order'], $field);
} else {
$this->options['order'][] = $field;
}
return $this;
}
/**
* 表达式方式指定Field排序
* @access public
* @param string $field 排序字段
* @param array $bind 参数绑定
* @return $this
*/
public function orderRaw($field, array $bind = [])
{
$this->options['order'][] = $this->raw($field);
if ($bind) {
$this->bind($bind);
}
return $this; return $this;
} }
@ -1958,14 +2130,23 @@ class Query
$this->field('*'); $this->field('*');
} }
foreach ($relations as $key => $relation) { foreach ($relations as $key => $relation) {
$closure = false; $closure = $name = null;
if ($relation instanceof \Closure) { if ($relation instanceof \Closure) {
$closure = $relation; $closure = $relation;
$relation = $key; $relation = $key;
} elseif (!is_int($key)) {
$name = $relation;
$relation = $key;
} }
$relation = Loader::parseName($relation, 1, false); $relation = Loader::parseName($relation, 1, false);
$count = '(' . $this->model->$relation()->getRelationCountQuery($closure) . ')';
$this->field([$count => Loader::parseName($relation) . '_count']); $count = '(' . $this->model->$relation()->getRelationCountQuery($closure, $name) . ')';
if (empty($name)) {
$name = Loader::parseName($relation) . '_count';
}
$this->field([$count => $name]);
} }
} }
return $this; return $this;
@ -2091,7 +2272,7 @@ class Query
} }
// 执行操作 // 执行操作
$result = 0 === $sql ? 0 : $this->execute($sql, $bind); $result = 0 === $sql ? 0 : $this->execute($sql, $bind, $this);
if ($result) { if ($result) {
$sequence = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null); $sequence = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null);
$lastInsId = $this->getLastInsID($sequence); $lastInsId = $this->getLastInsID($sequence);
@ -2157,10 +2338,10 @@ class Query
return $this->connection->getRealSql($sql, $bind); return $this->connection->getRealSql($sql, $bind);
} elseif (is_array($sql)) { } elseif (is_array($sql)) {
// 执行操作 // 执行操作
return $this->batchQuery($sql, $bind); return $this->batchQuery($sql, $bind, $this);
} else { } else {
// 执行操作 // 执行操作
return $this->execute($sql, $bind); return $this->execute($sql, $bind, $this);
} }
} }
@ -2186,7 +2367,7 @@ class Query
return $this->connection->getRealSql($sql, $bind); return $this->connection->getRealSql($sql, $bind);
} else { } else {
// 执行操作 // 执行操作
return $this->execute($sql, $bind); return $this->execute($sql, $bind, $this);
} }
} }
@ -2253,7 +2434,7 @@ class Query
Cache::clear($options['cache']['tag']); Cache::clear($options['cache']['tag']);
} }
// 执行操作 // 执行操作
$result = '' == $sql ? 0 : $this->execute($sql, $bind); $result = '' == $sql ? 0 : $this->execute($sql, $bind, $this);
if ($result) { if ($result) {
if (is_string($pk) && isset($where[$pk])) { if (is_string($pk) && isset($where[$pk])) {
$data[$pk] = $where[$pk]; $data[$pk] = $where[$pk];
@ -2322,7 +2503,7 @@ class Query
// 判断查询缓存 // 判断查询缓存
$cache = $options['cache']; $cache = $options['cache'];
unset($options['cache']); unset($options['cache']);
$key = is_string($cache['key']) ? $cache['key'] : md5(serialize($options) . serialize($this->bind)); $key = is_string($cache['key']) ? $cache['key'] : md5($this->connection->getConfig('database') . '.' . serialize($options) . serialize($this->bind));
$resultSet = Cache::get($key); $resultSet = Cache::get($key);
} }
if (false === $resultSet) { if (false === $resultSet) {
@ -2423,10 +2604,16 @@ class Query
} elseif (is_array($value) && is_string($value[0]) && 'eq' == strtolower($value[0])) { } elseif (is_array($value) && is_string($value[0]) && 'eq' == strtolower($value[0])) {
$data = $value[1]; $data = $value[1];
} }
$prefix = $this->connection->getConfig('database') . '.';
if (isset($data)) { if (isset($data)) {
return 'think:' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; return 'think:' . $prefix . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data;
} else { }
return md5(serialize($options) . serialize($bind));
try {
return md5($prefix . serialize($options) . serialize($bind));
} catch (\Exception $e) {
throw new Exception('closure not support cache(true)');
} }
} }
@ -2463,11 +2650,11 @@ class Query
// 判断查询缓存 // 判断查询缓存
$cache = $options['cache']; $cache = $options['cache'];
if (true === $cache['key'] && !is_null($data) && !is_array($data)) { if (true === $cache['key'] && !is_null($data) && !is_array($data)) {
$key = 'think:' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data; $key = 'think:' . $this->connection->getConfig('database') . '.' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data;
} elseif (is_string($cache['key'])) { } elseif (is_string($cache['key'])) {
$key = $cache['key']; $key = $cache['key'];
} elseif (!isset($key)) { } elseif (!isset($key)) {
$key = md5(serialize($options) . serialize($this->bind)); $key = md5($this->connection->getConfig('database') . '.' . serialize($options) . serialize($this->bind));
} }
$result = Cache::get($key); $result = Cache::get($key);
} }
@ -2719,7 +2906,7 @@ class Query
Cache::clear($options['cache']['tag']); Cache::clear($options['cache']['tag']);
} }
// 执行操作 // 执行操作
$result = $this->execute($sql, $bind); $result = $this->execute($sql, $bind, $this);
if ($result) { if ($result) {
if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) { if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) {
list($a, $val) = explode('|', $key); list($a, $val) = explode('|', $key);
@ -2804,6 +2991,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', 'order', 'force', 'comment'] as $name) { foreach (['join', 'union', 'group', 'having', 'limit', 'order', 'force', 'comment'] as $name) {
if (!isset($options[$name])) { if (!isset($options[$name])) {
$options[$name] = ''; $options[$name] = '';

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

@ -82,17 +82,23 @@ class Mysql extends Builder
/** /**
* 字段和表名处理 * 字段和表名处理
* @access protected * @access protected
* @param string $key * @param mixed $key
* @param array $options * @param array $options
* @return string * @return string
*/ */
protected function parseKey($key, $options = []) protected function parseKey($key, $options = [], $strict = false)
{ {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key); $key = trim($key);
if (strpos($key, '$.') && false === strpos($key, '(')) { if (strpos($key, '$.') && false === strpos($key, '(')) {
// JSON字段支持 // JSON字段支持
list($field, $name) = explode('$.', $key); list($field, $name) = explode('$.', $key);
$key = 'json_extract(' . $field . ', \'$.' . $name . '\')'; return 'json_extract(' . $field . ', \'$.' . $name . '\')';
} elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) { } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
if ('__TABLE__' == $table) { if ('__TABLE__' == $table) {
@ -102,7 +108,11 @@ class Mysql extends Builder
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} }
} }
if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
throw new Exception('not support data:' . $key);
}
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) {
$key = '`' . $key . '`'; $key = '`' . $key . '`';
} }
if (isset($table)) { if (isset($table)) {

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

@ -44,12 +44,18 @@ class Pgsql extends Builder
/** /**
* 字段和表名处理 * 字段和表名处理
* @access protected * @access protected
* @param string $key * @param mixed $key
* @param array $options * @param array $options
* @return string * @return string
*/ */
protected function parseKey($key, $options = []) protected function parseKey($key, $options = [], $strict = false)
{ {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key); $key = trim($key);
if (strpos($key, '$.') && false === strpos($key, '(')) { if (strpos($key, '$.') && false === strpos($key, '(')) {
// JSON字段支持 // JSON字段支持

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

@ -52,12 +52,18 @@ class Sqlite extends Builder
/** /**
* 字段和表名处理 * 字段和表名处理
* @access protected * @access protected
* @param string $key * @param mixed $key
* @param array $options * @param array $options
* @return string * @return string
*/ */
protected function parseKey($key, $options = []) protected function parseKey($key, $options = [], $strict = false)
{ {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key); $key = trim($key);
if (strpos($key, '.')) { if (strpos($key, '.')) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);

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

@ -12,6 +12,7 @@
namespace think\db\builder; namespace think\db\builder;
use think\db\Builder; use think\db\Builder;
use think\db\Expression;
/** /**
* Sqlsrv数据库驱动 * Sqlsrv数据库驱动
@ -34,25 +35,29 @@ class Sqlsrv extends Builder
*/ */
protected function parseOrder($order, $options = []) protected function parseOrder($order, $options = [])
{ {
if (is_array($order)) { if (empty($order)) {
$array = []; return ' ORDER BY rand()';
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if (false === strpos($val, '(')) {
$array[] = $this->parseKey($val, $options);
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand();
} else {
$array[] = $val;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($key, $options) . ' ' . $sort;
}
}
$order = implode(',', $array);
} }
return !empty($order) ? ' ORDER BY ' . $order : ' ORDER BY rand()';
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif (is_numeric($key)) {
if (false === strpos($val, '(')) {
$array[] = $this->parseKey($val, $options);
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand();
} else {
$array[] = $val;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc'], true) ? ' ' . $val : '';
$array[] = $this->parseKey($key, $options, true) . ' ' . $sort;
}
}
return ' ORDER BY ' . implode(',', $array);
} }
/** /**
@ -68,12 +73,17 @@ class Sqlsrv extends Builder
/** /**
* 字段和表名处理 * 字段和表名处理
* @access protected * @access protected
* @param string $key * @param mixed $key
* @param array $options * @param array $options
* @return string * @return string
*/ */
protected function parseKey($key, $options = []) protected function parseKey($key, $options = [], $strict = false)
{ {
if (is_numeric($key)) {
return $key;
} elseif ($key instanceof Expression) {
return $key->getValue();
}
$key = trim($key); $key = trim($key);
if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) { if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) {
list($table, $key) = explode('.', $key, 2); list($table, $key) = explode('.', $key, 2);
@ -84,7 +94,11 @@ class Sqlsrv extends Builder
$table = $options['alias'][$table]; $table = $options['alias'][$table];
} }
} }
if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
throw new Exception('not support data:' . $key);
}
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) {
$key = '[' . $key . ']'; $key = '[' . $key . ']';
} }
if (isset($table)) { if (isset($table)) {

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

@ -50,7 +50,10 @@ class Sqlsrv extends Connection
public function getFields($tableName) public function getFields($tableName)
{ {
list($tableName) = explode(' ', $tableName); list($tableName) = explode(' ', $tableName);
$sql = "SELECT column_name, data_type, column_default, is_nullable $tableNames = explode('.', $tableName);
$tableName = isset($tableNames[1]) ? $tableNames[1] : $tableNames[0];
$sql = "SELECT column_name, data_type, column_default, is_nullable
FROM information_schema.tables AS t FROM information_schema.tables AS t
JOIN information_schema.columns AS c JOIN information_schema.columns AS c
ON t.table_catalog = c.table_catalog ON t.table_catalog = c.table_catalog

2
thinkphp/library/think/debug/Html.php
View File

@ -53,7 +53,7 @@ class Html
return false; return false;
} }
// 获取基本信息 // 获取基本信息
$runtime = number_format(microtime(true) - THINK_START_TIME, 10); $runtime = number_format(microtime(true) - THINK_START_TIME, 10, '.', '');
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞'; $reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$mem = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2); $mem = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);

253
thinkphp/library/think/log/driver/File.php
View File

@ -25,10 +25,10 @@ class File
'file_size' => 2097152, 'file_size' => 2097152,
'path' => LOG_PATH, 'path' => LOG_PATH,
'apart_level' => [], 'apart_level' => [],
'max_files' => 0,
'json' => false,
]; ];
protected $writed = [];
// 实例化并传入参数 // 实例化并传入参数
public function __construct($config = []) public function __construct($config = [])
{ {
@ -40,92 +40,231 @@ class File
/** /**
* 日志写入接口 * 日志写入接口
* @access public * @access public
* @param array $log 日志信息 * @param array $log 日志信息
* @param bool $append 是否追加请求信息
* @return bool * @return bool
*/ */
public function save(array $log = []) public function save(array $log = [], $append = false)
{ {
if ($this->config['single']) { $destination = $this->getMasterLogFile();
$destination = $this->config['path'] . 'single.log';
} else {
$cli = IS_CLI ? '_cli' : '';
$destination = $this->config['path'] . date('Ym') . DS . date('d') . $cli . '.log';
}
$path = dirname($destination); $path = dirname($destination);
!is_dir($path) && mkdir($path, 0755, true); !is_dir($path) && mkdir($path, 0755, true);
$info = ''; $info = [];
foreach ($log as $type => $val) { foreach ($log as $type => $val) {
$level = '';
foreach ($val as $msg) { foreach ($val as $msg) {
if (!is_string($msg)) { if (!is_string($msg)) {
$msg = var_export($msg, true); $msg = var_export($msg, true);
} }
$level .= '[ ' . $type . ' ] ' . $msg . "\r\n";
$info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
} }
if (in_array($type, $this->config['apart_level'])) {
if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
// 独立记录的日志级别 // 独立记录的日志级别
if ($this->config['single']) { $filename = $this->getApartLevelFile($path, $type);
$filename = $path . DS . $type . '.log';
} else { $this->write($info[$type], $filename, true, $append);
$filename = $path . DS . date('d') . '_' . $type . $cli . '.log'; unset($info[$type]);
}
$this->write($level, $filename, true);
} else {
$info .= $level;
} }
} }
if ($info) { if ($info) {
return $this->write($info, $destination); return $this->write($info, $destination, false, $append);
} }
return true; return true;
} }
protected function write($message, $destination, $apart = false) /**
* 获取主日志文件名
* @access public
* @return string
*/
protected function getMasterLogFile()
{ {
//检测日志文件大小，超过配置大小则备份日志文件重新生成 if ($this->config['single']) {
if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) { $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
try {
rename($destination, dirname($destination) . DS . time() . '-' . basename($destination));
} catch (\Exception $e) {
}
$this->writed[$destination] = false;
}
if (empty($this->writed[$destination]) && !IS_CLI) { $destination = $this->config['path'] . $name . '.log';
if (App::$debug && !$apart) { } else {
// 获取基本信息 $cli = PHP_SAPI == 'cli' ? '_cli' : '';
if (isset($_SERVER['HTTP_HOST'])) {
$current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; if ($this->config['max_files']) {
} else { $filename = date('Ymd') . $cli . '.log';
$current_uri = "cmd:" . implode(' ', $_SERVER['argv']); $files = glob($this->config['path'] . '*.log');
try {
if (count($files) > $this->config['max_files']) {
unlink($files[0]);
}
} catch (\Exception $e) {
} }
} else {
$runtime = round(microtime(true) - THINK_START_TIME, 10); $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log';
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$time_str = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$memory_str = ' [内存消耗：' . $memory_use . 'kb]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']';
$message = '[ info ] ' . $current_uri . $time_str . $memory_str . $file_load . "\r\n" . $message;
} }
$now = date($this->config['time_format']);
$ip = Request::instance()->ip();
$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'CLI';
$uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
$message = "---------------------------------------------------------------\r\n[{$now}] {$ip} {$method} {$uri}\r\n" . $message;
$this->writed[$destination] = true; $destination = $this->config['path'] . $filename;
} }
if (IS_CLI) { return $destination;
$now = date($this->config['time_format']); }
$message = "[{$now}]" . $message;
/**
* 获取独立日志文件名
* @access public
* @param string $path 日志目录
* @param string $type 日志类型
* @return string
*/
protected function getApartLevelFile($path, $type)
{
$cli = PHP_SAPI == 'cli' ? '_cli' : '';
if ($this->config['single']) {
$name = is_string($this->config['single']) ? $this->config['single'] : 'single';
$name .= '_' . $type;
} elseif ($this->config['max_files']) {
$name = date('Ymd') . '_' . $type . $cli;
} else {
$name = date('d') . '_' . $type . $cli;
}
return $path . DIRECTORY_SEPARATOR . $name . '.log';
}
/**
* 日志写入
* @access protected
* @param array $message 日志信息
* @param string $destination 日志文件
* @param bool $apart 是否独立文件写入
* @param bool $append 是否追加请求信息
* @return bool
*/
protected function write($message, $destination, $apart = false, $append = false)
{
// 检测日志文件大小，超过配置大小则备份日志文件重新生成
$this->checkLogSize($destination);
// 日志信息封装
$info['timestamp'] = date($this->config['time_format']);
foreach ($message as $type => $msg) {
$info[$type] = is_array($msg) ? implode("\r\n", $msg) : $msg;
}
if (PHP_SAPI == 'cli') {
$message = $this->parseCliLog($info);
} else {
// 添加调试日志
$this->getDebugLog($info, $append, $apart);
$message = $this->parseLog($info);
} }
return error_log($message, 3, $destination); return error_log($message, 3, $destination);
} }
/**
* 检查日志文件大小并自动生成备份文件
* @access protected
* @param string $destination 日志文件
* @return void
*/
protected function checkLogSize($destination)
{
if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
try {
rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
} catch (\Exception $e) {
}
}
}
/**
* CLI日志解析
* @access protected
* @param array $info 日志信息
* @return string
*/
protected function parseCliLog($info)
{
if ($this->config['json']) {
$message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
} else {
$now = $info['timestamp'];
unset($info['timestamp']);
$message = implode("\r\n", $info);
$message = "[{$now}]" . $message . "\r\n";
}
return $message;
}
/**
* 解析日志
* @access protected
* @param array $info 日志信息
* @return string
*/
protected function parseLog($info)
{
$request = Request::instance();
$requestInfo = [
'ip' => $request->ip(),
'method' => $request->method(),
'host' => $request->host(),
'uri' => $request->url(),
];
if ($this->config['json']) {
$info = $requestInfo + $info;
return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
}
array_unshift($info, "---------------------------------------------------------------\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
unset($info['timestamp']);
return implode("\r\n", $info) . "\r\n";
}
protected function getDebugLog(&$info, $append, $apart)
{
if (App::$debug && $append) {
if ($this->config['json']) {
// 获取基本信息
$runtime = round(microtime(true) - THINK_START_TIME, 10);
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$info = [
'runtime' => number_format($runtime, 6) . 's',
'reqs' => $reqs . 'req/s',
'memory' => $memory_use . 'kb',
'file' => count(get_included_files()),
] + $info;
} elseif (!$apart) {
// 增加额外的调试信息
$runtime = round(microtime(true) - THINK_START_TIME, 10);
$reqs = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
$memory_use = number_format((memory_get_usage() - THINK_START_MEM) / 1024, 2);
$time_str = '[运行时间：' . number_format($runtime, 6) . 's] [吞吐率：' . $reqs . 'req/s]';
$memory_str = ' [内存消耗：' . $memory_use . 'kb]';
$file_load = ' [文件加载：' . count(get_included_files()) . ']';
array_unshift($info, $time_str . $memory_str . $file_load);
}
}
}
} }

2
thinkphp/library/think/log/driver/Socket.php
View File

@ -60,7 +60,7 @@ class Socket
* @param array $log 日志信息 * @param array $log 日志信息
* @return bool * @return bool
*/ */
public function save(array $log = []) public function save(array $log = [], $append = false)
{ {
if (!$this->check()) { if (!$this->check()) {
return false; return false;

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

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

2
thinkphp/library/think/model/Relation.php
View File

@ -49,7 +49,7 @@ abstract class Relation
} }
/** /**
* 获取当前的关联模型类 * 获取当前的关联模型对象实例
* @access public * @access public
* @return Model * @return Model
*/ */

22
thinkphp/library/think/model/relation/BelongsTo.php
View File

@ -52,6 +52,7 @@ class BelongsTo extends OneToOne
call_user_func_array($closure, [ & $this->query]); call_user_func_array($closure, [ & $this->query]);
} }
$relationModel = $this->query $relationModel = $this->query
->removeWhereField($this->localKey)
->where($this->localKey, $this->parent->$foreignKey) ->where($this->localKey, $this->parent->$foreignKey)
->relation($subRelation) ->relation($subRelation)
->find(); ->find();
@ -128,6 +129,7 @@ class BelongsTo extends OneToOne
} }
if (!empty($range)) { if (!empty($range)) {
$this->query->removeWhereField($localKey);
$data = $this->eagerlyWhere($this->query, [ $data = $this->eagerlyWhere($this->query, [
$localKey => [ $localKey => [
'in', 'in',
@ -171,7 +173,8 @@ class BelongsTo extends OneToOne
{ {
$localKey = $this->localKey; $localKey = $this->localKey;
$foreignKey = $this->foreignKey; $foreignKey = $this->foreignKey;
$data = $this->eagerlyWhere($this->query, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure); $this->query->removeWhereField($localKey);
$data = $this->eagerlyWhere($this->query, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure);
// 关联模型 // 关联模型
if (!isset($data[$result->$foreignKey])) { if (!isset($data[$result->$foreignKey])) {
$relationModel = null; $relationModel = null;
@ -220,4 +223,21 @@ class BelongsTo extends OneToOne
return $this->parent->setRelation($this->relation, null); return $this->parent->setRelation($this->relation, null);
} }
/**
* 执行基础查询（仅执行一次）
* @access protected
* @return void
*/
protected function baseQuery()
{
if (empty($this->baseQuery)) {
if (isset($this->parent->{$this->foreignKey})) {
// 关联查询带入关联条件
$this->query->where($this->localKey, '=', $this->parent->{$this->foreignKey});
}
$this->baseQuery = true;
}
}
} }

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

@ -12,6 +12,7 @@
namespace think\model\relation; namespace think\model\relation;
use think\Collection; use think\Collection;
use think\Db;
use think\db\Query; use think\db\Query;
use think\Exception; use think\Exception;
use think\Loader; use think\Loader;
@ -28,6 +29,8 @@ class BelongsToMany extends Relation
protected $pivotName; protected $pivotName;
// 中间表模型对象 // 中间表模型对象
protected $pivot; protected $pivot;
// 中间表数据名称
protected $pivotDataName = 'pivot';
/** /**
* 构造函数 * 构造函数
@ -70,17 +73,43 @@ class BelongsToMany extends Relation
} }
/** /**
* 实例化中间表模型 * 设置中间表数据名称
* @access public
* @param string $name
* @return $this
*/
public function pivotDataName($name)
{
$this->pivotDataName = $name;
return $this;
}
/**
* 获取中间表更新条件
* @param $data * @param $data
* @return array
*/
protected function getUpdateWhere($data)
{
return [
$this->localKey => $data[$this->localKey],
$this->foreignKey => $data[$this->foreignKey],
];
}
/**
* 实例化中间表模型
* @param array $data
* @param bool $isUpdate
* @return Pivot * @return Pivot
* @throws Exception * @throws Exception
*/ */
protected function newPivot($data = []) protected function newPivot($data = [], $isUpdate = false)
{ {
$class = $this->pivotName ?: '\\think\\model\\Pivot'; $class = $this->pivotName ?: '\\think\\model\\Pivot';
$pivot = new $class($data, $this->parent, $this->middle); $pivot = new $class($data, $this->parent, $this->middle);
if ($pivot instanceof Pivot) { if ($pivot instanceof Pivot) {
return $pivot; return $isUpdate ? $pivot->isUpdate(true, $this->getUpdateWhere($data)) : $pivot;
} else { } else {
throw new Exception('pivot model must extends: \think\model\Pivot'); throw new Exception('pivot model must extends: \think\model\Pivot');
} }
@ -103,7 +132,7 @@ class BelongsToMany extends Relation
} }
} }
} }
$model->setRelation('pivot', $this->newPivot($pivot)); $model->setRelation($this->pivotDataName, $this->newPivot($pivot, true));
} }
} }
@ -331,14 +360,22 @@ class BelongsToMany extends Relation
* 获取关联统计子查询 * 获取关联统计子查询
* @access public * @access public
* @param \Closure $closure 闭包 * @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string * @return string
*/ */
public function getRelationCountQuery($closure) public function getRelationCountQuery($closure, &$name = null)
{ {
if ($closure) {
$return = call_user_func_array($closure, [ & $this->query]);
if ($return && is_string($return)) {
$name = $return;
}
}
return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [ return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
'pivot.' . $this->localKey => [ 'pivot.' . $this->localKey => [
'exp', 'exp',
'=' . $this->parent->getTable() . '.' . $this->parent->getPk(), Db::raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()),
], ],
])->fetchSql()->count(); ])->fetchSql()->count();
} }
@ -369,7 +406,7 @@ class BelongsToMany extends Relation
} }
} }
} }
$set->setRelation('pivot', $this->newPivot($pivot)); $set->setRelation($this->pivotDataName, $this->newPivot($pivot, true));
$data[$pivot[$this->localKey]][] = $set; $data[$pivot[$this->localKey]][] = $set;
} }
return $data; return $data;
@ -472,7 +509,7 @@ class BelongsToMany extends Relation
foreach ($ids as $id) { foreach ($ids as $id) {
$pivot[$this->foreignKey] = $id; $pivot[$this->foreignKey] = $id;
$this->pivot->insert($pivot, true); $this->pivot->insert($pivot, true);
$result[] = $this->newPivot($pivot); $result[] = $this->newPivot($pivot, true);
} }
if (count($result) == 1) { if (count($result) == 1) {
// 返回中间表模型对象 // 返回中间表模型对象
@ -484,6 +521,29 @@ class BelongsToMany extends Relation
} }
} }
/**
* 判断是否存在关联数据
* @access public
* @param mixed $data 数据 可以使用关联模型对象 或者 关联对象的主键
* @return Pivot
* @throws Exception
*/
public function attached($data)
{
if ($data instanceof Model) {
$relationFk = $data->getPk();
$id = $data->$relationFk;
} else {
$id = $data;
}
$pk = $this->parent->getPk();
$pivot = $this->pivot->where($this->localKey, $this->parent->$pk)->where($this->foreignKey, $id)->find();
return $pivot ?: false;
}
/** /**
* 解除关联的一个中间表数据 * 解除关联的一个中间表数据
* @access public * @access public

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

@ -143,7 +143,7 @@ class HasMany extends Relation
if ($closure) { if ($closure) {
call_user_func_array($closure, [ & $this->query]); call_user_func_array($closure, [ & $this->query]);
} }
$count = $this->query->where([$this->foreignKey => $result->$localKey])->count(); $count = $this->query->where($this->foreignKey, $result->$localKey)->count();
} }
return $count; return $count;
} }
@ -152,20 +152,19 @@ class HasMany extends Relation
* 创建关联统计子查询 * 创建关联统计子查询
* @access public * @access public
* @param \Closure $closure 闭包 * @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string * @return string
*/ */
public function getRelationCountQuery($closure) public function getRelationCountQuery($closure, &$name = null)
{ {
if ($closure) { if ($closure) {
call_user_func_array($closure, [ & $this->query]); $return = call_user_func_array($closure, [ & $this->query]);
if ($return && is_string($return)) {
$name = $return;
}
} }
$localKey = $this->localKey ?: $this->parent->getPk(); $localKey = $this->localKey ?: $this->parent->getPk();
return $this->query->where([ return $this->query->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $localKey)->fetchSql()->count();
$this->foreignKey => [
'exp',
'=' . $this->parent->getTable() . '.' . $localKey,
],
])->fetchSql()->count();
} }
/** /**
@ -206,12 +205,31 @@ class HasMany extends Relation
if ($data instanceof Model) { if ($data instanceof Model) {
$data = $data->getData(); $data = $data->getData();
} }
// 保存关联表数据 // 保存关联表数据
$model = new $this->model;
$data[$this->foreignKey] = $this->parent->{$this->localKey}; $data[$this->foreignKey] = $this->parent->{$this->localKey};
$model = new $this->model();
return $model->save($data) ? $model : false; return $model->save($data) ? $model : false;
} }
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
}
// 保存关联表数据
$data[$this->foreignKey] = $this->parent->{$this->localKey};
return new $this->model($data);
}
/** /**
* 批量保存当前关联数据对象 * 批量保存当前关联数据对象
* @access public * @access public

12
thinkphp/library/think/model/relation/HasManyThrough.php
View File

@ -120,6 +120,18 @@ class HasManyThrough extends Relation
public function relationCount($result, $closure) public function relationCount($result, $closure)
{} {}
/**
* 创建关联统计子查询
* @access public
* @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string
*/
public function getRelationCountQuery($closure, &$name = null)
{
throw new Exception('relation not support: withCount');
}
/** /**
* 执行基础查询（进执行一次） * 执行基础查询（进执行一次）
* @access protected * @access protected

28
thinkphp/library/think/model/relation/HasOne.php
View File

@ -50,7 +50,11 @@ class HasOne extends OneToOne
call_user_func_array($closure, [ & $this->query]); call_user_func_array($closure, [ & $this->query]);
} }
// 判断关联类型执行查询 // 判断关联类型执行查询
$relationModel = $this->query->where($this->foreignKey, $this->parent->$localKey)->relation($subRelation)->find(); $relationModel = $this->query
->removeWhereField($this->foreignKey)
->where($this->foreignKey, $this->parent->$localKey)
->relation($subRelation)
->find();
if ($relationModel) { if ($relationModel) {
$relationModel->setParent(clone $this->parent); $relationModel->setParent(clone $this->parent);
@ -130,7 +134,8 @@ class HasOne extends OneToOne
} }
if (!empty($range)) { if (!empty($range)) {
$data = $this->eagerlyWhere($this, [ $this->query->removeWhereField($foreignKey);
$data = $this->eagerlyWhere($this->query, [
$foreignKey => [ $foreignKey => [
'in', 'in',
$range, $range,
@ -172,7 +177,8 @@ class HasOne extends OneToOne
{ {
$localKey = $this->localKey; $localKey = $this->localKey;
$foreignKey = $this->foreignKey; $foreignKey = $this->foreignKey;
$data = $this->eagerlyWhere($this, [$foreignKey => $result->$localKey], $foreignKey, $relation, $subRelation, $closure); $this->query->removeWhereField($foreignKey);
$data = $this->eagerlyWhere($this->query, [$foreignKey => $result->$localKey], $foreignKey, $relation, $subRelation, $closure);
// 关联模型 // 关联模型
if (!isset($data[$result->$localKey])) { if (!isset($data[$result->$localKey])) {
@ -190,4 +196,20 @@ class HasOne extends OneToOne
} }
} }
/**
* 执行基础查询（仅执行一次）
* @access protected
* @return void
*/
protected function baseQuery()
{
if (empty($this->baseQuery)) {
if (isset($this->parent->{$this->localKey})) {
// 关联查询带入关联条件
$this->query->where($this->foreignKey, '=', $this->parent->{$this->localKey});
}
$this->baseQuery = true;
}
}
} }

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

@ -11,6 +11,7 @@
namespace think\model\relation; namespace think\model\relation;
use think\Db;
use think\db\Query; use think\db\Query;
use think\Exception; use think\Exception;
use think\Loader; use think\Loader;
@ -187,21 +188,25 @@ class MorphMany extends Relation
} }
/** /**
* 获取关联统计子查询 * 创建关联统计子查询
* @access public * @access public
* @param \Closure $closure 闭包 * @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string * @return string
*/ */
public function getRelationCountQuery($closure) public function getRelationCountQuery($closure, &$name = null)
{ {
if ($closure) { if ($closure) {
call_user_func_array($closure, [ & $this->query]); $return = call_user_func_array($closure, [ & $this->query]);
if ($return && is_string($return)) {
$name = $return;
}
} }
return $this->query->where([ return $this->query->where([
$this->morphKey => [ $this->morphKey => [
'exp', 'exp',
'=' . $this->parent->getTable() . '.' . $this->parent->getPk(), Db::raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()),
], ],
$this->morphType => $this->type, $this->morphType => $this->type,
])->fetchSql()->count(); ])->fetchSql()->count();
@ -243,13 +248,36 @@ class MorphMany extends Relation
if ($data instanceof Model) { if ($data instanceof Model) {
$data = $data->getData(); $data = $data->getData();
} }
// 保存关联表数据 // 保存关联表数据
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$model = new $this->model;
$data[$this->morphKey] = $this->parent->$pk; $data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type; $data[$this->morphType] = $this->type;
return $model->save($data) ? $model : false;
$model = new $this->model();
return $model->save() ? $model : false;
}
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
}
// 保存关联表数据
$pk = $this->parent->getPk();
$data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type;
return new $this->model($data);
} }
/** /**

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

@ -81,8 +81,8 @@ class MorphOne extends Relation
/** /**
* 根据关联条件查询当前模型 * 根据关联条件查询当前模型
* @access public * @access public
* @param mixed $where 查询条件（数组或者闭包） * @param mixed $where 查询条件（数组或者闭包）
* @param mixed $fields 字段 * @param mixed $fields 字段
* @return Query * @return Query
*/ */
public function hasWhere($where = [], $fields = null) public function hasWhere($where = [], $fields = null)
@ -202,13 +202,35 @@ class MorphOne extends Relation
if ($data instanceof Model) { if ($data instanceof Model) {
$data = $data->getData(); $data = $data->getData();
} }
// 保存关联表数据 // 保存关联表数据
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$model = new $this->model;
$data[$this->morphKey] = $this->parent->$pk; $data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type; $data[$this->morphType] = $this->type;
return $model->save($data) ? $model : false;
$model = new $this->model();
return $model->save() ? $model : false;
}
/**
* 创建关联对象实例
* @param array $data
* @return Model
*/
public function make($data = [])
{
if ($data instanceof Model) {
$data = $data->getData();
}
// 保存关联表数据
$pk = $this->parent->getPk();
$data[$this->morphKey] = $this->parent->$pk;
$data[$this->morphType] = $this->type;
return new $this->model($data);
} }
/** /**
@ -227,4 +249,15 @@ class MorphOne extends Relation
} }
} }
/**
* 创建关联统计子查询
* @access public
* @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string
*/
public function getRelationCountQuery($closure, &$name = null)
{
throw new Exception('relation not support: withCount');
}
} }

13
thinkphp/library/think/model/relation/MorphTo.php
View File

@ -105,7 +105,7 @@ class MorphTo extends Relation
/** /**
* 解析模型的完整命名空间 * 解析模型的完整命名空间
* @access public * @access protected
* @param string $model 模型名（或者完整类名） * @param string $model 模型名（或者完整类名）
* @return string * @return string
*/ */
@ -285,4 +285,15 @@ class MorphTo extends Relation
return $this->parent->setRelation($this->relation, null); return $this->parent->setRelation($this->relation, null);
} }
/**
* 创建关联统计子查询
* @access public
* @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string
*/
public function getRelationCountQuery($closure, &$name = null)
{
throw new Exception('relation not support: withCount');
}
} }

13
thinkphp/library/think/model/relation/OneToOne.php
View File

@ -304,6 +304,8 @@ abstract class OneToOne extends Relation
*/ */
protected function eagerlyWhere($model, $where, $key, $relation, $subRelation = '', $closure = false) protected function eagerlyWhere($model, $where, $key, $relation, $subRelation = '', $closure = false)
{ {
$this->baseQuery = true;
// 预载入关联查询 支持嵌套预载入 // 预载入关联查询 支持嵌套预载入
if ($closure) { if ($closure) {
call_user_func_array($closure, [ & $model]); call_user_func_array($closure, [ & $model]);
@ -321,4 +323,15 @@ abstract class OneToOne extends Relation
return $data; return $data;
} }
/**
* 创建关联统计子查询
* @access public
* @param \Closure $closure 闭包
* @param string $name 统计数据别名
* @return string
*/
public function getRelationCountQuery($closure, &$name = null)
{
throw new Exception('relation not support: withCount');
}
} }

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

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

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

@ -29,7 +29,11 @@ class Php
'view_suffix' => 'php', 'view_suffix' => 'php',
// 模板文件名分隔符 // 模板文件名分隔符
'view_depr' => DS, 'view_depr' => DS,
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
'auto_rule' => 1,
]; ];
protected $template;
protected $content;
public function __construct($config = []) public function __construct($config = [])
{ {
@ -68,16 +72,12 @@ class Php
if (!is_file($template)) { if (!is_file($template)) {
throw new TemplateNotFoundException('template not exists:' . $template, $template); throw new TemplateNotFoundException('template not exists:' . $template, $template);
} }
$this->template = $template;
// 记录视图信息 // 记录视图信息
App::$debug && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info'); App::$debug && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');
if (isset($data['template'])) {
$__template__ = $template; extract($data, EXTR_OVERWRITE);
extract($data, EXTR_OVERWRITE); include $this->template;
include $__template__;
} else {
extract($data, EXTR_OVERWRITE);
include $template;
}
} }
/** /**
@ -89,14 +89,10 @@ class Php
*/ */
public function display($content, $data = []) public function display($content, $data = [])
{ {
if (isset($data['content'])) { $this->content = $content;
$__content__ = $content;
extract($data, EXTR_OVERWRITE); extract($data, EXTR_OVERWRITE);
eval('?>' . $__content__); eval('?>' . $this->content);
} else {
extract($data, EXTR_OVERWRITE);
eval('?>' . $content);
}
} }
/** /**
@ -132,7 +128,7 @@ class Php
if ($controller) { if ($controller) {
if ('' == $template) { if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位 // 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DS, $controller) . $depr . $request->action(); $template = str_replace('.', DS, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action());
} elseif (false === strpos($template, $depr)) { } elseif (false === strpos($template, $depr)) {
$template = str_replace('.', DS, $controller) . $depr . $template; $template = str_replace('.', DS, $controller) . $depr . $template;
} }

4
thinkphp/library/think/view/driver/Think.php
View File

@ -34,6 +34,8 @@ class Think
'view_depr' => DS, 'view_depr' => DS,
// 是否开启模板编译缓存,设为false则每次都会重新编译 // 是否开启模板编译缓存,设为false则每次都会重新编译
'tpl_cache' => true, 'tpl_cache' => true,
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
'auto_rule' => 1,
]; ];
public function __construct($config = []) public function __construct($config = [])
@ -127,7 +129,7 @@ class Think
if ($controller) { if ($controller) {
if ('' == $template) { if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位 // 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DS, $controller) . $depr . $request->action(); $template = str_replace('.', DS, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action());
} elseif (false === strpos($template, $depr)) { } elseif (false === strpos($template, $depr)) {
$template = str_replace('.', DS, $controller) . $depr . $template; $template = str_replace('.', DS, $controller) . $depr . $template;
} }

3
thinkphp/library/traits/model/SoftDelete.php
View File

@ -2,6 +2,7 @@
namespace traits\model; namespace traits\model;
use think\Collection;
use think\db\Query; use think\db\Query;
use think\Model; use think\Model;
@ -111,7 +112,7 @@ trait SoftDelete
} }
// 包含软删除数据 // 包含软删除数据
$query = self::withTrashed(); $query = (new static())->db(false);
if (is_array($data) && key($data) !== 0) { if (is_array($data) && key($data) !== 0) {
$query->where($data); $query->where($data);
$data = null; $data = null;

8
vendor/composer/ClassLoader.php vendored
View File

@ -279,7 +279,7 @@ class ClassLoader
*/ */
public function setApcuPrefix($apcuPrefix) public function setApcuPrefix($apcuPrefix)
{ {
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null; $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
} }
/** /**
@ -377,11 +377,11 @@ class ClassLoader
$subPath = $class; $subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) { while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos); $subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\'; $search = $subPath . '\\';
if (isset($this->prefixDirsPsr4[$search])) { if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) { foreach ($this->prefixDirsPsr4[$search] as $dir) {
$length = $this->prefixLengthsPsr4[$first][$search]; if (file_exists($file = $dir . $pathEnd)) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
return $file; return $file;
} }
} }

296
vendor/composer/autoload_classmap.php vendored
View File

@ -6,301 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir); $baseDir = dirname($vendorDir);
return array( return array(
'Endroid\\QrCode\\Bundle\\Controller\\QrCodeController' => $vendorDir . '/endroid/qrcode/src/Bundle/Controller/QrCodeController.php',
'Endroid\\QrCode\\Bundle\\DependencyInjection\\Configuration' => $vendorDir . '/endroid/qrcode/src/Bundle/DependencyInjection/Configuration.php',
'Endroid\\QrCode\\Bundle\\DependencyInjection\\EndroidQrCodeExtension' => $vendorDir . '/endroid/qrcode/src/Bundle/DependencyInjection/EndroidQrCodeExtension.php',
'Endroid\\QrCode\\Bundle\\EndroidQrCodeBundle' => $vendorDir . '/endroid/qrcode/src/Bundle/EndroidQrCodeBundle.php',
'Endroid\\QrCode\\Bundle\\Twig\\Extension\\QrCodeExtension' => $vendorDir . '/endroid/qrcode/src/Bundle/Twig/Extension/QrCodeExtension.php',
'Endroid\\QrCode\\Exceptions\\DataDoesntExistsException' => $vendorDir . '/endroid/qrcode/src/Exceptions/DataDoesntExistsException.php',
'Endroid\\QrCode\\Exceptions\\FreeTypeLibraryMissingException' => $vendorDir . '/endroid/qrcode/src/Exceptions/FreeTypeLibraryMissingException.php',
'Endroid\\QrCode\\Exceptions\\ImageFunctionFailedException' => $vendorDir . '/endroid/qrcode/src/Exceptions/ImageFunctionFailedException.php',
'Endroid\\QrCode\\Exceptions\\ImageFunctionUnknownException' => $vendorDir . '/endroid/qrcode/src/Exceptions/ImageFunctionUnknownException.php',
'Endroid\\QrCode\\Exceptions\\ImageSizeTooLargeException' => $vendorDir . '/endroid/qrcode/src/Exceptions/ImageSizeTooLargeException.php',
'Endroid\\QrCode\\Exceptions\\ImageTypeInvalidException' => $vendorDir . '/endroid/qrcode/src/Exceptions/ImageTypeInvalidException.php',
'Endroid\\QrCode\\Exceptions\\VersionTooLargeException' => $vendorDir . '/endroid/qrcode/src/Exceptions/VersionTooLargeException.php',
'Endroid\\QrCode\\Factory\\QrCodeFactory' => $vendorDir . '/endroid/qrcode/src/Factory/QrCodeFactory.php',
'Endroid\\QrCode\\QrCode' => $vendorDir . '/endroid/qrcode/src/QrCode.php',
'Ip2Region' => $vendorDir . '/zoujingli/ip2region/Ip2Region.php', 'Ip2Region' => $vendorDir . '/zoujingli/ip2region/Ip2Region.php',
'OSS\\Core\\MimeTypes' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Core/MimeTypes.php',
'OSS\\Core\\OssException' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Core/OssException.php',
'OSS\\Core\\OssUtil' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php',
'OSS\\Http\\RequestCore' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php',
'OSS\\Http\\RequestCore_Exception' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore_Exception.php',
'OSS\\Http\\ResponseCore' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Http/ResponseCore.php',
'OSS\\Model\\BucketInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/BucketInfo.php',
'OSS\\Model\\BucketListInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/BucketListInfo.php',
'OSS\\Model\\CnameConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/CnameConfig.php',
'OSS\\Model\\CorsConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/CorsConfig.php',
'OSS\\Model\\CorsRule' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/CorsRule.php',
'OSS\\Model\\GetLiveChannelHistory' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelHistory.php',
'OSS\\Model\\GetLiveChannelInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelInfo.php',
'OSS\\Model\\GetLiveChannelStatus' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelStatus.php',
'OSS\\Model\\LifecycleAction' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleAction.php',
'OSS\\Model\\LifecycleConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleConfig.php',
'OSS\\Model\\LifecycleRule' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleRule.php',
'OSS\\Model\\ListMultipartUploadInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/ListMultipartUploadInfo.php',
'OSS\\Model\\ListPartsInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/ListPartsInfo.php',
'OSS\\Model\\LiveChannelConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelConfig.php',
'OSS\\Model\\LiveChannelHistory' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelHistory.php',
'OSS\\Model\\LiveChannelInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelInfo.php',
'OSS\\Model\\LiveChannelListInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelListInfo.php',
'OSS\\Model\\LoggingConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/LoggingConfig.php',
'OSS\\Model\\ObjectInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectInfo.php',
'OSS\\Model\\ObjectListInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectListInfo.php',
'OSS\\Model\\PartInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/PartInfo.php',
'OSS\\Model\\PrefixInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/PrefixInfo.php',
'OSS\\Model\\RefererConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/RefererConfig.php',
'OSS\\Model\\StorageCapacityConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php',
'OSS\\Model\\UploadInfo' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/UploadInfo.php',
'OSS\\Model\\WebsiteConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/WebsiteConfig.php',
'OSS\\Model\\XmlConfig' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Model/XmlConfig.php',
'OSS\\OssClient' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/OssClient.php',
'OSS\\Result\\AclResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/AclResult.php',
'OSS\\Result\\AppendResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/AppendResult.php',
'OSS\\Result\\BodyResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/BodyResult.php',
'OSS\\Result\\CallbackResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/CallbackResult.php',
'OSS\\Result\\CopyObjectResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/CopyObjectResult.php',
'OSS\\Result\\DeleteObjectsResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/DeleteObjectsResult.php',
'OSS\\Result\\ExistResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ExistResult.php',
'OSS\\Result\\GetCnameResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetCnameResult.php',
'OSS\\Result\\GetCorsResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetCorsResult.php',
'OSS\\Result\\GetLifecycleResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLifecycleResult.php',
'OSS\\Result\\GetLiveChannelHistoryResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelHistoryResult.php',
'OSS\\Result\\GetLiveChannelInfoResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelInfoResult.php',
'OSS\\Result\\GetLiveChannelStatusResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelStatusResult.php',
'OSS\\Result\\GetLocationResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php',
'OSS\\Result\\GetLoggingResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLoggingResult.php',
'OSS\\Result\\GetRefererResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetRefererResult.php',
'OSS\\Result\\GetStorageCapacityResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php',
'OSS\\Result\\GetWebsiteResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetWebsiteResult.php',
'OSS\\Result\\HeaderResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/HeaderResult.php',
'OSS\\Result\\InitiateMultipartUploadResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/InitiateMultipartUploadResult.php',
'OSS\\Result\\ListBucketsResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListBucketsResult.php',
'OSS\\Result\\ListLiveChannelResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListLiveChannelResult.php',
'OSS\\Result\\ListMultipartUploadResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListMultipartUploadResult.php',
'OSS\\Result\\ListObjectsResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListObjectsResult.php',
'OSS\\Result\\ListPartsResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListPartsResult.php',
'OSS\\Result\\PutLiveChannelResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutLiveChannelResult.php',
'OSS\\Result\\PutSetDeleteResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutSetDeleteResult.php',
'OSS\\Result\\Result' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
'OSS\\Result\\SymlinkResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/SymlinkResult.php',
'OSS\\Result\\UploadPartResult' => $vendorDir . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
'Qiniu\\Auth' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Auth.php',
'Qiniu\\Cdn\\CdnManager' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',
'Qiniu\\Config' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Config.php',
'Qiniu\\Etag' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Etag.php',
'Qiniu\\Http\\Client' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Http/Client.php',
'Qiniu\\Http\\Error' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Http/Error.php',
'Qiniu\\Http\\Request' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Http/Request.php',
'Qiniu\\Http\\Response' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Http/Response.php',
'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\\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',
'Symfony\\Component\\OptionsResolver\\Options' => $vendorDir . '/symfony/options-resolver/Options.php',
'Symfony\\Component\\OptionsResolver\\OptionsResolver' => $vendorDir . '/symfony/options-resolver/OptionsResolver.php',
'Wechat\\Lib\\Cache' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/Lib/Cache.php',
'Wechat\\Lib\\Common' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/Lib/Common.php',
'Wechat\\Lib\\Tools' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/Lib/Tools.php',
'Wechat\\Loader' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/Loader.php',
'Wechat\\WechatCard' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatCard.php',
'Wechat\\WechatCustom' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatCustom.php',
'Wechat\\WechatDevice' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatDevice.php',
'Wechat\\WechatExtends' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatExtends.php',
'Wechat\\WechatHardware' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php',
'Wechat\\WechatMedia' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatMedia.php',
'Wechat\\WechatMenu' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatMenu.php',
'Wechat\\WechatMessage' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatMessage.php',
'Wechat\\WechatOauth' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatOauth.php',
'Wechat\\WechatPay' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatPay.php',
'Wechat\\WechatPoi' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatPoi.php',
'Wechat\\WechatReceive' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatReceive.php',
'Wechat\\WechatScript' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatScript.php',
'Wechat\\WechatService' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatService.php',
'Wechat\\WechatUser' => $vendorDir . '/zoujingli/wechat-php-sdk/Wechat/WechatUser.php',
'think\\App' => $baseDir . '/thinkphp/library/think/App.php',
'think\\Build' => $baseDir . '/thinkphp/library/think/Build.php',
'think\\Cache' => $baseDir . '/thinkphp/library/think/Cache.php',
'think\\Collection' => $baseDir . '/thinkphp/library/think/Collection.php',
'think\\Config' => $baseDir . '/thinkphp/library/think/Config.php',
'think\\Console' => $baseDir . '/thinkphp/library/think/Console.php',
'think\\Controller' => $baseDir . '/thinkphp/library/think/Controller.php',
'think\\Cookie' => $baseDir . '/thinkphp/library/think/Cookie.php',
'think\\Db' => $baseDir . '/thinkphp/library/think/Db.php',
'think\\Debug' => $baseDir . '/thinkphp/library/think/Debug.php',
'think\\Env' => $baseDir . '/thinkphp/library/think/Env.php',
'think\\Error' => $baseDir . '/thinkphp/library/think/Error.php',
'think\\Exception' => $baseDir . '/thinkphp/library/think/Exception.php',
'think\\File' => $baseDir . '/thinkphp/library/think/File.php',
'think\\Hook' => $baseDir . '/thinkphp/library/think/Hook.php',
'think\\Lang' => $baseDir . '/thinkphp/library/think/Lang.php',
'think\\Loader' => $baseDir . '/thinkphp/library/think/Loader.php',
'think\\Log' => $baseDir . '/thinkphp/library/think/Log.php',
'think\\Model' => $baseDir . '/thinkphp/library/think/Model.php',
'think\\Paginator' => $baseDir . '/thinkphp/library/think/Paginator.php',
'think\\Process' => $baseDir . '/thinkphp/library/think/Process.php',
'think\\Queue' => $vendorDir . '/topthink/think-queue/src/Queue.php',
'think\\Request' => $baseDir . '/thinkphp/library/think/Request.php',
'think\\Response' => $baseDir . '/thinkphp/library/think/Response.php',
'think\\Route' => $baseDir . '/thinkphp/library/think/Route.php',
'think\\Session' => $baseDir . '/thinkphp/library/think/Session.php',
'think\\Template' => $baseDir . '/thinkphp/library/think/Template.php',
'think\\Url' => $baseDir . '/thinkphp/library/think/Url.php',
'think\\Validate' => $baseDir . '/thinkphp/library/think/Validate.php',
'think\\View' => $baseDir . '/thinkphp/library/think/View.php',
'think\\cache\\Driver' => $baseDir . '/thinkphp/library/think/cache/Driver.php',
'think\\cache\\driver\\File' => $baseDir . '/thinkphp/library/think/cache/driver/File.php',
'think\\cache\\driver\\Lite' => $baseDir . '/thinkphp/library/think/cache/driver/Lite.php',
'think\\cache\\driver\\Memcache' => $baseDir . '/thinkphp/library/think/cache/driver/Memcache.php',
'think\\cache\\driver\\Memcached' => $baseDir . '/thinkphp/library/think/cache/driver/Memcached.php',
'think\\cache\\driver\\Redis' => $baseDir . '/thinkphp/library/think/cache/driver/Redis.php',
'think\\cache\\driver\\Sqlite' => $baseDir . '/thinkphp/library/think/cache/driver/Sqlite.php',
'think\\cache\\driver\\Wincache' => $baseDir . '/thinkphp/library/think/cache/driver/Wincache.php',
'think\\cache\\driver\\Xcache' => $baseDir . '/thinkphp/library/think/cache/driver/Xcache.php',
'think\\captcha\\Captcha' => $vendorDir . '/topthink/think-captcha/src/Captcha.php',
'think\\captcha\\CaptchaController' => $vendorDir . '/topthink/think-captcha/src/CaptchaController.php',
'think\\composer\\Plugin' => $vendorDir . '/topthink/think-installer/src/Plugin.php',
'think\\composer\\ThinkExtend' => $vendorDir . '/topthink/think-installer/src/ThinkExtend.php',
'think\\composer\\ThinkFramework' => $vendorDir . '/topthink/think-installer/src/ThinkFramework.php',
'think\\composer\\ThinkTesting' => $vendorDir . '/topthink/think-installer/src/ThinkTesting.php',
'think\\config\\driver\\Ini' => $baseDir . '/thinkphp/library/think/config/driver/Ini.php',
'think\\config\\driver\\Json' => $baseDir . '/thinkphp/library/think/config/driver/Json.php',
'think\\config\\driver\\Xml' => $baseDir . '/thinkphp/library/think/config/driver/Xml.php',
'think\\console\\Command' => $baseDir . '/thinkphp/library/think/console/Command.php',
'think\\console\\Input' => $baseDir . '/thinkphp/library/think/console/Input.php',
'think\\console\\Output' => $baseDir . '/thinkphp/library/think/console/Output.php',
'think\\console\\command\\Build' => $baseDir . '/thinkphp/library/think/console/command/Build.php',
'think\\console\\command\\Clear' => $baseDir . '/thinkphp/library/think/console/command/Clear.php',
'think\\console\\command\\Help' => $baseDir . '/thinkphp/library/think/console/command/Help.php',
'think\\console\\command\\Lists' => $baseDir . '/thinkphp/library/think/console/command/Lists.php',
'think\\console\\command\\Make' => $baseDir . '/thinkphp/library/think/console/command/Make.php',
'think\\console\\command\\make\\Controller' => $baseDir . '/thinkphp/library/think/console/command/make/Controller.php',
'think\\console\\command\\make\\Model' => $baseDir . '/thinkphp/library/think/console/command/make/Model.php',
'think\\console\\command\\optimize\\Autoload' => $baseDir . '/thinkphp/library/think/console/command/optimize/Autoload.php',
'think\\console\\command\\optimize\\Config' => $baseDir . '/thinkphp/library/think/console/command/optimize/Config.php',
'think\\console\\command\\optimize\\Route' => $baseDir . '/thinkphp/library/think/console/command/optimize/Route.php',
'think\\console\\command\\optimize\\Schema' => $baseDir . '/thinkphp/library/think/console/command/optimize/Schema.php',
'think\\console\\input\\Argument' => $baseDir . '/thinkphp/library/think/console/input/Argument.php',
'think\\console\\input\\Definition' => $baseDir . '/thinkphp/library/think/console/input/Definition.php',
'think\\console\\input\\Option' => $baseDir . '/thinkphp/library/think/console/input/Option.php',
'think\\console\\output\\Ask' => $baseDir . '/thinkphp/library/think/console/output/Ask.php',
'think\\console\\output\\Descriptor' => $baseDir . '/thinkphp/library/think/console/output/Descriptor.php',
'think\\console\\output\\Formatter' => $baseDir . '/thinkphp/library/think/console/output/Formatter.php',
'think\\console\\output\\Question' => $baseDir . '/thinkphp/library/think/console/output/Question.php',
'think\\console\\output\\descriptor\\Console' => $baseDir . '/thinkphp/library/think/console/output/descriptor/Console.php',
'think\\console\\output\\driver\\Buffer' => $baseDir . '/thinkphp/library/think/console/output/driver/Buffer.php',
'think\\console\\output\\driver\\Console' => $baseDir . '/thinkphp/library/think/console/output/driver/Console.php',
'think\\console\\output\\driver\\Nothing' => $baseDir . '/thinkphp/library/think/console/output/driver/Nothing.php',
'think\\console\\output\\formatter\\Stack' => $baseDir . '/thinkphp/library/think/console/output/formatter/Stack.php',
'think\\console\\output\\formatter\\Style' => $baseDir . '/thinkphp/library/think/console/output/formatter/Style.php',
'think\\console\\output\\question\\Choice' => $baseDir . '/thinkphp/library/think/console/output/question/Choice.php',
'think\\console\\output\\question\\Confirmation' => $baseDir . '/thinkphp/library/think/console/output/question/Confirmation.php',
'think\\controller\\Rest' => $baseDir . '/thinkphp/library/think/controller/Rest.php',
'think\\controller\\Yar' => $baseDir . '/thinkphp/library/think/controller/Yar.php',
'think\\db\\Builder' => $baseDir . '/thinkphp/library/think/db/Builder.php',
'think\\db\\Connection' => $baseDir . '/thinkphp/library/think/db/Connection.php',
'think\\db\\Query' => $baseDir . '/thinkphp/library/think/db/Query.php',
'think\\db\\builder\\Mysql' => $baseDir . '/thinkphp/library/think/db/builder/Mysql.php',
'think\\db\\builder\\Pgsql' => $baseDir . '/thinkphp/library/think/db/builder/Pgsql.php',
'think\\db\\builder\\Sqlite' => $baseDir . '/thinkphp/library/think/db/builder/Sqlite.php',
'think\\db\\builder\\Sqlsrv' => $baseDir . '/thinkphp/library/think/db/builder/Sqlsrv.php',
'think\\db\\connector\\Mysql' => $baseDir . '/thinkphp/library/think/db/connector/Mysql.php',
'think\\db\\connector\\Pgsql' => $baseDir . '/thinkphp/library/think/db/connector/Pgsql.php',
'think\\db\\connector\\Sqlite' => $baseDir . '/thinkphp/library/think/db/connector/Sqlite.php',
'think\\db\\connector\\Sqlsrv' => $baseDir . '/thinkphp/library/think/db/connector/Sqlsrv.php',
'think\\db\\exception\\BindParamException' => $baseDir . '/thinkphp/library/think/db/exception/BindParamException.php',
'think\\db\\exception\\DataNotFoundException' => $baseDir . '/thinkphp/library/think/db/exception/DataNotFoundException.php',
'think\\db\\exception\\ModelNotFoundException' => $baseDir . '/thinkphp/library/think/db/exception/ModelNotFoundException.php',
'think\\debug\\Console' => $baseDir . '/thinkphp/library/think/debug/Console.php',
'think\\debug\\Html' => $baseDir . '/thinkphp/library/think/debug/Html.php',
'think\\exception\\ClassNotFoundException' => $baseDir . '/thinkphp/library/think/exception/ClassNotFoundException.php',
'think\\exception\\DbException' => $baseDir . '/thinkphp/library/think/exception/DbException.php',
'think\\exception\\ErrorException' => $baseDir . '/thinkphp/library/think/exception/ErrorException.php',
'think\\exception\\Handle' => $baseDir . '/thinkphp/library/think/exception/Handle.php',
'think\\exception\\HttpException' => $baseDir . '/thinkphp/library/think/exception/HttpException.php',
'think\\exception\\HttpResponseException' => $baseDir . '/thinkphp/library/think/exception/HttpResponseException.php',
'think\\exception\\PDOException' => $baseDir . '/thinkphp/library/think/exception/PDOException.php',
'think\\exception\\RouteNotFoundException' => $baseDir . '/thinkphp/library/think/exception/RouteNotFoundException.php',
'think\\exception\\TemplateNotFoundException' => $baseDir . '/thinkphp/library/think/exception/TemplateNotFoundException.php',
'think\\exception\\ThrowableError' => $baseDir . '/thinkphp/library/think/exception/ThrowableError.php',
'think\\exception\\ValidateException' => $baseDir . '/thinkphp/library/think/exception/ValidateException.php',
'think\\helper\\Arr' => $vendorDir . '/topthink/think-helper/src/Arr.php',
'think\\helper\\Hash' => $vendorDir . '/topthink/think-helper/src/Hash.php',
'think\\helper\\Str' => $vendorDir . '/topthink/think-helper/src/Str.php',
'think\\helper\\Time' => $vendorDir . '/topthink/think-helper/src/Time.php',
'think\\helper\\hash\\Bcrypt' => $vendorDir . '/topthink/think-helper/src/hash/Bcrypt.php',
'think\\helper\\hash\\Md5' => $vendorDir . '/topthink/think-helper/src/hash/Md5.php',
'think\\log\\driver\\File' => $baseDir . '/thinkphp/library/think/log/driver/File.php',
'think\\log\\driver\\Socket' => $baseDir . '/thinkphp/library/think/log/driver/Socket.php',
'think\\log\\driver\\Test' => $baseDir . '/thinkphp/library/think/log/driver/Test.php',
'think\\model\\Collection' => $baseDir . '/thinkphp/library/think/model/Collection.php',
'think\\model\\Merge' => $baseDir . '/thinkphp/library/think/model/Merge.php',
'think\\model\\Pivot' => $baseDir . '/thinkphp/library/think/model/Pivot.php',
'think\\model\\Relation' => $baseDir . '/thinkphp/library/think/model/Relation.php',
'think\\model\\relation\\BelongsTo' => $baseDir . '/thinkphp/library/think/model/relation/BelongsTo.php',
'think\\model\\relation\\BelongsToMany' => $baseDir . '/thinkphp/library/think/model/relation/BelongsToMany.php',
'think\\model\\relation\\HasMany' => $baseDir . '/thinkphp/library/think/model/relation/HasMany.php',
'think\\model\\relation\\HasManyThrough' => $baseDir . '/thinkphp/library/think/model/relation/HasManyThrough.php',
'think\\model\\relation\\HasOne' => $baseDir . '/thinkphp/library/think/model/relation/HasOne.php',
'think\\model\\relation\\MorphMany' => $baseDir . '/thinkphp/library/think/model/relation/MorphMany.php',
'think\\model\\relation\\MorphOne' => $baseDir . '/thinkphp/library/think/model/relation/MorphOne.php',
'think\\model\\relation\\MorphTo' => $baseDir . '/thinkphp/library/think/model/relation/MorphTo.php',
'think\\model\\relation\\OneToOne' => $baseDir . '/thinkphp/library/think/model/relation/OneToOne.php',
'think\\mongo\\Builder' => $vendorDir . '/topthink/think-mongo/src/Builder.php',
'think\\mongo\\Connection' => $vendorDir . '/topthink/think-mongo/src/Connection.php',
'think\\mongo\\Query' => $vendorDir . '/topthink/think-mongo/src/Query.php',
'think\\paginator\\driver\\Bootstrap' => $baseDir . '/thinkphp/library/think/paginator/driver/Bootstrap.php',
'think\\process\\Builder' => $baseDir . '/thinkphp/library/think/process/Builder.php',
'think\\process\\Utils' => $baseDir . '/thinkphp/library/think/process/Utils.php',
'think\\process\\exception\\Failed' => $baseDir . '/thinkphp/library/think/process/exception/Failed.php',
'think\\process\\exception\\Timeout' => $baseDir . '/thinkphp/library/think/process/exception/Timeout.php',
'think\\process\\pipes\\Pipes' => $baseDir . '/thinkphp/library/think/process/pipes/Pipes.php',
'think\\process\\pipes\\Unix' => $baseDir . '/thinkphp/library/think/process/pipes/Unix.php',
'think\\process\\pipes\\Windows' => $baseDir . '/thinkphp/library/think/process/pipes/Windows.php',
'think\\queue\\CallQueuedHandler' => $vendorDir . '/topthink/think-queue/src/queue/CallQueuedHandler.php',
'think\\queue\\Connector' => $vendorDir . '/topthink/think-queue/src/queue/Connector.php',
'think\\queue\\Job' => $vendorDir . '/topthink/think-queue/src/queue/Job.php',
'think\\queue\\Listener' => $vendorDir . '/topthink/think-queue/src/queue/Listener.php',
'think\\queue\\Queueable' => $vendorDir . '/topthink/think-queue/src/queue/Queueable.php',
'think\\queue\\ShouldQueue' => $vendorDir . '/topthink/think-queue/src/queue/ShouldQueue.php',
'think\\queue\\Worker' => $vendorDir . '/topthink/think-queue/src/queue/Worker.php',
'think\\queue\\command\\Listen' => $vendorDir . '/topthink/think-queue/src/queue/command/Listen.php',
'think\\queue\\command\\Restart' => $vendorDir . '/topthink/think-queue/src/queue/command/Restart.php',
'think\\queue\\command\\Subscribe' => $vendorDir . '/topthink/think-queue/src/queue/command/Subscribe.php',
'think\\queue\\command\\Work' => $vendorDir . '/topthink/think-queue/src/queue/command/Work.php',
'think\\queue\\connector\\Database' => $vendorDir . '/topthink/think-queue/src/queue/connector/Database.php',
'think\\queue\\connector\\Redis' => $vendorDir . '/topthink/think-queue/src/queue/connector/Redis.php',
'think\\queue\\connector\\Sync' => $vendorDir . '/topthink/think-queue/src/queue/connector/Sync.php',
'think\\queue\\connector\\Topthink' => $vendorDir . '/topthink/think-queue/src/queue/connector/Topthink.php',
'think\\queue\\job\\Database' => $vendorDir . '/topthink/think-queue/src/queue/job/Database.php',
'think\\queue\\job\\Redis' => $vendorDir . '/topthink/think-queue/src/queue/job/Redis.php',
'think\\queue\\job\\Sync' => $vendorDir . '/topthink/think-queue/src/queue/job/Sync.php',
'think\\queue\\job\\Topthink' => $vendorDir . '/topthink/think-queue/src/queue/job/Topthink.php',
'think\\response\\Json' => $baseDir . '/thinkphp/library/think/response/Json.php',
'think\\response\\Jsonp' => $baseDir . '/thinkphp/library/think/response/Jsonp.php',
'think\\response\\Redirect' => $baseDir . '/thinkphp/library/think/response/Redirect.php',
'think\\response\\View' => $baseDir . '/thinkphp/library/think/response/View.php',
'think\\response\\Xml' => $baseDir . '/thinkphp/library/think/response/Xml.php',
'think\\session\\driver\\Memcache' => $baseDir . '/thinkphp/library/think/session/driver/Memcache.php',
'think\\session\\driver\\Memcached' => $baseDir . '/thinkphp/library/think/session/driver/Memcached.php',
'think\\session\\driver\\Redis' => $baseDir . '/thinkphp/library/think/session/driver/Redis.php',
'think\\template\\TagLib' => $baseDir . '/thinkphp/library/think/template/TagLib.php',
'think\\template\\driver\\File' => $baseDir . '/thinkphp/library/think/template/driver/File.php',
'think\\template\\taglib\\Cx' => $baseDir . '/thinkphp/library/think/template/taglib/Cx.php',
'think\\view\\driver\\Php' => $baseDir . '/thinkphp/library/think/view/driver/Php.php',
'think\\view\\driver\\Think' => $baseDir . '/thinkphp/library/think/view/driver/Think.php',
); );

2
vendor/composer/autoload_psr4.php vendored
View File

@ -15,5 +15,5 @@ return array(
'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'), 'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
'Qiniu\\' => array($vendorDir . '/qiniu/php-sdk/src/Qiniu'), 'Qiniu\\' => array($vendorDir . '/qiniu/php-sdk/src/Qiniu'),
'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'), 'OSS\\' => array($vendorDir . '/aliyuncs/oss-sdk-php/src/OSS'),
'Endroid\\QrCode\\' => array($vendorDir . '/endroid/qrcode/src'), 'Endroid\\QrCode\\' => array($vendorDir . '/endroid/qr-code/src'),
); );

298
vendor/composer/autoload_static.php vendored
View File

@ -84,308 +84,12 @@ class ComposerStaticInit4bc699ddf295b08fae1ab3711fa28eb4
), ),
'Endroid\\QrCode\\' => 'Endroid\\QrCode\\' =>
array ( array (
0 => __DIR__ . '/..' . '/endroid/qrcode/src', 0 => __DIR__ . '/..' . '/endroid/qr-code/src',
), ),
); );
public static $classMap = array ( public static $classMap = array (
'Endroid\\QrCode\\Bundle\\Controller\\QrCodeController' => __DIR__ . '/..' . '/endroid/qrcode/src/Bundle/Controller/QrCodeController.php',
'Endroid\\QrCode\\Bundle\\DependencyInjection\\Configuration' => __DIR__ . '/..' . '/endroid/qrcode/src/Bundle/DependencyInjection/Configuration.php',
'Endroid\\QrCode\\Bundle\\DependencyInjection\\EndroidQrCodeExtension' => __DIR__ . '/..' . '/endroid/qrcode/src/Bundle/DependencyInjection/EndroidQrCodeExtension.php',
'Endroid\\QrCode\\Bundle\\EndroidQrCodeBundle' => __DIR__ . '/..' . '/endroid/qrcode/src/Bundle/EndroidQrCodeBundle.php',
'Endroid\\QrCode\\Bundle\\Twig\\Extension\\QrCodeExtension' => __DIR__ . '/..' . '/endroid/qrcode/src/Bundle/Twig/Extension/QrCodeExtension.php',
'Endroid\\QrCode\\Exceptions\\DataDoesntExistsException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/DataDoesntExistsException.php',
'Endroid\\QrCode\\Exceptions\\FreeTypeLibraryMissingException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/FreeTypeLibraryMissingException.php',
'Endroid\\QrCode\\Exceptions\\ImageFunctionFailedException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/ImageFunctionFailedException.php',
'Endroid\\QrCode\\Exceptions\\ImageFunctionUnknownException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/ImageFunctionUnknownException.php',
'Endroid\\QrCode\\Exceptions\\ImageSizeTooLargeException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/ImageSizeTooLargeException.php',
'Endroid\\QrCode\\Exceptions\\ImageTypeInvalidException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/ImageTypeInvalidException.php',
'Endroid\\QrCode\\Exceptions\\VersionTooLargeException' => __DIR__ . '/..' . '/endroid/qrcode/src/Exceptions/VersionTooLargeException.php',
'Endroid\\QrCode\\Factory\\QrCodeFactory' => __DIR__ . '/..' . '/endroid/qrcode/src/Factory/QrCodeFactory.php',
'Endroid\\QrCode\\QrCode' => __DIR__ . '/..' . '/endroid/qrcode/src/QrCode.php',
'Ip2Region' => __DIR__ . '/..' . '/zoujingli/ip2region/Ip2Region.php', 'Ip2Region' => __DIR__ . '/..' . '/zoujingli/ip2region/Ip2Region.php',
'OSS\\Core\\MimeTypes' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Core/MimeTypes.php',
'OSS\\Core\\OssException' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Core/OssException.php',
'OSS\\Core\\OssUtil' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Core/OssUtil.php',
'OSS\\Http\\RequestCore' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore.php',
'OSS\\Http\\RequestCore_Exception' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Http/RequestCore_Exception.php',
'OSS\\Http\\ResponseCore' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Http/ResponseCore.php',
'OSS\\Model\\BucketInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/BucketInfo.php',
'OSS\\Model\\BucketListInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/BucketListInfo.php',
'OSS\\Model\\CnameConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/CnameConfig.php',
'OSS\\Model\\CorsConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/CorsConfig.php',
'OSS\\Model\\CorsRule' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/CorsRule.php',
'OSS\\Model\\GetLiveChannelHistory' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelHistory.php',
'OSS\\Model\\GetLiveChannelInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelInfo.php',
'OSS\\Model\\GetLiveChannelStatus' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/GetLiveChannelStatus.php',
'OSS\\Model\\LifecycleAction' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleAction.php',
'OSS\\Model\\LifecycleConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleConfig.php',
'OSS\\Model\\LifecycleRule' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LifecycleRule.php',
'OSS\\Model\\ListMultipartUploadInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/ListMultipartUploadInfo.php',
'OSS\\Model\\ListPartsInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/ListPartsInfo.php',
'OSS\\Model\\LiveChannelConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelConfig.php',
'OSS\\Model\\LiveChannelHistory' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelHistory.php',
'OSS\\Model\\LiveChannelInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelInfo.php',
'OSS\\Model\\LiveChannelListInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LiveChannelListInfo.php',
'OSS\\Model\\LoggingConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/LoggingConfig.php',
'OSS\\Model\\ObjectInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectInfo.php',
'OSS\\Model\\ObjectListInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/ObjectListInfo.php',
'OSS\\Model\\PartInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/PartInfo.php',
'OSS\\Model\\PrefixInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/PrefixInfo.php',
'OSS\\Model\\RefererConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/RefererConfig.php',
'OSS\\Model\\StorageCapacityConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/StorageCapacityConfig.php',
'OSS\\Model\\UploadInfo' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/UploadInfo.php',
'OSS\\Model\\WebsiteConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/WebsiteConfig.php',
'OSS\\Model\\XmlConfig' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Model/XmlConfig.php',
'OSS\\OssClient' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/OssClient.php',
'OSS\\Result\\AclResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/AclResult.php',
'OSS\\Result\\AppendResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/AppendResult.php',
'OSS\\Result\\BodyResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/BodyResult.php',
'OSS\\Result\\CallbackResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/CallbackResult.php',
'OSS\\Result\\CopyObjectResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/CopyObjectResult.php',
'OSS\\Result\\DeleteObjectsResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/DeleteObjectsResult.php',
'OSS\\Result\\ExistResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ExistResult.php',
'OSS\\Result\\GetCnameResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetCnameResult.php',
'OSS\\Result\\GetCorsResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetCorsResult.php',
'OSS\\Result\\GetLifecycleResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLifecycleResult.php',
'OSS\\Result\\GetLiveChannelHistoryResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelHistoryResult.php',
'OSS\\Result\\GetLiveChannelInfoResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelInfoResult.php',
'OSS\\Result\\GetLiveChannelStatusResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLiveChannelStatusResult.php',
'OSS\\Result\\GetLocationResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLocationResult.php',
'OSS\\Result\\GetLoggingResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetLoggingResult.php',
'OSS\\Result\\GetRefererResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetRefererResult.php',
'OSS\\Result\\GetStorageCapacityResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetStorageCapacityResult.php',
'OSS\\Result\\GetWebsiteResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/GetWebsiteResult.php',
'OSS\\Result\\HeaderResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/HeaderResult.php',
'OSS\\Result\\InitiateMultipartUploadResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/InitiateMultipartUploadResult.php',
'OSS\\Result\\ListBucketsResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListBucketsResult.php',
'OSS\\Result\\ListLiveChannelResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListLiveChannelResult.php',
'OSS\\Result\\ListMultipartUploadResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListMultipartUploadResult.php',
'OSS\\Result\\ListObjectsResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListObjectsResult.php',
'OSS\\Result\\ListPartsResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/ListPartsResult.php',
'OSS\\Result\\PutLiveChannelResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutLiveChannelResult.php',
'OSS\\Result\\PutSetDeleteResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/PutSetDeleteResult.php',
'OSS\\Result\\Result' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/Result.php',
'OSS\\Result\\SymlinkResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/SymlinkResult.php',
'OSS\\Result\\UploadPartResult' => __DIR__ . '/..' . '/aliyuncs/oss-sdk-php/src/OSS/Result/UploadPartResult.php',
'Qiniu\\Auth' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Auth.php',
'Qiniu\\Cdn\\CdnManager' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Cdn/CdnManager.php',
'Qiniu\\Config' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Config.php',
'Qiniu\\Etag' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Etag.php',
'Qiniu\\Http\\Client' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Http/Client.php',
'Qiniu\\Http\\Error' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Http/Error.php',
'Qiniu\\Http\\Request' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Http/Request.php',
'Qiniu\\Http\\Response' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Http/Response.php',
'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\\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',
'Symfony\\Component\\OptionsResolver\\Options' => __DIR__ . '/..' . '/symfony/options-resolver/Options.php',
'Symfony\\Component\\OptionsResolver\\OptionsResolver' => __DIR__ . '/..' . '/symfony/options-resolver/OptionsResolver.php',
'Wechat\\Lib\\Cache' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/Lib/Cache.php',
'Wechat\\Lib\\Common' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/Lib/Common.php',
'Wechat\\Lib\\Tools' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/Lib/Tools.php',
'Wechat\\Loader' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/Loader.php',
'Wechat\\WechatCard' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatCard.php',
'Wechat\\WechatCustom' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatCustom.php',
'Wechat\\WechatDevice' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatDevice.php',
'Wechat\\WechatExtends' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatExtends.php',
'Wechat\\WechatHardware' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatHardware.php',
'Wechat\\WechatMedia' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatMedia.php',
'Wechat\\WechatMenu' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatMenu.php',
'Wechat\\WechatMessage' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatMessage.php',
'Wechat\\WechatOauth' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatOauth.php',
'Wechat\\WechatPay' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatPay.php',
'Wechat\\WechatPoi' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatPoi.php',
'Wechat\\WechatReceive' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatReceive.php',
'Wechat\\WechatScript' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatScript.php',
'Wechat\\WechatService' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatService.php',
'Wechat\\WechatUser' => __DIR__ . '/..' . '/zoujingli/wechat-php-sdk/Wechat/WechatUser.php',
'think\\App' => __DIR__ . '/../..' . '/thinkphp/library/think/App.php',
'think\\Build' => __DIR__ . '/../..' . '/thinkphp/library/think/Build.php',
'think\\Cache' => __DIR__ . '/../..' . '/thinkphp/library/think/Cache.php',
'think\\Collection' => __DIR__ . '/../..' . '/thinkphp/library/think/Collection.php',
'think\\Config' => __DIR__ . '/../..' . '/thinkphp/library/think/Config.php',
'think\\Console' => __DIR__ . '/../..' . '/thinkphp/library/think/Console.php',
'think\\Controller' => __DIR__ . '/../..' . '/thinkphp/library/think/Controller.php',
'think\\Cookie' => __DIR__ . '/../..' . '/thinkphp/library/think/Cookie.php',
'think\\Db' => __DIR__ . '/../..' . '/thinkphp/library/think/Db.php',
'think\\Debug' => __DIR__ . '/../..' . '/thinkphp/library/think/Debug.php',
'think\\Env' => __DIR__ . '/../..' . '/thinkphp/library/think/Env.php',
'think\\Error' => __DIR__ . '/../..' . '/thinkphp/library/think/Error.php',
'think\\Exception' => __DIR__ . '/../..' . '/thinkphp/library/think/Exception.php',
'think\\File' => __DIR__ . '/../..' . '/thinkphp/library/think/File.php',
'think\\Hook' => __DIR__ . '/../..' . '/thinkphp/library/think/Hook.php',
'think\\Lang' => __DIR__ . '/../..' . '/thinkphp/library/think/Lang.php',
'think\\Loader' => __DIR__ . '/../..' . '/thinkphp/library/think/Loader.php',
'think\\Log' => __DIR__ . '/../..' . '/thinkphp/library/think/Log.php',
'think\\Model' => __DIR__ . '/../..' . '/thinkphp/library/think/Model.php',
'think\\Paginator' => __DIR__ . '/../..' . '/thinkphp/library/think/Paginator.php',
'think\\Process' => __DIR__ . '/../..' . '/thinkphp/library/think/Process.php',
'think\\Queue' => __DIR__ . '/..' . '/topthink/think-queue/src/Queue.php',
'think\\Request' => __DIR__ . '/../..' . '/thinkphp/library/think/Request.php',
'think\\Response' => __DIR__ . '/../..' . '/thinkphp/library/think/Response.php',
'think\\Route' => __DIR__ . '/../..' . '/thinkphp/library/think/Route.php',
'think\\Session' => __DIR__ . '/../..' . '/thinkphp/library/think/Session.php',
'think\\Template' => __DIR__ . '/../..' . '/thinkphp/library/think/Template.php',
'think\\Url' => __DIR__ . '/../..' . '/thinkphp/library/think/Url.php',
'think\\Validate' => __DIR__ . '/../..' . '/thinkphp/library/think/Validate.php',
'think\\View' => __DIR__ . '/../..' . '/thinkphp/library/think/View.php',
'think\\cache\\Driver' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/Driver.php',
'think\\cache\\driver\\File' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/File.php',
'think\\cache\\driver\\Lite' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Lite.php',
'think\\cache\\driver\\Memcache' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Memcache.php',
'think\\cache\\driver\\Memcached' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Memcached.php',
'think\\cache\\driver\\Redis' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Redis.php',
'think\\cache\\driver\\Sqlite' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Sqlite.php',
'think\\cache\\driver\\Wincache' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Wincache.php',
'think\\cache\\driver\\Xcache' => __DIR__ . '/../..' . '/thinkphp/library/think/cache/driver/Xcache.php',
'think\\captcha\\Captcha' => __DIR__ . '/..' . '/topthink/think-captcha/src/Captcha.php',
'think\\captcha\\CaptchaController' => __DIR__ . '/..' . '/topthink/think-captcha/src/CaptchaController.php',
'think\\composer\\Plugin' => __DIR__ . '/..' . '/topthink/think-installer/src/Plugin.php',
'think\\composer\\ThinkExtend' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkExtend.php',
'think\\composer\\ThinkFramework' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkFramework.php',
'think\\composer\\ThinkTesting' => __DIR__ . '/..' . '/topthink/think-installer/src/ThinkTesting.php',
'think\\config\\driver\\Ini' => __DIR__ . '/../..' . '/thinkphp/library/think/config/driver/Ini.php',
'think\\config\\driver\\Json' => __DIR__ . '/../..' . '/thinkphp/library/think/config/driver/Json.php',
'think\\config\\driver\\Xml' => __DIR__ . '/../..' . '/thinkphp/library/think/config/driver/Xml.php',
'think\\console\\Command' => __DIR__ . '/../..' . '/thinkphp/library/think/console/Command.php',
'think\\console\\Input' => __DIR__ . '/../..' . '/thinkphp/library/think/console/Input.php',
'think\\console\\Output' => __DIR__ . '/../..' . '/thinkphp/library/think/console/Output.php',
'think\\console\\command\\Build' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/Build.php',
'think\\console\\command\\Clear' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/Clear.php',
'think\\console\\command\\Help' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/Help.php',
'think\\console\\command\\Lists' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/Lists.php',
'think\\console\\command\\Make' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/Make.php',
'think\\console\\command\\make\\Controller' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/make/Controller.php',
'think\\console\\command\\make\\Model' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/make/Model.php',
'think\\console\\command\\optimize\\Autoload' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/optimize/Autoload.php',
'think\\console\\command\\optimize\\Config' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/optimize/Config.php',
'think\\console\\command\\optimize\\Route' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/optimize/Route.php',
'think\\console\\command\\optimize\\Schema' => __DIR__ . '/../..' . '/thinkphp/library/think/console/command/optimize/Schema.php',
'think\\console\\input\\Argument' => __DIR__ . '/../..' . '/thinkphp/library/think/console/input/Argument.php',
'think\\console\\input\\Definition' => __DIR__ . '/../..' . '/thinkphp/library/think/console/input/Definition.php',
'think\\console\\input\\Option' => __DIR__ . '/../..' . '/thinkphp/library/think/console/input/Option.php',
'think\\console\\output\\Ask' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/Ask.php',
'think\\console\\output\\Descriptor' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/Descriptor.php',
'think\\console\\output\\Formatter' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/Formatter.php',
'think\\console\\output\\Question' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/Question.php',
'think\\console\\output\\descriptor\\Console' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/descriptor/Console.php',
'think\\console\\output\\driver\\Buffer' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/driver/Buffer.php',
'think\\console\\output\\driver\\Console' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/driver/Console.php',
'think\\console\\output\\driver\\Nothing' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/driver/Nothing.php',
'think\\console\\output\\formatter\\Stack' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/formatter/Stack.php',
'think\\console\\output\\formatter\\Style' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/formatter/Style.php',
'think\\console\\output\\question\\Choice' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/question/Choice.php',
'think\\console\\output\\question\\Confirmation' => __DIR__ . '/../..' . '/thinkphp/library/think/console/output/question/Confirmation.php',
'think\\controller\\Rest' => __DIR__ . '/../..' . '/thinkphp/library/think/controller/Rest.php',
'think\\controller\\Yar' => __DIR__ . '/../..' . '/thinkphp/library/think/controller/Yar.php',
'think\\db\\Builder' => __DIR__ . '/../..' . '/thinkphp/library/think/db/Builder.php',
'think\\db\\Connection' => __DIR__ . '/../..' . '/thinkphp/library/think/db/Connection.php',
'think\\db\\Query' => __DIR__ . '/../..' . '/thinkphp/library/think/db/Query.php',
'think\\db\\builder\\Mysql' => __DIR__ . '/../..' . '/thinkphp/library/think/db/builder/Mysql.php',
'think\\db\\builder\\Pgsql' => __DIR__ . '/../..' . '/thinkphp/library/think/db/builder/Pgsql.php',
'think\\db\\builder\\Sqlite' => __DIR__ . '/../..' . '/thinkphp/library/think/db/builder/Sqlite.php',
'think\\db\\builder\\Sqlsrv' => __DIR__ . '/../..' . '/thinkphp/library/think/db/builder/Sqlsrv.php',
'think\\db\\connector\\Mysql' => __DIR__ . '/../..' . '/thinkphp/library/think/db/connector/Mysql.php',
'think\\db\\connector\\Pgsql' => __DIR__ . '/../..' . '/thinkphp/library/think/db/connector/Pgsql.php',
'think\\db\\connector\\Sqlite' => __DIR__ . '/../..' . '/thinkphp/library/think/db/connector/Sqlite.php',
'think\\db\\connector\\Sqlsrv' => __DIR__ . '/../..' . '/thinkphp/library/think/db/connector/Sqlsrv.php',
'think\\db\\exception\\BindParamException' => __DIR__ . '/../..' . '/thinkphp/library/think/db/exception/BindParamException.php',
'think\\db\\exception\\DataNotFoundException' => __DIR__ . '/../..' . '/thinkphp/library/think/db/exception/DataNotFoundException.php',
'think\\db\\exception\\ModelNotFoundException' => __DIR__ . '/../..' . '/thinkphp/library/think/db/exception/ModelNotFoundException.php',
'think\\debug\\Console' => __DIR__ . '/../..' . '/thinkphp/library/think/debug/Console.php',
'think\\debug\\Html' => __DIR__ . '/../..' . '/thinkphp/library/think/debug/Html.php',
'think\\exception\\ClassNotFoundException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/ClassNotFoundException.php',
'think\\exception\\DbException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/DbException.php',
'think\\exception\\ErrorException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/ErrorException.php',
'think\\exception\\Handle' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/Handle.php',
'think\\exception\\HttpException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/HttpException.php',
'think\\exception\\HttpResponseException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/HttpResponseException.php',
'think\\exception\\PDOException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/PDOException.php',
'think\\exception\\RouteNotFoundException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/RouteNotFoundException.php',
'think\\exception\\TemplateNotFoundException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/TemplateNotFoundException.php',
'think\\exception\\ThrowableError' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/ThrowableError.php',
'think\\exception\\ValidateException' => __DIR__ . '/../..' . '/thinkphp/library/think/exception/ValidateException.php',
'think\\helper\\Arr' => __DIR__ . '/..' . '/topthink/think-helper/src/Arr.php',
'think\\helper\\Hash' => __DIR__ . '/..' . '/topthink/think-helper/src/Hash.php',
'think\\helper\\Str' => __DIR__ . '/..' . '/topthink/think-helper/src/Str.php',
'think\\helper\\Time' => __DIR__ . '/..' . '/topthink/think-helper/src/Time.php',
'think\\helper\\hash\\Bcrypt' => __DIR__ . '/..' . '/topthink/think-helper/src/hash/Bcrypt.php',
'think\\helper\\hash\\Md5' => __DIR__ . '/..' . '/topthink/think-helper/src/hash/Md5.php',
'think\\log\\driver\\File' => __DIR__ . '/../..' . '/thinkphp/library/think/log/driver/File.php',
'think\\log\\driver\\Socket' => __DIR__ . '/../..' . '/thinkphp/library/think/log/driver/Socket.php',
'think\\log\\driver\\Test' => __DIR__ . '/../..' . '/thinkphp/library/think/log/driver/Test.php',
'think\\model\\Collection' => __DIR__ . '/../..' . '/thinkphp/library/think/model/Collection.php',
'think\\model\\Merge' => __DIR__ . '/../..' . '/thinkphp/library/think/model/Merge.php',
'think\\model\\Pivot' => __DIR__ . '/../..' . '/thinkphp/library/think/model/Pivot.php',
'think\\model\\Relation' => __DIR__ . '/../..' . '/thinkphp/library/think/model/Relation.php',
'think\\model\\relation\\BelongsTo' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/BelongsTo.php',
'think\\model\\relation\\BelongsToMany' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/BelongsToMany.php',
'think\\model\\relation\\HasMany' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/HasMany.php',
'think\\model\\relation\\HasManyThrough' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/HasManyThrough.php',
'think\\model\\relation\\HasOne' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/HasOne.php',
'think\\model\\relation\\MorphMany' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/MorphMany.php',
'think\\model\\relation\\MorphOne' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/MorphOne.php',
'think\\model\\relation\\MorphTo' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/MorphTo.php',
'think\\model\\relation\\OneToOne' => __DIR__ . '/../..' . '/thinkphp/library/think/model/relation/OneToOne.php',
'think\\mongo\\Builder' => __DIR__ . '/..' . '/topthink/think-mongo/src/Builder.php',
'think\\mongo\\Connection' => __DIR__ . '/..' . '/topthink/think-mongo/src/Connection.php',
'think\\mongo\\Query' => __DIR__ . '/..' . '/topthink/think-mongo/src/Query.php',
'think\\paginator\\driver\\Bootstrap' => __DIR__ . '/../..' . '/thinkphp/library/think/paginator/driver/Bootstrap.php',
'think\\process\\Builder' => __DIR__ . '/../..' . '/thinkphp/library/think/process/Builder.php',
'think\\process\\Utils' => __DIR__ . '/../..' . '/thinkphp/library/think/process/Utils.php',
'think\\process\\exception\\Failed' => __DIR__ . '/../..' . '/thinkphp/library/think/process/exception/Failed.php',
'think\\process\\exception\\Timeout' => __DIR__ . '/../..' . '/thinkphp/library/think/process/exception/Timeout.php',
'think\\process\\pipes\\Pipes' => __DIR__ . '/../..' . '/thinkphp/library/think/process/pipes/Pipes.php',
'think\\process\\pipes\\Unix' => __DIR__ . '/../..' . '/thinkphp/library/think/process/pipes/Unix.php',
'think\\process\\pipes\\Windows' => __DIR__ . '/../..' . '/thinkphp/library/think/process/pipes/Windows.php',
'think\\queue\\CallQueuedHandler' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/CallQueuedHandler.php',
'think\\queue\\Connector' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/Connector.php',
'think\\queue\\Job' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/Job.php',
'think\\queue\\Listener' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/Listener.php',
'think\\queue\\Queueable' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/Queueable.php',
'think\\queue\\ShouldQueue' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/ShouldQueue.php',
'think\\queue\\Worker' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/Worker.php',
'think\\queue\\command\\Listen' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/command/Listen.php',
'think\\queue\\command\\Restart' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/command/Restart.php',
'think\\queue\\command\\Subscribe' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/command/Subscribe.php',
'think\\queue\\command\\Work' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/command/Work.php',
'think\\queue\\connector\\Database' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/connector/Database.php',
'think\\queue\\connector\\Redis' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/connector/Redis.php',
'think\\queue\\connector\\Sync' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/connector/Sync.php',
'think\\queue\\connector\\Topthink' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/connector/Topthink.php',
'think\\queue\\job\\Database' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/job/Database.php',
'think\\queue\\job\\Redis' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/job/Redis.php',
'think\\queue\\job\\Sync' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/job/Sync.php',
'think\\queue\\job\\Topthink' => __DIR__ . '/..' . '/topthink/think-queue/src/queue/job/Topthink.php',
'think\\response\\Json' => __DIR__ . '/../..' . '/thinkphp/library/think/response/Json.php',
'think\\response\\Jsonp' => __DIR__ . '/../..' . '/thinkphp/library/think/response/Jsonp.php',
'think\\response\\Redirect' => __DIR__ . '/../..' . '/thinkphp/library/think/response/Redirect.php',
'think\\response\\View' => __DIR__ . '/../..' . '/thinkphp/library/think/response/View.php',
'think\\response\\Xml' => __DIR__ . '/../..' . '/thinkphp/library/think/response/Xml.php',
'think\\session\\driver\\Memcache' => __DIR__ . '/../..' . '/thinkphp/library/think/session/driver/Memcache.php',
'think\\session\\driver\\Memcached' => __DIR__ . '/../..' . '/thinkphp/library/think/session/driver/Memcached.php',
'think\\session\\driver\\Redis' => __DIR__ . '/../..' . '/thinkphp/library/think/session/driver/Redis.php',
'think\\template\\TagLib' => __DIR__ . '/../..' . '/thinkphp/library/think/template/TagLib.php',
'think\\template\\driver\\File' => __DIR__ . '/../..' . '/thinkphp/library/think/template/driver/File.php',
'think\\template\\taglib\\Cx' => __DIR__ . '/../..' . '/thinkphp/library/think/template/taglib/Cx.php',
'think\\view\\driver\\Php' => __DIR__ . '/../..' . '/thinkphp/library/think/view/driver/Php.php',
'think\\view\\driver\\Think' => __DIR__ . '/../..' . '/thinkphp/library/think/view/driver/Think.php',
); );
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)

949
vendor/composer/installed.json vendored
View File

File diff suppressed because it is too large Load Diff

0
vendor/endroid/qrcode/.gitignore → vendor/endroid/qr-code/.gitignore vendored
View File

0
vendor/endroid/qrcode/.travis.yml → vendor/endroid/qr-code/.travis.yml vendored
View File

0
vendor/endroid/qrcode/LICENSE → vendor/endroid/qr-code/LICENSE vendored
View File

0
vendor/endroid/qrcode/README.md → vendor/endroid/qr-code/README.md vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv10_0.dat → vendor/endroid/qr-code/assets/data/qrv10_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv10_1.dat → vendor/endroid/qr-code/assets/data/qrv10_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv10_2.dat → vendor/endroid/qr-code/assets/data/qrv10_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv10_3.dat → vendor/endroid/qr-code/assets/data/qrv10_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv11_0.dat → vendor/endroid/qr-code/assets/data/qrv11_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv11_1.dat → vendor/endroid/qr-code/assets/data/qrv11_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv11_2.dat → vendor/endroid/qr-code/assets/data/qrv11_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv11_3.dat → vendor/endroid/qr-code/assets/data/qrv11_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv12_0.dat → vendor/endroid/qr-code/assets/data/qrv12_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv12_1.dat → vendor/endroid/qr-code/assets/data/qrv12_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv12_2.dat → vendor/endroid/qr-code/assets/data/qrv12_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv12_3.dat → vendor/endroid/qr-code/assets/data/qrv12_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv13_0.dat → vendor/endroid/qr-code/assets/data/qrv13_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv13_1.dat → vendor/endroid/qr-code/assets/data/qrv13_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv13_2.dat → vendor/endroid/qr-code/assets/data/qrv13_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv13_3.dat → vendor/endroid/qr-code/assets/data/qrv13_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv14_0.dat → vendor/endroid/qr-code/assets/data/qrv14_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv14_1.dat → vendor/endroid/qr-code/assets/data/qrv14_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv14_2.dat → vendor/endroid/qr-code/assets/data/qrv14_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv14_3.dat → vendor/endroid/qr-code/assets/data/qrv14_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv15_0.dat → vendor/endroid/qr-code/assets/data/qrv15_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv15_1.dat → vendor/endroid/qr-code/assets/data/qrv15_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv15_2.dat → vendor/endroid/qr-code/assets/data/qrv15_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv15_3.dat → vendor/endroid/qr-code/assets/data/qrv15_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv16_0.dat → vendor/endroid/qr-code/assets/data/qrv16_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv16_1.dat → vendor/endroid/qr-code/assets/data/qrv16_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv16_2.dat → vendor/endroid/qr-code/assets/data/qrv16_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv16_3.dat → vendor/endroid/qr-code/assets/data/qrv16_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv17_0.dat → vendor/endroid/qr-code/assets/data/qrv17_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv17_1.dat → vendor/endroid/qr-code/assets/data/qrv17_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv17_2.dat → vendor/endroid/qr-code/assets/data/qrv17_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv17_3.dat → vendor/endroid/qr-code/assets/data/qrv17_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv18_0.dat → vendor/endroid/qr-code/assets/data/qrv18_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv18_1.dat → vendor/endroid/qr-code/assets/data/qrv18_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv18_2.dat → vendor/endroid/qr-code/assets/data/qrv18_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv18_3.dat → vendor/endroid/qr-code/assets/data/qrv18_3.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv19_0.dat → vendor/endroid/qr-code/assets/data/qrv19_0.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv19_1.dat → vendor/endroid/qr-code/assets/data/qrv19_1.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv19_2.dat → vendor/endroid/qr-code/assets/data/qrv19_2.dat vendored
View File

0
vendor/endroid/qrcode/assets/data/qrv19_3.dat → vendor/endroid/qr-code/assets/data/qrv19_3.dat vendored
View File

Some files were not shown because too many files have changed in this diff Show More