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

[更新]升级框架内核到5.0.10及相关组件

Browse Source
This commit is contained in:
Anyon 2017-07-04 15:39:50 +08:00
parent f7eb227442
commit dcff0e8d1f
33 changed files with 262 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thinkphp/base.php
View File

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

7
thinkphp/convention.php
View File

@ -4,9 +4,10 @@ return [
// +----------------------------------------------------------------------
// | 应用设置
// +----------------------------------------------------------------------
// 默认Host地址
'app_host' => '',
// 应用调试模式
'app_debug' => true,
'app_debug' => false,
// 应用Trace
'app_trace' => false,
// 应用模式状态
@ -73,6 +74,8 @@ return [
'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
// pathinfo分隔符
'pathinfo_depr' => '/',
// HTTPS代理标识
'https_agent_name' => '',
// URL伪静态后缀
'url_html_suffix' => 'html',
// URL普通方式参数 用于自动生成

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

@ -33,7 +33,7 @@ return [
'illegal action name' => '非法的操作名称',
'url suffix deny' => '禁止的URL后缀访问',
'Route Not Found' => '当前访问路由未定义',
'Underfined db type' => '未定义数据库类型',
'Undefined db type' => '未定义数据库类型',
'variable type error' => '变量类型错误',
'PSR-4 error' => 'PSR-4 规范错误',
'not support total' => '简洁模式下不能获取数据总数',

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

@ -492,7 +492,7 @@ class App
$dir = CONF_PATH . $module . 'extra';
$files = scandir($dir);
foreach ($files as $file) {
if (strpos($file, CONF_EXT)) {
if ('.' . pathinfo($file, PATHINFO_EXTENSION) === CONF_EXT) {
$filename = $dir . DS . $file;
Config::load($filename, pathinfo($file, PATHINFO_FILENAME));
}

23
thinkphp/library/think/Build.php
View File

@ -116,10 +116,7 @@ class Build
if ('__dir__' == $path) {
// 生成子目录
foreach ($file as $dir) {
if (!is_dir($modulePath . $dir)) {
// 创建目录
mkdir($modulePath . $dir, 0755, true);
}
self::checkDirBuild($modulePath . $dir);
}
} elseif ('__file__' == $path) {
// 生成（空白）文件
@ -144,10 +141,7 @@ class Build
break;
case 'view': // 视图
$filename = $modulePath . $path . DS . $val . '.html';
if (!is_dir(dirname($filename))) {
// 创建目录
mkdir(dirname($filename), 0755, true);
}
self::checkDirBuild(dirname($filename));
$content = '';
break;
default:
@ -177,9 +171,7 @@ class Build
if (!is_file($filename)) {
$content = file_get_contents(THINK_PATH . 'tpl' . DS . 'default_index.tpl');
$content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [$namespace, $module ? $module . '\\' : '', 'controller', $suffix ? 'Controller' : ''], $content);
if (!is_dir(dirname($filename))) {
mkdir(dirname($filename), 0755, true);
}
self::checkDirBuild(dirname($filename));
file_put_contents($filename, $content);
}
}
@ -193,6 +185,8 @@ class Build
protected static function buildCommon($module)
{
$filename = CONF_PATH . ($module ? $module . DS : '') . 'config.php';
self::checkDirBuild(dirname($filename));
if (!is_file($filename)) {
file_put_contents($filename, "<?php\n//配置文件\nreturn [\n\n];");
}
@ -201,4 +195,11 @@ class Build
file_put_contents($filename, "<?php\n");
}
}
protected static function checkDirBuild($dirname)
{
if (!is_dir($dirname)) {
mkdir($dirname, 0755, true);
}
}
}

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

@ -74,7 +74,7 @@ class Db
// 解析连接参数 支持数组和字符串
$options = self::parseConfig($config);
if (empty($options['type'])) {
throw new \InvalidArgumentException('Underfined db type');
throw new \InvalidArgumentException('Undefined db type');
}
$class = false !== strpos($options['type'], '\\') ? $options['type'] : '\\think\\db\\connector\\' . ucwords($options['type']);
// 记录初始化信息

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

@ -38,7 +38,7 @@ class Debug
}
/**
* 统计某个区间的时间（微秒）使用情况
* 统计某个区间的时间（微秒）使用情况 返回值以秒为单位
* @param string $start 开始标签
* @param string $end 结束标签
* @param integer|string $dec 小数位
@ -53,7 +53,7 @@ class Debug
}
/**
* 统计从开始到统计时的时间（微秒）使用情况
* 统计从开始到统计时的时间（微秒）使用情况 返回值以秒为单位
* @param integer|string $dec 小数位
* @return integer
*/

5
thinkphp/library/think/Env.php
View File

@ -23,6 +23,11 @@ class Env
{
$result = getenv(ENV_PREFIX . strtoupper(str_replace('.', '_', $name)));
if (false !== $result) {
if ('false' === $result) {
$result = false;
} elseif ('true' === $result) {
$result = true;
}
return $result;
} else {
return $default;

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

@ -158,7 +158,7 @@ class Log
if ($result) {
self::$log = [];
}
Hook::listen('log_write_done', $log);
return $result;
}
return true;

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

@ -13,7 +13,7 @@ namespace think;
use InvalidArgumentException;
use think\db\Query;
use think\Exception\ValidateException;
use think\exception\ValidateException;
use think\model\Collection as ModelCollection;
use think\model\Relation;
use think\model\relation\BelongsTo;
@ -324,6 +324,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
}
/**
* 是否需要自动写入时间字段
* @access public
* @param bool $auto
* @return $this
*/
public function isAutoWriteTimestamp($auto)
{
$this->autoWriteTimestamp = $auto;
return $this;
}
/**
* 修改器 设置数据对象值
* @access public
@ -826,6 +838,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return json_encode($this->toArray(), $options);
}
/**
* 移除当前模型的关联属性
* @access public
* @return $this
*/
public function removeRelation()
{
$this->relation = [];
return $this;
}
/**
* 转换当前模型数据集为数据集对象
* @access public
@ -952,20 +975,17 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
$pk = $this->getPk();
if ($this->isUpdate) {
// 检测字段
$this->checkAllowField($this->data, array_merge($this->auto, $this->update));
// 自动更新
$this->autoCompleteData($this->update);
// 获取有更新的数据
$data = $this->getChangedData();
// 事件回调
if (false === $this->trigger('before_update', $this)) {
return false;
}
// 获取有更新的数据
$data = $this->getChangedData();
if (empty($data) || (count($data) == 1 && is_string($pk) && isset($data[$pk]))) {
// 关联更新
if (isset($relation)) {
@ -974,7 +994,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return 0;
} elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
// 自动写入更新时间
$data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
$data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
$this->data[$this->updateTime] = $data[$this->updateTime];
}
if (empty($where) && !empty($this->updateWhere)) {
@ -996,8 +1017,15 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
unset($data[$pk]);
}
// 检测字段
$allowFields = $this->checkAllowField(array_merge($this->auto, $this->update));
// 模型更新
$result = $this->getQuery()->where($where)->update($data);
if (!empty($allowFields)) {
$result = $this->getQuery()->where($where)->strict(false)->field($allowFields)->update($data);
} else {
$result = $this->getQuery()->where($where)->update($data);
}
// 关联更新
if (isset($relation)) {
@ -1008,9 +1036,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->trigger('after_update', $this);
} else {
// 检测字段
$this->checkAllowField($this->data, array_merge($this->auto, $this->insert));
// 自动写入
$this->autoCompleteData($this->insert);
@ -1028,7 +1053,13 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return false;
}
$result = $this->getQuery()->insert($this->data);
// 检测字段
$allowFields = $this->checkAllowField(array_merge($this->auto, $this->insert));
if (!empty($allowFields)) {
$result = $this->getQuery()->strict(false)->field($allowFields)->insert($this->data);
} else {
$result = $this->getQuery()->insert($this->data);
}
// 获取自动增长主键
if ($result && is_string($pk) && (!isset($this->data[$pk]) || '' == $this->data[$pk])) {
@ -1061,22 +1092,22 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $result;
}
protected function checkAllowField(&$data, $auto = [])
protected function checkAllowField($auto = [])
{
if (!empty($this->field)) {
if (true === $this->field) {
if (!empty($this->origin)) {
$this->field = array_keys($this->origin);
$field = $this->field;
} elseif (true === $this->field) {
$this->field = $this->getQuery()->getTableInfo('', 'fields');
$field = $this->field;
} else {
$field = array_merge($this->field, $auto);
}
foreach ($data as $key => $val) {
if (!in_array($key, $field)) {
unset($data[$key]);
}
}
} else {
$field = [];
}
return $field;
}
protected function autoRelationUpdate($relation)
@ -1120,6 +1151,66 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return $data;
}
/**
* 字段值(延迟)增长
* @access public
* @param string $field 字段名
* @param integer $step 增长值
* @param integer $lazyTime 延时时间(s)
* @return integer|true
* @throws Exception
*/
public function setInc($field, $step = 1, $lazyTime = 0)
{
// 删除条件
$pk = $this->getPk();
if (is_string($pk) && isset($this->data[$pk])) {
$where = [$pk => $this->data[$pk]];
} elseif (!empty($this->updateWhere)) {
$where = $this->updateWhere;
} else {
$where = null;
}
$result = $this->getQuery()->where($where)->setInc($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] += $step;
}
return $result;
}
/**
* 字段值(延迟)增长
* @access public
* @param string $field 字段名
* @param integer $step 增长值
* @param integer $lazyTime 延时时间(s)
* @return integer|true
* @throws Exception
*/
public function setDec($field, $step = 1, $lazyTime = 0)
{
// 删除条件
$pk = $this->getPk();
if (is_string($pk) && isset($this->data[$pk])) {
$where = [$pk => $this->data[$pk]];
} elseif (!empty($this->updateWhere)) {
$where = $this->updateWhere;
} else {
$where = null;
}
$result = $this->getQuery()->where($where)->setDec($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] -= $step;
}
return $result;
}
/**
* 保存多个数据到当前数据对象
* @access public
@ -1555,6 +1646,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$model = new static();
$query = $model->db();
$params = func_get_args();
array_shift($params);
array_unshift($params, $query);
if ($name instanceof \Closure) {
call_user_func_array($name, $params);
@ -1855,7 +1947,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 记录当前关联信息
$model = $this->parseModel($model);
$name = Loader::parseName(basename(str_replace('\\', '/', $model)));
$table = $table ?: $this->getQuery()->getTable(Loader::parseName($this->name) . '_' . $name);
$table = $table ?: Loader::parseName($this->name) . '_' . $name;
$foreignKey = $foreignKey ?: $name . '_id';
$localKey = $localKey ?: $this->getForeignKey($this->name);
return new BelongsToMany($this, $model, $table, $foreignKey, $localKey);

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

@ -132,6 +132,7 @@ class Request
if (is_null($this->filter)) {
$this->filter = Config::get('default_filter');
}
// 保存 php://input
$this->input = file_get_contents('php://input');
}
@ -601,7 +602,7 @@ class Request
}
/**
* 获取获取当前请求的参数
* 获取当前请求的参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -638,7 +639,7 @@ class Request
}
/**
* 设置获取获取路由参数
* 设置获取路由参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -655,7 +656,7 @@ class Request
}
/**
* 设置获取获取GET参数
* 设置获取GET参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -675,7 +676,7 @@ class Request
}
/**
* 设置获取获取POST参数
* 设置获取POST参数
* @access public
* @param string $name 变量名
* @param mixed $default 默认值
@ -700,7 +701,7 @@ class Request
}
/**
* 设置获取获取PUT参数
* 设置获取PUT参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -726,7 +727,7 @@ class Request
}
/**
* 设置获取获取DELETE参数
* 设置获取DELETE参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -739,7 +740,7 @@ class Request
}
/**
* 设置获取获取PATCH参数
* 设置获取PATCH参数
* @access public
* @param string|array $name 变量名
* @param mixed $default 默认值
@ -1214,6 +1215,8 @@ class Request
return true;
} elseif (isset($server['HTTP_X_FORWARDED_PROTO']) && 'https' == $server['HTTP_X_FORWARDED_PROTO']) {
return true;
} elseif (Config::get('https_agent_name') && isset($server[Config::get('https_agent_name')])) {
return true;
}
return false;
}
@ -1541,7 +1544,7 @@ class Request
$key = call_user_func_array($key, [$this]);
} elseif (true === $key) {
foreach ($except as $rule) {
if (0 === strpos($this->url(), $rule)) {
if (0 === stripos($this->url(), $rule)) {
return;
}
}

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

@ -89,6 +89,9 @@ class Response
*/
public function send()
{
// 监听response_send
Hook::listen('response_send', $this);
// 处理输出数据
$data = $this->getContent();

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

@ -1159,7 +1159,7 @@ class Route
private static function checkRule($rule, $route, $url, $pattern, $option, $depr)
{
// 检查完整规则定义
if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
return false;
}
// 检查路由的参数分隔符
@ -1349,7 +1349,7 @@ class Route
if (false === $result) {
return false;
}
} elseif (!preg_match('/^' . $pattern[$name] . '$/', $m1[$key])) {
} elseif (!preg_match(0 === strpos($pattern[$name], '/') ? $pattern[$name] : '/^' . $pattern[$name] . '$/', $m1[$key])) {
return false;
}
}
@ -1449,6 +1449,10 @@ class Route
$request->bind($bind);
}
if (!empty($option['response'])) {
Hook::add('response_send', $option['response']);
}
// 解析额外参数
self::parseUrlParams(empty($paths) ? '' : implode('|', $paths), $matches);
// 记录匹配的路由信息

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

