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

[更新]ThinkPHP升级至5.1.9

Browse Source
This commit is contained in:
Anyon 2018-04-12 19:28:11 +08:00
parent f207ac52eb
commit 04b48184e9
26 changed files with 236 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

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

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

@ -69,6 +69,7 @@ return [
'chunk not support order' => 'Chunk不支持调用order方法',
'route pattern error' => '路由变量规则定义错误',
'route behavior will not support' => '路由行为废弃（使用中间件替代）',
'closure not support cache(true)' => '使用闭包查询不支持cache(true)，请指定缓存Key',
// 上传错误信息
'unknown upload error' => '未知上传错误！',

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App implements \ArrayAccess
{
const VERSION = '5.1.8';
const VERSION = '5.1.9';
/**
* 当前模块路径
@ -126,7 +126,7 @@ class App implements \ArrayAccess
public function __construct($appPath = '')
{
$this->appPath = $appPath ?: $this->getAppPath();
$this->appPath = $appPath ? realpath($appPath) . DIRECTORY_SEPARATOR : $this->getAppPath();
$this->container = Container::getInstance();
}
@ -164,7 +164,7 @@ class App implements \ArrayAccess
$this->beginTime = microtime(true);
$this->beginMem = memory_get_usage();
$this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
$this->rootPath = dirname(realpath($this->appPath)) . DIRECTORY_SEPARATOR;
$this->rootPath = dirname($this->appPath) . DIRECTORY_SEPARATOR;
$this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
$this->routePath = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
$this->configPath = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
@ -756,9 +756,7 @@ class App implements \ArrayAccess
public function getAppPath()
{
if (is_null($this->appPath)) {
$scriptName = 'cli' == PHP_SAPI ? getcwd() . DIRECTORY_SEPARATOR . $_SERVER['argv'][0] : $_SERVER['SCRIPT_FILENAME'];
$this->appPath = realpath(dirname(dirname($scriptName)) . DIRECTORY_SEPARATOR . 'application') . DIRECTORY_SEPARATOR;
$this->appPath = Loader::getRootPath() . 'application' . DIRECTORY_SEPARATOR;
}
return $this->appPath;

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

@ -15,6 +15,7 @@ namespace think;
* Class Db
* @package think
* @method \think\db\Query connect(array $config =[], mixed $name = false) static 连接/切换数据库连接
* @method \think\db\Query master() static 从主服务器读取数据
* @method \think\db\Query table(string $table) static 指定数据表（含前缀）
* @method \think\db\Query name(string $name) static 指定数据表（不含前缀）
* @method \think\db\Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件

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

@ -52,21 +52,37 @@ class Loader
*/
private static $composerPath;
// 获取应用根目录
public static function getRootPath()
{
if ('cli' == PHP_SAPI) {
$cwdPath = getcwd();
if (0 === strpos($_SERVER['argv'][0], $cwdPath)) {
$scriptName = $_SERVER['argv'][0];
} else {
$scriptName = $cwdPath . DIRECTORY_SEPARATOR . $_SERVER['argv'][0];
}
} else {
$scriptName = $_SERVER['SCRIPT_FILENAME'];
}
$path = realpath(dirname($scriptName));
if (!is_file($path . DIRECTORY_SEPARATOR . 'think')) {
$path = dirname($path);
}
return $path . DIRECTORY_SEPARATOR;
}
// 注册自动加载机制
public static function register($autoload = '')
{
// 注册系统自动加载
spl_autoload_register($autoload ?: 'think\\Loader::autoload', true, true);
$scriptName = 'cli' == PHP_SAPI ? getcwd() . DIRECTORY_SEPARATOR . $_SERVER['argv'][0] : $_SERVER['SCRIPT_FILENAME'];
$path = realpath(dirname($scriptName));
if ('cli-server' == PHP_SAPI || !is_file('./think')) {
$rootPath = dirname($path) . DIRECTORY_SEPARATOR;
} else {
$rootPath = $path . DIRECTORY_SEPARATOR;
}
$rootPath = self::getRootPath();
self::$composerPath = $rootPath . 'vendor' . DIRECTORY_SEPARATOR . 'composer' . DIRECTORY_SEPARATOR;
@ -338,6 +354,10 @@ class Loader
if (is_file(self::$composerPath . 'autoload_files.php')) {
$includeFiles = require self::$composerPath . 'autoload_files.php';
foreach ($includeFiles as $fileIdentifier => $file) {
if (isset($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
continue;
}
if (empty(self::$autoloadFiles[$fileIdentifier])) {
__require_file($file);
self::$autoloadFiles[$fileIdentifier] = true;

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

@ -104,6 +104,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
protected $error;
/**
* 软删除字段默认值
* @var mixed
*/
protected $defaultSoftDelete;
/**
* 架构函数
* @access public
@ -245,11 +251,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if ($useBaseQuery) {
// 软删除
if (method_exists($this, 'getDeleteTimeField')) {
$field = $this->getDeleteTimeField(true);
if ($field) {
$query->useSoftDelete($field);
}
if (method_exists($this, 'withNoTrashed')) {
$this->withNoTrashed($query);
}
// 全局作用域
@ -469,7 +472,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
foreach ((array) $pk as $key) {
if (isset($data[$key])) {
$array[$key] = [$key, '=', $data[$key]];
$array[] = [$key, '=', $data[$key]];
unset($data[$key]);
}
}
@ -574,10 +577,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
/**
* 字段值(延迟)增长
* 字段值(延迟)减少
* @access public
* @param string $field 字段名
* @param integer $step 增长值
* @param integer $step 减少值
* @param integer $lazyTime 延时时间(s)
* @return integer|true
* @throws Exception

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

@ -1588,9 +1588,18 @@ class Request
$ip = $_SERVER['REMOTE_ADDR'];
}
// IP地址类型
$ip_mode = (strpos($ip, ':') === false) ? 'ipv4' : 'ipv6';
// IP地址合法验证
$long = sprintf("%u", ip2long($ip));
$ip = $long ? [$ip, $long] : ['0.0.0.0', 0];
if (filter_var($ip, FILTER_VALIDATE_IP) !== $ip) {
$ip = ($ip_mode === 'ipv4') ? '0.0.0.0' : '::';
}
// 如果是ipv4地址，则直接使用ip2long返回int类型ip；如果是ipv6地址，暂时不支持，直接返回0
$long_ip = ($ip_mode === 'ipv4') ? sprintf("%u", ip2long($ip)) : 0;
$ip = [$ip, $long_ip];
return $ip[$type];
}

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

@ -749,7 +749,7 @@ class Validate
$result = in_array($value, [true, false, 0, 1, '0', '1'], true);
break;
case 'number':
$result = ctype_digit($value);
$result = ctype_digit((string) $value);
break;
case 'array':
// 是否为数组

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

@ -113,7 +113,7 @@ abstract class Builder
$result = [];
foreach ($data as $key => $val) {
$item = $this->parseKey($query, $key);
$item = $this->parseKey($query, $key, true);
if ($val instanceof Expression) {
$result[$item] = $val->getValue();
@ -183,9 +183,10 @@ abstract class Builder
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key)
public function parseKey(Query $query, $key, $strict = false)
{
return $key;
}
@ -209,7 +210,7 @@ abstract class Builder
if ($field instanceof Expression) {
$array[] = $field->getValue();
} elseif (!is_numeric($key)) {
$array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field);
$array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field, true);
} else {
$array[] = $this->parseKey($query, $field);
}
@ -363,7 +364,7 @@ abstract class Builder
protected function parseWhereItem(Query $query, $field, $val, $rule = '', $binds = [], $bindName = null)
{
// 字段分析
$key = $field ? $this->parseKey($query, $field) : '';
$key = $field ? $this->parseKey($query, $field, true) : '';
// 查询规则和条件
if (!is_array($val)) {
@ -808,45 +809,43 @@ abstract class Builder
return '';
}
if (is_array($order)) {
$array = [];
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif (is_array($val)) {
if (isset($val['sort'])) {
$sort = ' ' . $val['sort'];
unset($val['sort']);
} else {
$sort = '';
}
$options = $query->getOptions();
$bind = $this->connection->getFieldsBind($options['table']);
foreach ($val as $k => $item) {
$val[$k] = $this->parseDataBind($query, $key, $item, $bind, $k);
}
$array[] = 'field(' . $this->parseKey($query, $key) . ',' . implode(',', $val) . ')' . $sort;
} elseif (is_numeric($key)) {
if ('[rand]' == $val) {
$array[] = $this->parseRand($query);
} elseif (false === strpos($val, '(')) {
$array[] = $this->parseKey($query, $val);
} else {
$array[] = $val;
}
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif (is_array($val)) {
if (isset($val['sort'])) {
$sort = ' ' . $val['sort'];
unset($val['sort']);
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($query, $key) . ' ' . $sort;
$sort = '';
}
}
$order = implode(',', $array);
$options = $query->getOptions();
$bind = $this->connection->getFieldsBind($options['table']);
foreach ($val as $k => $item) {
$val[$k] = $this->parseDataBind($query, $key, $item, $bind, $k);
}
$array[] = 'field(' . $this->parseKey($query, $key, true) . ',' . implode(',', $val) . ')' . $sort;
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand($query);
} else {
if (is_numeric($key)) {
list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
} else {
$sort = $val;
}
$sort = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($query, $key, true) . $sort;
}
}
$order = implode(',', $array);
return ' ORDER BY ' . $order;
}
@ -950,11 +949,7 @@ abstract class Builder
return '';
}
if (is_array($index)) {
$index = join(",", $index);
}
return sprintf(" FORCE INDEX ( %s ) ", $index);
return sprintf(" FORCE INDEX ( %s ) ", is_array($index) ? implode(',', $index) : $index);
}
/**
@ -1070,7 +1065,7 @@ abstract class Builder
$fields = [];
foreach ($insertFields as $field) {
$fields[] = $this->parseKey($query, $field);
$fields[] = $this->parseKey($query, $field, true);
}
return str_replace(
@ -1102,7 +1097,7 @@ abstract class Builder
}
foreach ($fields as &$field) {
$field = $this->parseKey($query, $field);
$field = $this->parseKey($query, $field, true);
}
return 'INSERT INTO ' . $this->parseTable($query, $table, $options) . ' (' . implode(',', $fields) . ') ' . $this->select($options);

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

@ -2076,7 +2076,7 @@ abstract class Connection
{
if (is_scalar($value)) {
$data = $value;
} elseif (is_array($value) && isset($value[1], $value[2]) && in_array($value[1], ['=', 'eq'])) {
} elseif (is_array($value) && isset($value[1], $value[2]) && in_array($value[1], ['=', 'eq'], true) && is_scalar($value[2])) {
$data = $value[2];
}
@ -2089,7 +2089,7 @@ abstract class Connection
try {
return md5($prefix . serialize($query->getOptions()) . serialize($query->getBind(false)));
} catch (\Exception $e) {
return;
throw new Exception('closure not support cache(true)');
}
}

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

@ -1357,7 +1357,7 @@ class Query
public function useSoftDelete($field, $condition = null)
{
if ($field) {
$this->options['soft_delete'] = [$field, $condition ?: ['null', '']];
$this->options['soft_delete'] = [$field, $condition];
}
return $this;
@ -1447,7 +1447,6 @@ class Query
return $this->parseArrayWhereItems($field, $logic);
} elseif ($field instanceof \Closure) {
$where = $field;
$field = '';
} elseif (is_string($field)) {
if (preg_match('/[,=\<\'\"\(\s]/', $field)) {
return $this->whereRaw($field, $op);
@ -1460,11 +1459,7 @@ class Query
}
if (!empty($where)) {
if (isset($this->options['where'][$logic][$field])) {
$this->options['where'][$logic][] = $where;
} else {
$this->options['where'][$logic][$field] = $where;
}
$this->options['where'][$logic][] = $where;
}
return $this;
@ -1490,9 +1485,13 @@ class Query
if (in_array(strtoupper($op), ['NULL', 'NOTNULL', 'NOT NULL'], true)) {
// null查询
$where = [$field, $op, ''];
} elseif (in_array(strtolower($op), ['=', 'eq', null], true)) {
$where = [$field, 'NULL', ''];
} elseif (in_array(strtolower($op), ['<>', 'neq'], true)) {
$where = [$field, 'NOTNULL', ''];
} else {
// 字段相等查询
$where = is_null($op) ? [$field, 'NULL', ''] : [$field, '=', $op];
$where = [$field, '=', $op];
}
} else {
$where = $field ? [$field, $op, $condition] : null;
@ -1513,11 +1512,7 @@ class Query
if (key($field) !== 0) {
$where = [];
foreach ($field as $key => $val) {
if (is_null($val)) {
$where[$key] = [$key, 'NULL', ''];
} else {
$where[$key] = !is_scalar($val) ? $val : [$key, '=', $val];
}
$where[] = is_null($val) ? [$key, 'NULL', ''] : [$key, '=', $val];
}
} else {
// 数组批量查询
@ -1777,7 +1772,11 @@ class Query
$field = $this->options['via'] . '.' . $field;
}
$field = empty($order) ? $field : [$field => $order];
if (strpos($field, ',')) {
$field = array_map('trim', explode(',', $field));
} else {
$field = empty($order) ? $field : [$field => $order];
}
} elseif (!empty($this->options['via'])) {
foreach ($field as $key => $val) {
if (is_numeric($key)) {

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

@ -105,9 +105,10 @@ class Mysql extends Builder
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key)
public function parseKey(Query $query, $key, $strict = false)
{
if (is_int($key)) {
return $key;
@ -118,7 +119,7 @@ class Mysql extends Builder
// JSON字段支持
list($field, $name) = explode('->', $key, 2);
$key = 'json_extract(' . $this->parseKey($query, $field) . ', \'$.' . str_replace('->', '.', $name) . '\')';
return 'json_extract(' . $this->parseKey($query, $field) . ', \'$.' . str_replace('->', '.', $name) . '\')';
} elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
list($table, $key) = explode('.', $key, 2);
@ -134,7 +135,7 @@ class Mysql extends Builder
}
}
if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
if ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
$key = '`' . $key . '`';
}

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

@ -51,9 +51,10 @@ class Pgsql extends Builder
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key)
public function parseKey(Query $query, $key, $strict = false)
{
$key = trim($key);

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

@ -59,9 +59,10 @@ class Sqlite extends Builder
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key)
public function parseKey(Query $query, $key, $strict = false)
{
$key = trim($key);
if (strpos($key, '.')) {

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

@ -12,6 +12,7 @@
namespace think\db\builder;
use think\db\Builder;
use think\db\Expression;
use think\db\Query;
/**
@ -35,28 +36,30 @@ class Sqlsrv extends Builder
*/
protected function parseOrder(Query $query, $order)
{
if (is_array($order)) {
$array = [];
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if (false === strpos($val, '(')) {
$array[] = $this->parseKey($query, $val);
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand($query);
} else {
$array[] = $val;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';
$array[] = $this->parseKey($query, $key) . ' ' . $sort;
}
}
$order = implode(',', $array);
if (empty($order)) {
return ' ORDER BY rand()';
}
return !empty($order) ? ' ORDER BY ' . $order : ' ORDER BY rand()';
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand($query);
} else {
if (is_numeric($key)) {
list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
} else {
$sort = $val;
}
$sort = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($query, $key, true) . $sort;
}
}
return ' ORDER BY ' . implode(',', $array);
}
/**
@ -75,10 +78,15 @@ class Sqlsrv extends Builder
* @access public
* @param Query $query 查询对象
* @param string $key 字段名
* @param bool $strict 严格检测
* @return string
*/
public function parseKey(Query $query, $key)
public function parseKey(Query $query, $key, $strict = false)
{
if (is_int($key)) {
return $key;
}
$key = trim($key);
if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) {
@ -96,7 +104,7 @@ class Sqlsrv extends Builder
}
}
if (!is_numeric($key) && !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
if ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key)) {
$key = '[' . $key . ']';
}

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

@ -51,11 +51,23 @@ trait SoftDelete
if ($field) {
return $model
->db(false)
->useSoftDelete($field, ['not null', '']);
->useSoftDelete($field, $model->getWithTrashedExp());
}
return $model->db(false);
}
/**
* 获取软删除数据的查询条件
* @access protected
* @return array
*/
protected function getWithTrashedExp()
{
return is_null($this->defaultSoftDelete) ?
['notnull', ''] : ['<>', $this->defaultSoftDelete];
}
/**
* 删除当前的记录
* @access public
@ -143,16 +155,17 @@ trait SoftDelete
$name = $this->getDeleteTimeField();
if (empty($where)) {
$pk = $this->getPk();
$where[$pk] = [$pk, '=', $this->getData($pk)];
$pk = $this->getPk();
$where[] = [$pk, '=', $this->getData($pk)];
}
if ($name) {
// 恢复删除
return $this->db(false)
->where($where)
->useSoftDelete($name, ['not null', ''])
->update([$name => null]);
->useSoftDelete($name, $this->getWithTrashedExp())
->update([$name => $this->defaultSoftDelete]);
}
return 0;
@ -183,4 +196,19 @@ trait SoftDelete
return $field;
}
/**
* 查询的时候默认排除软删除数据
* @access protected
* @param Query $query
* @return void
*/
protected function withNoTrashed($query)
{
$field = $this->getDeleteTimeField(true);
if ($field) {
$query->useSoftDelete($field, $this->defaultSoftDelete);
}
}
}

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

@ -864,7 +864,7 @@ abstract class Rule
$request->route($var);
// 路由到模块/控制器/操作
return (new ModuleDispatch([$module, $controller, $action]))->convert(false);
return new ModuleDispatch([$module, $controller, $action], [], false);
}
/**

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

@ -316,7 +316,7 @@ class RuleGroup extends Rule
}
try {
if (!empty($regex) && preg_match('/^(?:' . implode('|', $regex) . ')/', $url, $match)) {
if (!empty($regex) && preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match)) {
$var = [];
foreach ($match as $key => $val) {
if (is_string($key) && '' !== $val) {

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

@ -309,7 +309,7 @@ class RuleItem extends Rule
$regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
try {
if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/', $url, $match)) {
if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/u', $url, $match)) {
return false;
}
} catch (\Exception $e) {

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

@ -23,6 +23,15 @@ class Module extends Dispatch
protected $controller;
protected $actionName;
public function __construct($dispatch, $param = [], $convert = null)
{
$this->app = Container::get('app');
$this->dispatch = $dispatch;
$this->param = $param;
$this->convert = $convert;
$this->init();
}
protected function init()
{
$result = $this->dispatch;
@ -90,13 +99,13 @@ class Module extends Dispatch
// 设置当前请求的控制器、操作
$this->app['request']->controller(Loader::parseName($this->controller, 1))->action($this->actionName);
// 监听module_init
$this->app['hook']->listen('module_init');
}
public function run()
{
// 监听module_init
$this->app['hook']->listen('module_init');
// 实例化控制器
try {
$instance = $this->app->controller($this->controller,

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

@ -141,7 +141,7 @@ class Php
if ($controller) {
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action());
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
} elseif (false === strpos($template, $depr)) {
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
}
@ -153,6 +153,14 @@ class Php
return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
}
protected function getActionTemplate($request)
{
$rule = [$request->action(true), Loader::parseName($request->action(true)), $request->action()];
$type = $this->config['auto_rule'];
return isset($rule[$type]) ? $rule[$type] : $rule[0];
}
/**
* 配置模板引擎
* @access private

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

@ -132,10 +132,11 @@ class Think
if (0 !== strpos($template, '/')) {
$template = str_replace(['/', ':'], $depr, $template);
$controller = Loader::parseName($request->controller());
if ($controller) {
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . (1 == $this->config['auto_rule'] ? Loader::parseName($request->action(true)) : $request->action());
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
} elseif (false === strpos($template, $depr)) {
$template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
}
@ -147,6 +148,14 @@ class Think
return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
}
protected function getActionTemplate($request)
{
$rule = [$request->action(true), Loader::parseName($request->action(true)), $request->action()];
$type = $this->config['auto_rule'];
return isset($rule[$type]) ? $rule[$type] : $rule[0];
}
/**
* 配置或者获取模板引擎参数
* @access private

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit2549c3dd10544eb5636e5209890b3eea
class ComposerAutoloaderInitb638b5638d156ef1335e2a3a226be4ad
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit2549c3dd10544eb5636e5209890b3eea
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit2549c3dd10544eb5636e5209890b3eea', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb638b5638d156ef1335e2a3a226be4ad', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit2549c3dd10544eb5636e5209890b3eea', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb638b5638d156ef1335e2a3a226be4ad', '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\ComposerStaticInit2549c3dd10544eb5636e5209890b3eea::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit2549c3dd10544eb5636e5209890b3eea
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit2549c3dd10544eb5636e5209890b3eea::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire2549c3dd10544eb5636e5209890b3eea($fileIdentifier, $file);
composerRequireb638b5638d156ef1335e2a3a226be4ad($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire2549c3dd10544eb5636e5209890b3eea($fileIdentifier, $file)
function composerRequireb638b5638d156ef1335e2a3a226be4ad($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 ComposerStaticInit2549c3dd10544eb5636e5209890b3eea
class ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad
{
public static $files = array (
'1cfd2761b63b0a29ed23657ea394cb2d' => __DIR__ . '/..' . '/topthink/think-captcha/src/helper.php',
@ -258,9 +258,9 @@ class ComposerStaticInit2549c3dd10544eb5636e5209890b3eea
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit2549c3dd10544eb5636e5209890b3eea::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2549c3dd10544eb5636e5209890b3eea::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2549c3dd10544eb5636e5209890b3eea::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb638b5638d156ef1335e2a3a226be4ad::$classMap;
}, null, ClassLoader::class);
}

12
vendor/composer/installed.json vendored
View File

@ -175,17 +175,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.8",
"version_normalized": "5.1.8.0",
"version": "v5.1.9",
"version_normalized": "5.1.9.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "8f6c84abd9e2f9db5a071168c0153724b54b083c"
"reference": "c49df2fa54879105e451f7eaaf841d218206f02f"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/framework/8f6c84abd9e2f9db5a071168c0153724b54b083c.zip",
"reference": "8f6c84abd9e2f9db5a071168c0153724b54b083c",
"url": "https://files.phpcomposer.com/files/top-think/framework/c49df2fa54879105e451f7eaaf841d218206f02f.zip",
"reference": "c49df2fa54879105e451f7eaaf841d218206f02f",
"shasum": ""
},
"require": {
@ -201,7 +201,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-04-06T05:28:49+00:00",
"time": "2018-04-12T11:16:28+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",