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

[更新]ComposerUpdate，修正路由规则

Browse Source
This commit is contained in:
Anyon 2018-06-19 16:10:09 +08:00
parent 77ee26ad45
commit 5110f84d1e
31 changed files with 548 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/store/init.php
View File

@ -17,7 +17,7 @@ use think\facade\Route;
use think\Request;
/* 注册微信端路由支持 */
Route::rule('wx', function (Request $request) {
Route::rule('wx<_?>', function (Request $request) {
$params = explode('-', $request->path());
array_shift($params);
$controller = array_shift($params) ?: config('app.default_controller');

2
composer.json
View File

@ -18,7 +18,7 @@
"require": {
"php": ">=5.6.0",
"endroid/qr-code": "^1.9",
"topthink/framework": "5.1.16",
"topthink/framework": "5.1.*",
"zoujingli/ip2region": "dev-master",
"aliyuncs/oss-sdk-php": "^2.2",
"zoujingli/weopen-developer": "dev-master",

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.16';
const VERSION = '5.1.17';
/**
* 当前模块路径
@ -333,7 +333,6 @@ class App extends Container
// 对容器中的对象实例进行配置更新
$this->containerConfigUpdate($module);
}
}
protected function containerConfigUpdate($module)
@ -427,30 +426,7 @@ class App extends Container
}
$this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {
if (is_null($data)) {
try {
// 执行调度
$data = $dispatch->run();
} catch (HttpResponseException $exception) {
$data = $exception->getResponse();
}
}
// 输出数据到客户端
if ($data instanceof Response) {
$response = $data;
} elseif (!is_null($data)) {
// 默认自动识别响应输出类型
$isAjax = $request->isAjax();
$type = $isAjax ? $this->config('app.default_ajax_return') : $this->config('app.default_return_type');
$response = Response::create($data, $type);
} else {
$data = ob_get_clean();
$status = empty($data) ? 204 : 200;
$response = Response::create($data, '', $status);
}
return $response;
return is_null($data) ? $dispatch->run() : $data;
});
$response = $this->middleware->dispatch($this->request);

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

@ -43,11 +43,17 @@ class Controller
protected $batchValidate = false;
/**
* 前置操作方法列表
* 前置操作方法列表（即将废弃）
* @var array $beforeActionList
*/
protected $beforeActionList = [];
/**
* 控制器中间件
* @var array
*/
protected $middleware = [];
/**
* 构造方法
* @access public
@ -61,7 +67,24 @@ class Controller
// 控制器初始化
$this->initialize();
// 前置操作方法
// 控制器中间件
if ($this->middleware) {
foreach ($this->middleware as $key => $val) {
if (!is_int($key)) {
if (isset($val['only']) && !in_array($this->request->action(), $val['only'])) {
continue;
} elseif (isset($val['except']) && in_array($this->request->action(), $val['except'])) {
continue;
} else {
$val = $key;
}
}
$this->app['middleware']->controller($val);
}
}
// 前置操作方法 即将废弃
foreach ((array) $this->beforeActionList as $method => $options) {
is_numeric($method) ?
$this->beforeAction($options) :

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

@ -117,7 +117,7 @@ class Log implements LoggerInterface
return;
}
if (is_string($msg)) {
if (is_string($msg) && !empty($context)) {
$replace = [];
foreach ($context as $key => $val) {
$replace['{' . $key . '}'] = $val;

78
thinkphp/library/think/Middleware.php
View File

@ -39,62 +39,95 @@ class Middleware
$this->config = array_merge($this->config, $config);
}
public function import(array $middlewares = [])
/**
* 导入中间件
* @access public
* @param array $middlewares
* @param string $type 中间件类型
*/
public function import(array $middlewares = [], $type = 'route')
{
foreach ($middlewares as $middleware) {
$this->add($middleware);
$this->add($middleware, $type);
}
}
/**
* {@inheritdoc}
* 注册中间件
* @access public
* @param mixed $middleware
* @param string $type 中间件类型
*/
public function add($middleware)
public function add($middleware, $type = 'route')
{
if (is_null($middleware)) {
return;
}
$middleware = $this->buildMiddleware($middleware);
$middleware = $this->buildMiddleware($middleware, $type);
if ($middleware) {
$this->queue[] = $middleware;
$this->queue[$type][] = $middleware;
}
}
/**
* {@inheritdoc}
* 注册控制器中间件
* @access public
* @param mixed $middleware
*/
public function unshift($middleware)
public function controller($middleware)
{
return $this->add($middleware, 'controller');
}
/**
* 移除中间件
* @access public
* @param mixed $middleware
* @param string $type 中间件类型
*/
public function unshift($middleware, $type = 'route')
{
if (is_null($middleware)) {
return;
}
$middleware = $this->buildMiddleware($middleware);
$middleware = $this->buildMiddleware($middleware, $type);
if ($middleware) {
array_unshift($this->queue, $middleware);
array_unshift($this->queue[$type], $middleware);
}
}
/**
* {@inheritdoc}
* 获取注册的中间件
* @access public
* @param string $type 中间件类型
*/
public function all()
public function all($type = 'route')
{
return $this->queue;
return $this->queue[$type] ?: [];
}
/**
* {@inheritdoc}
* 中间件调度
* @access public
* @param Request $request
* @param string $type 中间件类型
*/
public function dispatch(Request $request)
public function dispatch(Request $request, $type = 'route')
{
return call_user_func($this->resolve(), $request);
return call_user_func($this->resolve($type), $request);
}
protected function buildMiddleware($middleware)
/**
* 解析中间件
* @access protected
* @param mixed $middleware
* @param string $type 中间件类型
*/
protected function buildMiddleware($middleware, $type = 'route')
{
if (is_array($middleware)) {
list($middleware, $param) = $middleware;
@ -117,7 +150,7 @@ class Middleware
}
if (is_array($middleware)) {
return $this->import($middleware);
return $this->import($middleware, $type);
}
if (strpos($middleware, ':')) {
@ -127,10 +160,11 @@ class Middleware
return [[$this->app->make($middleware), 'handle'], isset($param) ? $param : null];
}
protected function resolve()
protected function resolve($type = 'route')
{
return function (Request $request) {
$middleware = array_shift($this->queue);
return function (Request $request) use ($type) {
$middleware = array_shift($this->queue[$type]);
if (null === $middleware) {
throw new InvalidArgumentException('The queue was exhausted, with no response returned');
@ -139,7 +173,7 @@ class Middleware
list($call, $param) = $middleware;
try {
$response = call_user_func_array($call, [$request, $this->resolve(), $param]);
$response = call_user_func_array($call, [$request, $this->resolve($type), $param]);
} catch (HttpResponseException $exception) {
$response = $exception->getResponse();
}

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

@ -236,7 +236,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 设置当前模型 确保查询返回模型对象
$query = Db::connect($this->connection, false, $this->query);
$query->model($this)
->json($this->json)
->json($this->json, $this->jsonAssoc)
->setJsonFieldType($this->jsonType);
if (isset(static::$readMaster['*']) || isset(static::$readMaster[static::class])) {
@ -284,7 +284,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$query = $this->buildQuery();
// 软删除
if (method_exists($this, 'withNoTrashed')) {
if (property_exists($this, 'withTrashed') && !$this->withTrashed) {
$this->withNoTrashed($query);
}
@ -750,8 +750,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public function saveAll($dataSet, $replace = true)
{
$result = [];
$db = $this->db(false);
$db->startTrans();
@ -762,6 +760,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$auto = true;
}
$result = [];
foreach ($dataSet as $key => $data) {
if ($this->exists || (!empty($auto) && isset($data[$pk]))) {
$result[$key] = self::update($data, [], $this->field);

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

@ -11,6 +11,9 @@
namespace think;
use think\facade\Cookie;
use think\facade\Session;
class Request
{
/**
@ -310,7 +313,6 @@ class Request
{
$request = new static($config->pull('app'));
$request->cookie = $app['cookie']->get();
$request->server = $_SERVER;
$request->env = $app['env']->get();
@ -761,18 +763,19 @@ class Request
/**
* 当前的请求类型
* @access public
* @param bool $method true 获取原始请求类型
* @param bool $origin 是否获取原始请求类型
* @return string
*/
public function method($method = false)
public function method($origin = false)
{
if (true === $method) {
if ($origin) {
// 获取原始请求类型
return $this->isCli() ? 'GET' : $this->server('REQUEST_METHOD');
} elseif (!$this->method) {
if (isset($_POST[$this->config['var_method']])) {
$this->method = strtoupper($_POST[$this->config['var_method']]);
$this->{$this->method}($_POST);
$method = strtolower($this->method);
$this->{$method} = $_POST;
} elseif ($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')) {
$this->method = strtoupper($this->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
} else {
@ -910,6 +913,7 @@ class Request
// 获取包含文件上传信息的数组
$file = $this->file();
$data = is_array($file) ? array_merge($this->param, $file) : $this->param;
return $this->input($data, '', $default, $filter);
}
@ -1060,14 +1064,16 @@ class Request
public function session($name = '', $default = null)
{
if (empty($this->session)) {
$this->session = facade\Session::get();
$this->session = Session::get();
}
if ('' === $name) {
return $this->session;
}
return isset($this->session[$name]) ? $this->session[$name] : $default;
$data = $this->getData($this->session, $name);
return is_null($data) ? $default : $data;
}
/**
@ -1080,8 +1086,12 @@ class Request
*/
public function cookie($name = '', $default = null, $filter = '')
{
if (empty($this->cookie)) {
$this->cookie = Cookie::get();
}
if (!empty($name)) {
$data = isset($this->cookie[$name]) ? $this->cookie[$name] : $default;
$data = Cookie::has($name) ? Cookie::get($name) : $default;
} else {
$data = $this->cookie;
}
@ -1272,15 +1282,11 @@ class Request
list($name, $type) = explode('/', $name);
}
// 按.拆分成多维数组进行判断
foreach (explode('.', $name) as $val) {
if (isset($data[$val])) {
$data = $data[$val];
} else {
// 无输入数据，返回默认值
$data = $this->getData($data, $name);
if (is_null($data)) {
return $default;
}
}
if (is_object($data)) {
return $data;
@ -1305,6 +1311,26 @@ class Request
return $data;
}
/**
* 获取数据
* @access public
* @param array $data 数据源
* @param string|false $name 字段名
* @return mixed
*/
protected function getData(array $data, $name)
{
foreach (explode('.', $name) as $val) {
if (isset($data[$val])) {
$data = $data[$val];
} else {
return;
}
}
return $data;
}
/**
* 设置或获取当前的过滤规则
* @access public

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

@ -390,6 +390,33 @@ class Route
return $this->app['rule_name']->get($name, $domain);
}
/**
* 读取路由
* @access public
* @param string $rule 路由规则
* @param string $domain 域名
* @return array
*/
public function getRule($rule, $domain = null)
{
if (is_null($domain)) {
$domain = $this->domain;
}
return $this->app['rule_name']->getRule($rule, $domain);
}
/**
* 读取路由
* @access public
* @param string $domain 域名
* @return array
*/
public function getRuleList($domain = null)
{
return $this->app['rule_name']->getRuleList($domain);
}
/**
* 批量导入路由标识
* @access public

15
thinkphp/library/think/Session.php
View File

@ -478,18 +478,23 @@ class Session
public function has($name, $prefix = null)
{
empty($this->init) && $this->boot();
$prefix = !is_null($prefix) ? $prefix : $this->prefix;
$value = $prefix ? (!empty($_SESSION[$prefix]) ? $_SESSION[$prefix] : []) : $_SESSION;
if (strpos($name, '.')) {
// 支持数组
list($name1, $name2) = explode('.', $name);
$name = explode('.', $name);
return $prefix ? isset($_SESSION[$prefix][$name1][$name2]) : isset($_SESSION[$name1][$name2]);
foreach ($name as $val) {
if (!isset($value[$val])) {
return false;
} else {
return $prefix ? isset($_SESSION[$prefix][$name]) : isset($_SESSION[$name]);
$value = $value[$val];
}
}
return true;
}
/**
* 添加数据到一个session数组
* @access public

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

@ -112,23 +112,6 @@ class Validate
*/
protected $currentScene = null;
/**
* 内置正则验证规则
* @var array
*/
protected $regex = [
'alpha' => '/^[A-Za-z]+$/',
'alphaNum' => '/^[A-Za-z0-9]+$/',
'alphaDash' => '/^[A-Za-z0-9\-\_]+$/',
'chs' => '/^[\x{4e00}-\x{9fa5}]+$/u',
'chsAlpha' => '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u',
'chsAlphaNum' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9]+$/u',
'chsDash' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-]+$/u',
'mobile' => '/^1[3-9][0-9]\d{8}$/',
'idCard' => '/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/',
'zip' => '/\d{6}/',
];
/**
* Filter_var 规则
* @var array
@ -142,6 +125,21 @@ class Validate
'float' => FILTER_VALIDATE_FLOAT,
];
/**
* 内置正则验证规则
* @var array
*/
protected $regex = [
'alphaDash' => '/^[A-Za-z0-9\-\_]+$/',
'chs' => '/^[\x{4e00}-\x{9fa5}]+$/u',
'chsAlpha' => '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u',
'chsAlphaNum' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9]+$/u',
'chsDash' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-]+$/u',
'mobile' => '/^1[3-9][0-9]\d{8}$/',
'idCard' => '/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/',
'zip' => '/\d{6}/',
];
/**
* 验证场景定义
* @var array
@ -751,6 +749,9 @@ class Validate
case 'number':
$result = ctype_digit((string) $value);
break;
case 'alphaNum':
$result = ctype_alnum($value);
break;
case 'array':
// 是否为数组
$result = is_array($value);
@ -768,6 +769,10 @@ class Validate
if (isset(self::$type[$rule])) {
// 注册的验证规则
$result = call_user_func_array(self::$type[$rule], [$value]);
} elseif (function_exists('ctype_' . $rule)) {
// ctype验证规则
$ctypeFun = 'ctype_' . $rule;
$result = $ctypeFun($value);
} elseif (isset($this->filter[$rule])) {
// Filter_var验证规则
$result = $this->filter($value, $this->filter[$rule]);

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

@ -1341,10 +1341,7 @@ abstract class Connection
if (empty($options['fetch_sql']) && !empty($options['cache'])) {
// 判断查询缓存
$cache = $options['cache'];
$guid = is_string($cache['key']) ? $cache['key'] : $this->getCacheKey($query, $field);
$result = Container::get('cache')->get($guid);
$result = $this->getCacheData($query, $cache, null, $guid);
if (false !== $result) {
return $result;

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

@ -87,7 +87,7 @@ class Query
* 读取主库的表
* @var array
*/
private static $readMaster = [];
protected static $readMaster = [];
/**
* 日期查询表达式
@ -635,11 +635,11 @@ class Query
* COUNT查询
* @access public
* @param string $field 字段名
* @return integer|string
* @return float|string
*/
public function count($field = '*')
{
if (isset($this->options['group'])) {
if (!empty($this->options['group'])) {
// 支持GROUP
$options = $this->getOptions();
$subSql = $this->options($options)->field('count(' . $field . ') AS think_count')->bind($this->bind)->buildSql();
@ -660,7 +660,7 @@ class Query
* SUM查询
* @access public
* @param string $field 字段名
* @return float|int
* @return float
*/
public function sum($field)
{
@ -695,7 +695,7 @@ class Query
* AVG查询
* @access public
* @param string $field 字段名
* @return float|int
* @return float
*/
public function avg($field)
{
@ -2124,11 +2124,13 @@ class Query
* 设置JSON字段信息
* @access public
* @param array $json JSON字段
* @param bool $assoc 是否取出数组
* @return $this
*/
public function json(array $json = [])
public function json(array $json = [], $assoc = false)
{
$this->options['json'] = $json;
$this->options['json_assoc'] = $assoc;
return $this;
}
@ -2247,6 +2249,32 @@ class Query
return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
}
/**
* 查询当前时间在两个时间字段范围
* @access public
* @param string $startField 开始时间字段
* @param string $endField 结束时间字段
* @return $this
*/
public function whereBetweenTimeField($startField, $endField)
{
return $this->whereTime($startField, '<=', time())
->whereTime($endField, '>=', time());
}
/**
* 查询当前时间不在两个时间字段范围
* @access public
* @param string $startField 开始时间字段
* @param string $endField 结束时间字段
* @return $this
*/
public function whereNotBetweenTimeField($startField, $endField)
{
return $this->whereTime($startField, '>', time())
->whereTime($endField, '<', time(), 'OR');
}
/**
* 查询日期或者时间范围
* @access public
@ -2897,7 +2925,7 @@ class Query
protected function resultToModel(&$result, $options = [], $resultSet = false)
{
if (!empty($options['json'])) {
$this->jsonResult($result, $options['json']);
$this->jsonResult($result, $options['json'], $options['json_assoc']);
}
$condition = (!$resultSet && isset($options['where']['AND'])) ? $options['where']['AND'] : null;

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

@ -13,6 +13,7 @@ namespace think\db\connector;
use PDO;
use think\db\Connection;
use think\db\Query;
/**
* Sqlsrv数据库驱动
@ -125,6 +126,100 @@ class Sqlsrv extends Connection
return $info;
}
/**
* 得到某个列的数组
* @access public
* @param Query $query 查询对象
* @param string $field 字段名 多个字段用逗号分隔
* @param string $key 索引
* @return array
*/
public function column(Query $query, $field, $key = '')
{
$options = $query->getOptions();
if (empty($options['fetch_sql']) && !empty($options['cache'])) {
// 判断查询缓存
$cache = $options['cache'];
$guid = is_string($cache['key']) ? $cache['key'] : $this->getCacheKey($query, $field);
$result = Container::get('cache')->get($guid);
if (false !== $result) {
return $result;
}
}
if (isset($options['field'])) {
$query->removeOption('field');
}
if (is_null($field)) {
$field = '*';
} elseif ($key && '*' != $field) {
$field = $key . ',' . $field;
}
if (is_string($field)) {
$field = array_map('trim', explode(',', $field));
}
$query->setOption('field', $field);
// 生成查询SQL
$sql = $this->builder->select($query);
$bind = $query->getBind();
if (!empty($options['fetch_sql'])) {
// 获取实际执行的SQL语句
return $this->getRealSql($sql, $bind);
}
// 执行查询操作
$pdo = $this->query($sql, $bind, $options['master'], true);
if (1 == $pdo->columnCount()) {
$result = $pdo->fetchAll(PDO::FETCH_COLUMN);
} else {
$resultSet = $pdo->fetchAll(PDO::FETCH_ASSOC);
if ('*' == $field && $key) {
$result = array_column($resultSet, null, $key);
} elseif ($resultSet) {
$fields = array_keys($resultSet[0]);
$count = count($fields);
$key1 = array_shift($fields);
$key2 = $fields ? array_shift($fields) : '';
$key = $key ?: $key1;
if (strpos($key, '.')) {
list($alias, $key) = explode('.', $key);
}
if (3 == $count) {
$column = $key2;
} elseif ($count < 3) {
$column = $key1;
} else {
$column = null;
}
$result = array_column($resultSet, $column, $key);
} else {
$result = [];
}
}
if (isset($cache) && isset($guid)) {
// 缓存数据
$this->cacheData($guid, $result, $cache);
}
return $result;
}
/**
* SQL性能分析
* @access protected

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

@ -26,7 +26,7 @@ use think\Facade;
* @method void setName(string $name) static 批量导入路由标识
* @method void import(array $rules, string $type = '*') static 导入配置文件的路由规则
* @method \think\route\RuleItem rule(string $rule, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由规则
* @method void rules(string $rules, string $method = '*', array $option = [], array $pattern = []) static 批量注册路由规则
* @method void rules(array $rules, string $method = '*', array $option = [], array $pattern = []) static 批量注册路由规则
* @method \think\route\RuleGroup group(string|array $name, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由分组
* @method \think\route\RuleItem any(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
* @method \think\route\RuleItem get(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由

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

@ -72,7 +72,7 @@ class File
$info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
}
if (!$this->config['json'] && in_array($type, $this->config['apart_level'])) {
if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
// 独立记录的日志级别
$filename = $this->getApartLevelFile($path, $type);

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

@ -36,6 +36,12 @@ trait Attribute
*/
protected $json = [];
/**
* JSON数据取出是否需要转换为数组
* @var bool
*/
protected $jsonAssoc = false;
/**
* JSON数据表字段类型
* @var array

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

@ -10,6 +10,12 @@ use think\db\Query;
trait SoftDelete
{
/**
* 是否包含软删除数据
* @var bool
*/
protected $withTrashed = false;
/**
* 判断当前实例是否被软删除
* @access public
@ -35,7 +41,19 @@ trait SoftDelete
{
$model = new static();
return $model->db(false);
return $model->withTrashedData(true)->db(false);
}
/**
* 是否包含软删除数据
* @access protected
* @param bool $withTrashed 是否包含软删除数据
* @return $this
*/
protected function withTrashedData($withTrashed)
{
$this->withTrashed = $withTrashed;
return $this;
}
/**
@ -87,7 +105,7 @@ trait SoftDelete
$result = $this->isUpdate()->withEvent(false)->save();
$this->withEvent = true;
$this->withEvent(true);
} else {
// 读取更新条件
$where = $this->getWhere();

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

@ -563,7 +563,7 @@ class BelongsToMany extends Relation
$pivot[] = [$this->localKey, '=', $this->parent->$pk];
if (isset($id)) {
$pivot[] = is_array($id) ? [$this->foreignKey, 'in', $id] : [$this->foreignKey, '=', $id];
$pivot[] = [$this->foreignKey, is_array($id) ? 'in' : '=', $id];
}
$result = $this->pivot->where($pivot)->delete();

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

@ -198,11 +198,12 @@ class MorphTo extends Relation
if ($key == $result->$morphType) {
// 关联模型
if (!isset($data[$result->$morphKey])) {
throw new Exception('relation data not exists :' . $this->model);
$relationModel = null;
} else {
$relationModel = $data[$result->$morphKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}
$result->setRelation($attr, $relationModel);
}
@ -210,7 +211,6 @@ class MorphTo extends Relation
}
}
}
}
/**
* 预载入关联查询

24
thinkphp/library/think/route/Dispatch.php
View File

@ -162,7 +162,29 @@ abstract class Dispatch
$this->autoValidate($option['validate']);
}
return $this->exec();
$data = $this->exec();
return $this->autoResponse($data);
}
protected function autoResponse($data)
{
if ($data instanceof Response) {
$response = $data;
} elseif (!is_null($data)) {
// 默认自动识别响应输出类型
$isAjax = $this->request->isAjax();
$type = $isAjax ? $this->rule->getConfig('default_ajax_return') : $this->rule->getConfig('default_return_type');
$response = Response::create($data, $type);
} else {
$data = ob_get_clean();
$data = false === $data ? '' : $data;
$status = '' === $data ? 204 : 200;
$response = Response::create($data, '', $status);
}
return $response;
}
/**

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

@ -171,6 +171,16 @@ abstract class Rule
return $this->parent;
}
/**
* 获取路由所在域名
* @access public
* @return string
*/
public function getDomain()
{
return $this->parent->getDomain();
}
/**
* 获取变量规则定义
* @access public

32
thinkphp/library/think/route/RuleGroup.php
View File

@ -312,8 +312,17 @@ class RuleGroup extends Rule
}
}
if (empty($regex)) {
return false;
}
try {
if (!empty($regex) && preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match)) {
$result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
} catch (\Exception $e) {
throw new Exception('route pattern error');
}
if ($result) {
$var = [];
foreach ($match as $key => $val) {
if (is_string($key) && '' !== $val) {
@ -332,13 +341,21 @@ class RuleGroup extends Rule
}
}
return $items[$pos]->checkRule($request, $url, $var);
$rule = $items[$pos]->getRule();
$array = $this->router->getRule($rule);
foreach ($array as $item) {
if (in_array($item->getMethod(), ['*', strtolower($request->method())])) {
$result = $item->checkRule($request, $url, $var);
if (false !== $result) {
return $result;
}
}
}
}
return false;
} catch (\Exception $e) {
throw new Exception('route pattern error');
}
}
/**
@ -414,6 +431,11 @@ class RuleGroup extends Rule
$method = strtolower($method);
if ('/' === $rule || '' === $rule) {
// 首页自动完整匹配
$rule .= '$';
}
// 创建路由规则实例
$ruleItem = new RuleItem($this->router, $this, $name, $rule, $route, $method, $option, $pattern);

3
thinkphp/library/think/route/RuleItem.php
View File

@ -128,6 +128,7 @@ class RuleItem extends Rule
$value = [$this->rule, $vars, $this->parent->getDomain(), $suffix, $this->method];
Container::get('rule_name')->set($name, $value, $first);
Container::get('rule_name')->setRule($this->rule, $this);
}
}
@ -242,7 +243,7 @@ class RuleItem extends Rule
}
if (false === strpos($rule, '<')) {
if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule, $url, strlen($rule)))) {
if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
return $var;
}
return false;

57
thinkphp/library/think/route/RuleName.php
View File

@ -14,6 +14,7 @@ namespace think\route;
class RuleName
{
protected $item = [];
protected $rule = [];
/**
* 注册路由标识
@ -32,6 +33,62 @@ class RuleName
}
}
/**
* 注册路由规则
* @access public
* @param string $rule 路由规则
* @param RuleItem $route 路由
* @return void
*/
public function setRule($rule, $route)
{
$this->rule[$route->getDomain()][$rule][$route->getRoute()] = $route;
}
/**
* 根据路由规则获取路由对象（列表）
* @access public
* @param string $name 路由标识
* @param string $domain 域名
* @return array
*/
public function getRule($rule, $domain = null)
{
return isset($this->rule[$domain][$rule]) ? $this->rule[$domain][$rule] : [];
}
/**
* 获取全部路由列表
* @access public
* @param string $domain 域名
* @return array
*/
public function getRuleList($domain = null)
{
$list = [];
foreach ($this->rule as $ruleDomain => $rules) {
foreach ($rules as $rule => $items) {
foreach ($items as $item) {
$val = [];
foreach (['method', 'rule', 'name', 'route', 'pattern', 'option'] as $param) {
$call = 'get' . $param;
$val[$param] = $item->$call();
}
$list[$ruleDomain][] = $val;
}
}
}
if ($domain) {
return isset($list[$domain]) ? $list[$domain] : [];
}
return $list;
}
/**
* 导入路由标识
* @access public

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

@ -15,6 +15,7 @@ use ReflectionMethod;
use think\exception\ClassNotFoundException;
use think\exception\HttpException;
use think\Loader;
use think\Request;
use think\route\Dispatch;
class Module extends Dispatch
@ -84,8 +85,8 @@ class Module extends Dispatch
// 监听module_init
$this->app['hook']->listen('module_init');
// 实例化控制器
try {
// 实例化控制器
$instance = $this->app->controller($this->controller,
$this->rule->getConfig('url_controller_layer'),
$this->rule->getConfig('controller_suffix'),
@ -94,6 +95,7 @@ class Module extends Dispatch
throw new HttpException(404, 'controller not exists:' . $e->getClass());
}
$this->app['middleware']->controller(function (Request $request, $next) use ($instance) {
// 获取当前操作名
$action = $this->actionName . $this->rule->getConfig('action_suffix');
@ -124,6 +126,11 @@ class Module extends Dispatch
$this->app['hook']->listen('action_begin', $call);
return $this->app->invokeReflectMethod($instance, $reflect, $vars);
$data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
return $this->autoResponse($data);
});
return $this->app['middleware']->dispatch($this->request, 'controller');
}
}

2
thinkphp/tpl/default_index.tpl
View File

@ -5,6 +5,6 @@ class Index{$suffix}
{
public function index()
{
return '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:) 2018新年快乐</h1><p> ThinkPHP V5.1<br/><span style="font-size:30px">12载初心不改（2006-2018） - 你值得信赖的PHP框架</span></p></div><script type="text/javascript" src="https://tajs.qq.com/stats?sId=64890268" charset="UTF-8"></script><script type="text/javascript" src="https://e.topthink.com/Public/static/client.js"></script><think id="eab4b9f840753f8e7"></think>';
return '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:) </h1><p> ThinkPHP V5.1<br/><span style="font-size:30px">12载初心不改（2006-2018） - 你值得信赖的PHP框架</span></p></div><script type="text/javascript" src="https://tajs.qq.com/stats?sId=64890268" charset="UTF-8"></script><script type="text/javascript" src="https://e.topthink.com/Public/static/client.js"></script><think id="eab4b9f840753f8e7"></think>';
}
}

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

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

12
vendor/composer/installed.json vendored
View File

@ -191,17 +191,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.16",
"version_normalized": "5.1.16.0",
"version": "v5.1.17",
"version_normalized": "5.1.17.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "e0a8bdc52957a8f9774353fbfa0b9fd6ee206188"
"reference": "61a66e8eeecf1584e0dc150a530f0d116e6ccd01"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/framework/e0a8bdc52957a8f9774353fbfa0b9fd6ee206188.zip",
"reference": "e0a8bdc52957a8f9774353fbfa0b9fd6ee206188",
"url": "https://files.phpcomposer.com/files/top-think/framework/61a66e8eeecf1584e0dc150a530f0d116e6ccd01.zip",
"reference": "61a66e8eeecf1584e0dc150a530f0d116e6ccd01",
"shasum": ""
},
"require": {
@ -217,7 +217,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-06-08T04:10:59+00:00",
"time": "2018-06-19T03:11:41+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",