@ -235,7 +235,7 @@ class Url
$rootDomain = Config::get('url_domain_root');
if (true === $domain) {
// 自动判断域名
$domain = $request->host();
$domain = Config::get('app_host') ?: $request->host();
$domains = Route::rules('domain');
if ($domains) {
@ -265,14 +265,19 @@ class Url
} else {
if (empty($rootDomain)) {
$host = $request->host();
$host = Config::get('app_host') ?: $request->host();
$rootDomain = substr_count($host, '.') > 1 ? substr(strstr($host, '.'), 1) : $host;
}
if (substr_count($domain, '.') < 2 && !strpos($domain, $rootDomain)) {
$domain .= '.' . $rootDomain;
}
}
return ($request->isSsl() ? 'https://' : 'http://') . $domain;
if (false !== strpos($domain, ':')) {
$scheme = '';
} else {
$scheme = $request->isSsl() || Config::get('is_https') ? 'https://' : 'http://';
}
return $scheme . $domain;
}
// 解析URL后缀

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

@ -165,7 +165,7 @@ class Validate
}
/**
* 获取验证规则的默认提示信息
* 设置验证规则的默认提示信息
* @access protected
* @param string|array $type 验证规则类型名称或者数组
* @param string $msg 验证提示信息

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

@ -170,8 +170,9 @@ abstract class Driver
$key = 'tag_' . md5($this->tag);
$this->tag = null;
if ($this->has($key)) {
$value = $this->get($key);
$value .= ',' . $name;
$value = explode(',', $this->get($key));
$value[] = $name;
$value = implode(',', array_unique($value));
} else {
$value = $name;
}

7
thinkphp/library/think/console/command/Make.php
View File

@ -11,6 +11,7 @@
namespace think\console\command;
use think\App;
use think\Config;
use think\console\Command;
use think\console\Input;
@ -64,21 +65,21 @@ abstract class Make extends Command
return str_replace(['{%className%}', '{%namespace%}', '{%app_namespace%}'], [
$class,
$namespace,
Config::get('app_namespace')
App::$namespace,
], $stub);
}
protected function getPathName($name)
{
$name = str_replace(Config::get('app_namespace') . '\\', '', $name);
$name = str_replace(App::$namespace . '\\', '', $name);
return APP_PATH . str_replace('\\', '/', $name) . '.php';
}
protected function getClassName($name)
{
$appNamespace = Config::get('app_namespace');
$appNamespace = App::$namespace;
if (strpos($name, $appNamespace . '\\') === 0) {
return $name;

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

@ -22,12 +22,12 @@ abstract class Builder
protected $query;
// 数据库表达式
protected $exp = ['eq' => '=', 'neq' => '<>', 'gt' => '>', 'egt' => '>=', 'lt' => '<', 'elt' => '<=', 'notlike' => 'NOT LIKE', 'like' => 'LIKE', 'in' => 'IN', 'exp' => 'EXP', 'notin' => 'NOT IN', 'not in' => 'NOT IN', 'between' => 'BETWEEN', 'not between' => 'NOT BETWEEN', 'notbetween' => 'NOT BETWEEN', 'exists' => 'EXISTS', 'notexists' => 'NOT EXISTS', 'not exists' => 'NOT EXISTS', 'null' => 'NULL', 'notnull' => 'NOT NULL', 'not null' => 'NOT NULL', '> time' => '> TIME', '< time' => '< TIME', '>= time' => '>= TIME', '<= time' => '<= TIME', 'between time' => 'BETWEEN TIME', 'not between time' => 'NOT BETWEEN TIME', 'notbetween time' => 'NOT BETWEEN TIME'];
protected $exp = ['eq' => '=', 'neq' => '<>', 'gt' => '>', 'egt' => '>=', 'lt' => '<', 'elt' => '<=', 'notlike' => 'NOT LIKE', 'not like' => 'NOT LIKE', 'like' => 'LIKE', 'in' => 'IN', 'exp' => 'EXP', 'notin' => 'NOT IN', 'not in' => 'NOT IN', 'between' => 'BETWEEN', 'not between' => 'NOT BETWEEN', 'notbetween' => 'NOT BETWEEN', 'exists' => 'EXISTS', 'notexists' => 'NOT EXISTS', 'not exists' => 'NOT EXISTS', 'null' => 'NULL', 'notnull' => 'NOT NULL', 'not null' => 'NOT NULL', '> time' => '> TIME', '< time' => '< TIME', '>= time' => '>= TIME', '<= time' => '<= TIME', 'between time' => 'BETWEEN TIME', 'not between time' => 'NOT BETWEEN TIME', 'notbetween time' => 'NOT BETWEEN TIME'];
// SQL表达式
protected $selectSql = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%JOIN%%WHERE%%GROUP%%HAVING%%ORDER%%LIMIT% %UNION%%LOCK%%COMMENT%';
protected $insertSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
protected $updateSql = 'UPDATE %TABLE% SET %SET% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
protected $deleteSql = 'DELETE FROM %TABLE% %USING% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
@ -88,7 +88,7 @@ abstract class Builder
}
// 获取绑定信息
$bind = $this->query->getFieldsBind($options);
$bind = $this->query->getFieldsBind($options['table']);
if ('*' == $options['field']) {
$fields = array_keys($bind);
} else {
@ -199,7 +199,7 @@ abstract class Builder
$key = strstr($key, '@think', true);
}
$key = $this->parseSqlTable($key);
$item[] = $this->parseKey($key) . ' ' . $this->parseKey($table);
$item[] = $this->parseKey($key) . ' ' . (isset($options['alias'][$table]) ? $this->parseKey($options['alias'][$table]) : $this->parseKey($table));
} else {
$table = $this->parseSqlTable($table);
if (isset($options['alias'][$table])) {
@ -226,7 +226,7 @@ abstract class Builder
// 附加软删除条件
list($field, $condition) = $options['soft_delete'];
$binds = $this->query->getFieldsBind($options);
$binds = $this->query->getFieldsBind($options['table']);
$whereStr = $whereStr ? '( ' . $whereStr . ' ) AND ' : '';
$whereStr = $whereStr . $this->parseWhereItem($field, $condition, '', $options, $binds);
}
@ -251,7 +251,7 @@ abstract class Builder
}
$whereStr = '';
$binds = $this->query->getFieldsBind($options);
$binds = $this->query->getFieldsBind($options['table']);
foreach ($where as $key => $val) {
$str = [];
foreach ($val as $field => $value) {
@ -376,15 +376,17 @@ abstract class Builder
if ($value instanceof \Closure) {
$whereStr .= $key . ' ' . $exp . ' ' . $this->parseClosure($value);
} else {
$value = is_array($value) ? $value : explode(',', $value);
$value = array_unique(is_array($value) ? $value : explode(',', $value));
if (array_key_exists($field, $binds)) {
$bind = [];
$array = [];
foreach ($value as $k => $v) {
if ($this->query->isBind($bindName . '_in_' . $k)) {
$bindKey = $bindName . '_in_' . uniqid() . '_' . $k;
$i = 0;
foreach ($value as $v) {
$i++;
if ($this->query->isBind($bindName . '_in_' . $i)) {
$bindKey = $bindName . '_in_' . uniqid() . '_' . $i;
} else {
$bindKey = $bindName . '_in_' . $k;
$bindKey = $bindName . '_in_' . $i;
}
$bind[$bindKey] = [$v, $bindType];
$array[] = ':' . $bindKey;
@ -719,13 +721,14 @@ abstract class Builder
* @access public
* @param array $dataSet 数据集
* @param array $options 表达式
* @param bool $replace 是否replace
* @return string
*/
public function insertAll($dataSet, $options)
public function insertAll($dataSet, $options, $replace = false)
{
// 获取合法的字段
if ('*' == $options['field']) {
$fields = array_keys($this->query->getFieldsType($options));
$fields = array_keys($this->query->getFieldsType($options['table']));
} else {
$fields = $options['field'];
}
@ -754,8 +757,9 @@ abstract class Builder
}
$fields = array_map([$this, 'parseKey'], array_keys(reset($dataSet)));
$sql = str_replace(
['%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
[
$replace ? 'REPLACE' : 'INSERT',
$this->parseTable($options['table'], $options),
implode(' , ', $fields),
implode(' UNION ALL ', $values),

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

@ -386,7 +386,7 @@ abstract class Connection
return $this->close()->query($sql, $bind, $master, $pdo);
}
throw new PDOException($e, $this->config, $this->getLastsql());
} catch (\ErrorException $e) {
} catch (\Exception $e) {
if ($this->isBreak($e)) {
return $this->close()->query($sql, $bind, $master, $pdo);
}
@ -449,7 +449,7 @@ abstract class Connection
return $this->close()->execute($sql, $bind);
}
throw new PDOException($e, $this->config, $this->getLastsql());
} catch (\ErrorException $e) {
} catch (\Exception $e) {
if ($this->isBreak($e)) {
return $this->close()->execute($sql, $bind);
}

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

@ -395,7 +395,7 @@ class Query
public function value($field, $default = null, $force = false)
{
$result = false;
if (empty($options['fetch_sql']) && !empty($this->options['cache'])) {
if (empty($this->options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存
$cache = $this->options['cache'];
if (empty($this->options['table'])) {
@ -438,7 +438,7 @@ class Query
public function column($field, $key = '')
{
$result = false;
if (empty($options['fetch_sql']) && !empty($this->options['cache'])) {
if (empty($this->options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存
$cache = $this->options['cache'];
if (empty($this->options['table'])) {
@ -1776,21 +1776,21 @@ class Query
}
// 获取当前数据表字段信息
public function getTableFields($options)
public function getTableFields($table = '')
{
return $this->getTableInfo($options['table'], 'fields');
return $this->getTableInfo($table ?: $this->getOptions('table'), 'fields');
}
// 获取当前数据表字段类型
public function getFieldsType($options)
public function getFieldsType($table = '')
{
return $this->getTableInfo($options['table'], 'type');
return $this->getTableInfo($table ?: $this->getOptions('table'), 'type');
}
// 获取当前数据表绑定信息
public function getFieldsBind($options)
public function getFieldsBind($table = '')
{
$types = $this->getFieldsType($options);
$types = $this->getFieldsType($table);
$bind = [];
if ($types) {
foreach ($types as $key => $type) {
@ -2117,9 +2117,10 @@ class Query
* 批量插入记录
* @access public
* @param mixed $dataSet 数据集
* @param boolean $replace 是否replace
* @return integer|string
*/
public function insertAll(array $dataSet)
public function insertAll(array $dataSet, $replace = false)
{
// 分析查询表达式
$options = $this->parseExpress();
@ -2127,7 +2128,7 @@ class Query
return false;
}
// 生成SQL语句
$sql = $this->builder->insertAll($dataSet, $options);
$sql = $this->builder->insertAll($dataSet, $options, $replace);
// 获取参数绑定
$bind = $this->getBind();
if ($options['fetch_sql']) {
@ -2300,7 +2301,7 @@ class Query
$key = is_string($cache['key']) ? $cache['key'] : md5(serialize($options) . serialize($this->bind));
$resultSet = Cache::get($key);
}
if (!$resultSet) {
if (false === $resultSet) {
// 生成查询SQL
$sql = $this->builder->select($options);
// 获取参数绑定
@ -2322,7 +2323,7 @@ class Query
}
}
if (isset($cache) && $resultSet) {
if (isset($cache) && false !== $resultSet) {
// 缓存数据集
$this->cacheData($key, $resultSet, $cache);
}
@ -2480,7 +2481,7 @@ class Query
$result = isset($resultSet[0]) ? $resultSet[0] : null;
}
if (isset($cache) && $result) {
if (isset($cache) && false !== $result) {
// 缓存数据
$this->cacheData($key, $result, $cache);
}

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

@ -21,7 +21,7 @@ class Sqlsrv extends Builder
protected $selectSql = 'SELECT T1.* FROM (SELECT thinkphp.*, ROW_NUMBER() OVER (%ORDER%) AS ROW_NUMBER FROM (SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%) AS thinkphp) AS T1 %LIMIT%%COMMENT%';
protected $selectInsertSql = 'SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%';
protected $updateSql = 'UPDATE %TABLE% SET %SET% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
protected $deleteSql = 'DELETE FROM %TABLE% %USING% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
protected $deleteSql = 'DELETE FROM %TABLE% %USING% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
/**
* order分析

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

@ -51,7 +51,6 @@ class Mysql extends Connection
*/
public function getFields($tableName)
{
$this->initConnect(false);
list($tableName) = explode(' ', $tableName);
if (false === strpos($tableName, '`')) {
if (strpos($tableName, '.')) {
@ -59,12 +58,8 @@ class Mysql extends Connection
}
$tableName = '`' . $tableName . '`';
}
$sql = 'SHOW COLUMNS FROM ' . $tableName;
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$sql = 'SHOW COLUMNS FROM ' . $tableName;
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
if ($result) {
@ -91,13 +86,8 @@ class Mysql extends Connection
*/
public function getTables($dbName = '')
{
$this->initConnect(false);
$sql = !empty($dbName) ? 'SHOW TABLES FROM ' . $dbName : 'SHOW TABLES ';
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$sql = !empty($dbName) ? 'SHOW TABLES FROM ' . $dbName : 'SHOW TABLES ';
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
foreach ($result as $key => $val) {

18
thinkphp/library/think/db/connector/Pgsql.php
View File

@ -44,14 +44,11 @@ class Pgsql extends Connection
*/
public function getFields($tableName)
{
$this->initConnect(false);
list($tableName) = explode(' ', $tableName);
$sql = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\'' . $tableName . '\');';
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
if ($result) {
@ -78,13 +75,8 @@ class Pgsql extends Connection
*/
public function getTables($dbName = '')
{
$this->initConnect(false);
$sql = "select tablename as Tables_in_test from pg_tables where schemaname ='public'";
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$sql = "select tablename as Tables_in_test from pg_tables where schemaname ='public'";
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
foreach ($result as $key => $val) {

17
thinkphp/library/think/db/connector/Sqlite.php
View File

@ -42,14 +42,10 @@ class Sqlite extends Connection
*/
public function getFields($tableName)
{
$this->initConnect(false);
list($tableName) = explode(' ', $tableName);
$sql = 'PRAGMA table_info( ' . $tableName . ' )';
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
if ($result) {
@ -76,15 +72,12 @@ class Sqlite extends Connection
*/
public function getTables($dbName = '')
{
$this->initConnect(false);
$sql = "SELECT name FROM sqlite_master WHERE type='table' "
. "UNION ALL SELECT name FROM sqlite_temp_master "
. "WHERE type='table' ORDER BY name";
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
foreach ($result as $key => $val) {

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

@ -49,7 +49,6 @@ class Sqlsrv extends Connection
*/
public function getFields($tableName)
{
$this->initConnect(false);
list($tableName) = explode(' ', $tableName);
$sql = "SELECT column_name, data_type, column_default, is_nullable
FROM information_schema.tables AS t
@ -58,11 +57,8 @@ class Sqlsrv extends Connection
AND t.table_schema = c.table_schema
AND t.table_name = c.table_name
WHERE t.table_name = '$tableName'";
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
if ($result) {
@ -99,16 +95,12 @@ class Sqlsrv extends Connection
*/
public function getTables($dbName = '')
{
$this->initConnect(false);
$sql = "SELECT TABLE_NAME
FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_TYPE = 'BASE TABLE'
";
// 调试开始
$this->debug(true);
$pdo = $this->linkID->query($sql);
// 调试结束
$this->debug(false, $sql);
$pdo = $this->query($sql, [], false, true);
$result = $pdo->fetchAll(PDO::FETCH_ASSOC);
$info = [];
foreach ($result as $key => $val) {

1
thinkphp/library/think/exception/DbException.php
View File

@ -36,6 +36,7 @@ class DbException extends Exception
'Error SQL' => $sql,
]);
unset($config['username'], $config['password']);
$this->setData('Database Config', $config);
}

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

@ -93,7 +93,7 @@ class BelongsToMany extends Relation
}
}
}
$model->pivot = $this->newPivot($pivot);
$model->setRelation('pivot', $this->newPivot($pivot));
}
}
@ -105,9 +105,8 @@ class BelongsToMany extends Relation
{
$foreignKey = $this->foreignKey;
$localKey = $this->localKey;
$middle = $this->middle;
$pk = $this->parent->getPk();
// 关联查询
$pk = $this->parent->getPk();
$condition['pivot.' . $localKey] = $this->parent->$pk;
return $this->belongsToManyQuery($foreignKey, $localKey, $condition);
}
@ -162,7 +161,9 @@ class BelongsToMany extends Relation
public function find($data = null)
{
$result = $this->buildQuery()->find($data);
$this->hydratePivot([$result]);
if ($result) {
$this->hydratePivot([$result]);
}
return $result;
}
@ -357,7 +358,7 @@ class BelongsToMany extends Relation
}
}
}
$set->pivot = $this->newPivot($pivot);
$set->setRelation('pivot', $this->newPivot($pivot));
$data[$pivot[$this->localKey]][] = $set;
}
return $data;

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

@ -130,10 +130,9 @@ class HasManyThrough extends Relation
{
if (empty($this->baseQuery) && $this->parent->getData()) {
$through = $this->through;
$model = $this->model;
$alias = Loader::parseName(basename(str_replace('\\', '/', $model)));
$alias = Loader::parseName(basename(str_replace('\\', '/', $this->model)));
$throughTable = $through::getTable();
$pk = (new $this->model)->getPk();
$pk = (new $through)->getPk();
$throughKey = $this->throughKey;
$modelTable = $this->parent->getTable();
$this->query->field($alias . '.*')->alias($alias)

2
thinkphp/library/think/response/Redirect.php
View File

@ -67,7 +67,7 @@ class Redirect extends Response
*/
public function getTargetUrl()
{
return (strpos($this->data, '://') || 0 === strpos($this->data, '/')) ? $this->data : Url::build($this->data, $this->params);
return strpos($this->data, '://') ? $this->data : Url::build($this->data, $this->params);
}
public function params($params = [])

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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

16
vendor/composer/installed.json vendored
View File

@ -169,17 +169,17 @@
},
{
"name": "topthink/framework",
"version": "v5.0.9",
"version_normalized": "5.0.9.0",
"version": "v5.0.10",
"version_normalized": "5.0.10.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "24ae4b9042bf9acfd041eb34602b14eb8669bc3f"
"reference": "90d71bbc76d0915e0cf51ecad57350c0c79d5a3f"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/framework/24ae4b9042bf9acfd041eb34602b14eb8669bc3f.zip",
"reference": "24ae4b9042bf9acfd041eb34602b14eb8669bc3f",
"url": "https://files.phpcomposer.com/files/top-think/framework/90d71bbc76d0915e0cf51ecad57350c0c79d5a3f.zip",
"reference": "90d71bbc76d0915e0cf51ecad57350c0c79d5a3f",
"shasum": ""
},
"require": {
@ -194,7 +194,7 @@
"phpunit/phpunit": "4.8.*",
"sebastian/phpcpd": "2.*"
},
"time": "2017-05-20T10:43:04+00:00",
"time": "2017-07-04T03:46:13+00:00",
"type": "think-framework",
"installation-source": "dist",
"autoload": {
@ -381,8 +381,8 @@
},
{
"name": "symfony/options-resolver",
"version": "v3.3.2",
"version_normalized": "3.3.2.0",
"version": "v3.3.3",
"version_normalized": "3.3.3.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",