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

[更新]ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2018-10-25 16:19:01 +08:00
parent a1e6e0495e
commit c09758fa72
34 changed files with 248 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.cmd
View File

@ -1,12 +1,6 @@
@echo off
title Composer Plugs Update and Optimize
echo.
echo ========= 1. 清理已安装插件 =========
@title Composer Plugs Update and Optimize
@rmdir /s/q vendor thinkphp
echo.
echo ========= 2. 下载并安装插件 =========
composer update --profile --prefer-dist --optimize-autoloader
echo.
echo ========= 3. 压缩并发布插件 =========
composer dump-autoload --optimize
exit

132
config/app.php
View File

@ -12,135 +12,11 @@
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
use think\facade\Env;
return [
// 应用名称
'app_name' => '',
// 应用地址
'app_host' => '',
// 应用调试模式
'app_debug' => true,
// 应用Trace
'app_trace' => false,
// 是否支持多模块
'app_multi_module' => true,
// 入口自动绑定模块
'auto_bind_module' => false,
// 注册的根命名空间
'root_namespace' => [],
// 默认输出类型
'default_return_type' => 'html',
// 默认AJAX 数据返回格式,可选json xml ...
'default_ajax_return' => 'json',
// 默认JSONP格式返回的处理方法
'default_jsonp_handler' => 'jsonpReturn',
// 默认JSONP处理方法
'var_jsonp_handler' => 'callback',
// 默认时区
'default_timezone' => 'Asia/Shanghai',
// 是否开启多语言
'lang_switch_on' => false,
// 默认全局过滤方法 用逗号分隔多个
'default_filter' => '',
// 默认语言
'default_lang' => 'zh-cn',
// 应用类库后缀
'class_suffix' => false,
// 控制器类后缀
'controller_suffix' => false,
// +----------------------------------------------------------------------
// | 模块设置
// +----------------------------------------------------------------------
// 默认模块名
'default_module' => 'index',
// 禁止访问模块
'deny_module_list' => ['common'],
// 默认控制器名
'default_controller' => 'Index',
// 默认操作名
'default_action' => 'index',
// 默认验证器
'default_validate' => '',
// 默认的空模块名
'empty_module' => '',
// 默认的空控制器名
'empty_controller' => 'Error',
// 操作方法前缀
'use_action_prefix' => false,
// 操作方法后缀
'action_suffix' => '',
// 自动搜索控制器
'controller_auto_search' => false,
// +----------------------------------------------------------------------
// | URL设置
// +----------------------------------------------------------------------
// PATHINFO变量名 用于兼容模式
'var_pathinfo' => 's',
// 兼容PATH_INFO获取
'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
// pathinfo分隔符
'pathinfo_depr' => '/',
// HTTPS代理标识
'https_agent_name' => '',
// IP代理获取标识
'http_agent_ip' => 'X-REAL-IP',
// URL伪静态后缀
'url_html_suffix' => 'html',
// URL普通方式参数 用于自动生成
'url_common_param' => false,
'app_debug' => true,
// 应用Trace调试
'app_trace' => false,
// URL参数方式 0 按名称成对解析 1 按顺序解析
'url_param_type' => 1,
// 是否开启路由延迟解析
'url_lazy_route' => false,
// 是否强制使用路由
'url_route_must' => false,
// 合并路由规则
'route_rule_merge' => false,
// 路由是否完全匹配
'route_complete_match' => false,
// 使用注解路由
'route_annotation' => false,
// 域名根，如thinkphp.cn
'url_domain_root' => '',
// 是否自动转换URL中的控制器和操作名
'url_convert' => true,
// 默认的访问控制器层
'url_controller_layer' => 'controller',
// 表单请求类型伪装变量
'var_method' => '_method',
// 表单ajax伪装变量
'var_ajax' => '_ajax',
// 表单pjax伪装变量
'var_pjax' => '_pjax',
// 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
'request_cache' => false,
// 请求缓存有效期
'request_cache_expire' => null,
// 全局请求缓存排除规则
'request_cache_except' => [],
// 是否开启路由缓存
'route_check_cache' => false,
// 路由缓存的Key自定义设置（闭包），默认为当前URL和请求类型的md5
'route_check_cache_key' => '',
// 路由缓存类型及参数
'route_cache_option' => '',
// 默认跳转页面对应的模板文件
'dispatch_success_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
'dispatch_error_tmpl' => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
// 异常页面的模板文件
'exception_tmpl' => Env::get('think_path') . 'tpl/think_exception.tpl',
// 错误显示信息,非调试模式有效
'error_message' => '页面错误！请稍后再试～',
// 显示错误信息
'show_error_msg' => false,
// 异常处理handle类 留空使用 \think\exception\Handle
'exception_handle' => '',
'url_param_type' => 1,
];

25
config/cache.php
View File

@ -1,25 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
// | 缓存设置
// +----------------------------------------------------------------------
return [
// 驱动方式
'type' => 'File',
// 缓存保存目录
'path' => '',
// 缓存前缀
'prefix' => '',
// 缓存有效期 0表示永久缓存
'expire' => 0,
];

19
config/console.php
View File

@ -1,19 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
return [
'name' => 'Think Console',
'version' => '0.1',
'user' => null,
];

30
config/cookie.php
View File

@ -1,30 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
return [
// cookie 名称前缀
'prefix' => '',
// cookie 保存时间
'expire' => 0,
// cookie 保存路径
'path' => '/',
// cookie 有效域名
'domain' => '',
// cookie 启用安全传输
'secure' => false,
// httponly设置
'httponly' => '',
// 是否使用 setcookie
'setcookie' => true,
];

62
config/database.php
View File

@ -13,54 +13,18 @@
// +----------------------------------------------------------------------
return [
// 数据库类型
'type' => 'mysql',
// 服务器地址
'hostname' => '127.0.0.1',
// 数据库名
'database' => 'admin_v3',
// 用户名
'username' => 'admin_v3',
// 密码
'password' => 'FbYBHcWKr2',
// 端口
'hostport' => '3306',
// 连接dsn
'dsn' => '',
// 数据库连接参数
'params' => [],
// 数据库编码默认采用utf8
'charset' => 'utf8',
// 数据库表前缀
'prefix' => '',
// 数据库调试模式
'debug' => true,
// 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
'deploy' => 0,
// 数据库读写是否分离 主从式有效
'rw_separate' => false,
// 读写分离后 主服务器数量
'master_num' => 1,
// 指定从服务器序号
'slave_no' => '',
// 自动读取主库数据
'read_master' => false,
// 是否严格检查字段是否存在
'fields_strict' => true,
// 数据集返回类型
'resultset_type' => 'array',
// 自动写入时间戳字段
'auto_timestamp' => false,
// 时间字段取出后的默认时间格式
'datetime_format' => 'Y-m-d H:i:s',
// 是否需要进行SQL性能分析
'sql_explain' => false,
// Builder类
'builder' => '',
// Query类
'query' => '\\think\\db\\Query',
// 是否需要断线重连
'break_reconnect' => false,
// 断线标识字符串
'break_match_str' => [],
'debug' => true,
// 数据库类型
'type' => 'mysql',
// 服务器地址
'hostname' => '127.0.0.1',
// 数据库名
'database' => 'admin_v3',
// 用户名
'username' => 'admin_v3',
// 密码
'password' => 'FbYBHcWKr2',
// 端口
'hostport' => '3306',
];

19
config/log.php
View File

@ -13,18 +13,7 @@
// +----------------------------------------------------------------------
return [
// 日志记录方式，内置 file socket 支持扩展
'type' => 'File',
// 日志保存目录
'path' => '',
// 日志记录级别
'level' => [],
// 单文件日志写入
'single' => false,
// 独立日志级别
'apart_level' => ['emergency', 'alert', 'critical', 'error', 'sql'],
// 最大日志文件数量
'max_files' => 0,
// 是否关闭日志写入
'close' => false,
];
'type' => 'file',
'max_files' => '200',
'apart_level' => ['error', 'sql'],
];

21
config/session.php
View File

@ -12,18 +12,15 @@
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
/* 定义Session会话字段名 */
$session_name = 's' . substr(md5(__DIR__), -8);
$session_path = env('runtime_path') . 'sess' . DIRECTORY_SEPARATOR;
file_exists($session_path) || mkdir($session_path, 0755, true);
/* 定义会话路径 */
$_path_ = env('runtime_path') . 'sess' . DIRECTORY_SEPARATOR;
file_exists($_path_) || mkdir($_path_, 0755, true);
$_name_ = 's' . substr(md5(__DIR__), -8);
/* 定义Session会话参数 */
/* 配置会话参数 */
return [
'id' => '',
'type' => '',
'prefix' => 'ta',
'auto_start' => true,
'path' => $session_path,
'name' => $session_name,
'var_session_id' => $session_name,
'prefix' => 'fw',
'path' => $_path_,
'name' => $_name_,
'var_session_id' => $_name_,
];

21
config/template.php
View File

@ -12,33 +12,14 @@
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
// 模板常量声明
$appRoot = app('request')->root();
$uriRoot = rtrim(preg_match('/\.php$/', $appRoot) ? dirname($appRoot) : $appRoot, '\\/');
return [
// 模板引擎类型 支持 php think 支持扩展
'type' => 'Think',
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
'auto_rule' => 1,
// 模板路径
'view_path' => '',
// 模板后缀
'view_suffix' => 'html',
// 模板文件名分隔符
'view_depr' => DIRECTORY_SEPARATOR,
// 模板引擎普通标签开始标记
'tpl_begin' => '{',
// 模板引擎普通标签结束标记
'tpl_end' => '}',
// 标签库标签开始标记
'taglib_begin' => '{',
// 标签库标签结束标记
'taglib_end' => '}',
// 定义模板替换字符串
'tpl_replace_string' => [
'__APP__' => $appRoot,
'__ROOT__' => $uriRoot,
'__STATIC__' => $uriRoot . "/static",
],
];
];

18
config/trace.php
View File

@ -1,18 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2017 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://think.ctolog.com
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
return [
// 内置Html Console 支持扩展
'type' => 'Html',
];

24
thinkphp/helper.php
View File

@ -130,19 +130,19 @@ if (!function_exists('cache')) {
} elseif (is_null($value)) {
// 删除缓存
return Cache::rm($name);
} else {
// 缓存数据
if (is_array($options)) {
$expire = isset($options['expire']) ? $options['expire'] : null; //修复查询缓存无法设置过期时间
} else {
$expire = is_numeric($options) ? $options : null; //默认快捷缓存设置过期时间
}
}
if (is_null($tag)) {
return Cache::set($name, $value, $expire);
} else {
return Cache::tag($tag)->set($name, $value, $expire);
}
// 缓存数据
if (is_array($options)) {
$expire = isset($options['expire']) ? $options['expire'] : null; //修复查询缓存无法设置过期时间
} else {
$expire = is_numeric($options) ? $options : null; //默认快捷缓存设置过期时间
}
if (is_null($tag)) {
return Cache::set($name, $value, $expire);
} else {
return Cache::tag($tag)->set($name, $value, $expire);
}
}
}

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

@ -50,6 +50,7 @@ return [
'KVDB init error' => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务',
'fields not exists' => '数据表字段不存在',
'where express error' => '查询表达式错误',
'order express error' => '排序表达式错误',
'no data to update' => '没有任何数据需要更新',
'miss data to insert' => '缺少需要写入的数据',
'not support data' => '不支持的数据表达式',

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.25';
const VERSION = '5.1.27 LTS';
/**
* 当前模块路径

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

@ -190,22 +190,28 @@ class Build
public function buildRoute($suffix = false, $layer = '')
{
$namespace = $this->app->getNameSpace();
$modules = glob($this->basePath . '*', GLOB_ONLYDIR);
$content = '<?php ' . PHP_EOL . '//根据 Annotation 自动生成的路由规则';
if (!$layer) {
$layer = $this->app->config('app.url_controller_layer');
}
foreach ($modules as $module) {
$module = basename($module);
if ($this->app->config('app.app_multi_module')) {
$modules = glob($this->basePath . '*', GLOB_ONLYDIR);
if (in_array($module, $this->app->config('app.deny_module_list'))) {
continue;
foreach ($modules as $module) {
$module = basename($module);
if (in_array($module, $this->app->config('app.deny_module_list'))) {
continue;
}
$path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR;
$content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer);
}
$path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR;
$content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer);
} else {
$path = $this->basePath . $layer . DIRECTORY_SEPARATOR;
$content .= $this->buildDirRoute($path, $namespace, '', $suffix, $layer);
}
$filename = $this->app->getRuntimePath() . 'build_route.php';
@ -232,7 +238,7 @@ class Build
foreach ($controllers as $controller) {
$controller = basename($controller, '.php');
$class = new \ReflectionClass($namespace . '\\' . $module . '\\' . $layer . '\\' . $controller);
$class = new \ReflectionClass($namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $controller);
if (strpos($layer, '\\')) {
// 多级控制器
@ -274,12 +280,12 @@ class Build
if (false !== strpos($comment, '@route(')) {
$comment = $this->parseRouteComment($comment);
$route = $module . '/' . $controller;
$route = ($module ? $module . '/' : '') . $controller;
$comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $route . '\')', $comment);
$content .= PHP_EOL . $comment;
} elseif (false !== strpos($comment, '@alias(')) {
$comment = $this->parseRouteComment($comment, '@alias(');
$route = $module . '/' . $controller;
$route = ($module ? $module . '/' : '') . $controller;
$comment = preg_replace('/alias\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::alias(\1,\'' . $route . '\')', $comment);
$content .= PHP_EOL . $comment;
}
@ -344,7 +350,7 @@ class Build
$action = substr($action, 0, -strlen($suffix));
}
$route = $module . '/' . $controller . '/' . $action;
$route = ($module ? $module . '/' : '') . $controller . '/' . $action;
$comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')', $comment);
$comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')', $comment);

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

@ -429,15 +429,20 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
* @access public
* @param string $field 排序字段
* @param string $order 排序
* @param bool $intSort 是否为数字排序
* @return $this
*/
public function order($field, $order = null)
public function order($field, $order = null, $intSort = true)
{
return $this->sort(function ($a, $b) use ($field, $order) {
return $this->sort(function ($a, $b) use ($field, $order, $intSort) {
$fieldA = isset($a[$field]) ? $a[$field] : null;
$fieldB = isset($b[$field]) ? $b[$field] : null;
return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB);
if ($intSort) {
return 'desc' == strtolower($order) ? $fieldB >= $fieldA : $fieldA >= $fieldB;
} else {
return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB);
}
});
}

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

@ -124,6 +124,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
protected $defaultSoftDelete;
/**
* 全局查询范围
* @var array
*/
protected $globalScope = [];
/**
* 架构函数
* @access public
@ -272,7 +278,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/**
* 获取当前模型的数据库查询对象
* @access public
* @param bool $useBaseQuery 是否调用全局查询范围
* @param bool|array $useBaseQuery 是否调用全局查询范围（或者指定查询范围名称）
* @return Query
*/
public function db($useBaseQuery = true)
@ -289,10 +295,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
// 全局作用域
if ($useBaseQuery && method_exists($this, 'base')) {
if (true === $useBaseQuery && method_exists($this, 'base')) {
call_user_func_array([$this, 'base'], [ & $query]);
}
$globalScope = is_array($useBaseQuery) && $useBaseQuery ?: $this->globalScope;
if ($globalScope) {
$query->scope($globalScope);
}
// 返回当前模型的数据库查询对象
return $query;
}
@ -427,6 +439,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 重新记录原始数据
$this->origin = $this->data;
$this->set = [];
return true;
}
@ -1030,7 +1043,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/**
* 设置是否使用全局查询范围
* @access public
* @param bool $use 是否启用全局查询范围
* @param bool|array $use 是否启用全局查询范围（或者用数组指定查询范围名称）
* @return Query
*/
public static function useGlobalScope($use)

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

@ -1174,13 +1174,13 @@ class Request
$files = $this->file;
if (!empty($files)) {
// 处理上传文件
$array = $this->dealUploadFile($files);
if (strpos($name, '.')) {
list($name, $sub) = explode('.', $name);
}
// 处理上传文件
$array = $this->dealUploadFile($files, $name);
if ('' === $name) {
// 获取全部文件
return $array;
@ -1194,18 +1194,24 @@ class Request
return;
}
protected function dealUploadFile($files)
protected function dealUploadFile($files, $name)
{
$array = [];
foreach ($files as $key => $file) {
if (is_array($file['name'])) {
if ($file instanceof File) {
$array[$key] = $file;
} elseif (is_array($file['name'])) {
$item = [];
$keys = array_keys($file);
$count = count($file['name']);
for ($i = 0; $i < $count; $i++) {
if ($file['error'][$i] > 0) {
$this->throwUploadFileError($file['error'][$i]);
if ($name == $key) {
$this->throwUploadFileError($file['error'][$i]);
} else {
continue;
}
}
$temp['key'] = $key;
@ -1219,15 +1225,15 @@ class Request
$array[$key] = $item;
} else {
if ($file instanceof File) {
$array[$key] = $file;
} else {
if ($file['error'] > 0) {
if ($file['error'] > 0) {
if ($key == $name) {
$this->throwUploadFileError($file['error']);
} else {
continue;
}
$array[$key] = (new File($file['tmp_name']))->setUploadInfo($file);
}
$array[$key] = (new File($file['tmp_name']))->setUploadInfo($file);
}
}

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

@ -113,6 +113,10 @@ abstract class Builder
$result = [];
foreach ($data as $key => $val) {
if ('*' != $options['field'] && !in_array($key, $fields, true)) {
continue;
}
$item = $this->parseKey($query, $key, true);
if ($val instanceof Expression) {
@ -129,7 +133,7 @@ abstract class Builder
list($key, $name) = explode('->', $key);
$item = $this->parseKey($query, $key);
$result[$item] = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key, $val, $bind) . ')';
} elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) {
} elseif ('*' == $options['field'] && false === strpos($key, '.') && !in_array($key, $fields, true)) {
if ($options['strict']) {
throw new Exception('fields not exists:[' . $key . ']');
}
@ -788,16 +792,10 @@ abstract class Builder
*/
protected function parseOrder(Query $query, $order)
{
if (empty($order)) {
return '';
}
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
} elseif (is_array($val) && !preg_match('/\W/', $key)) {
} elseif (is_array($val) && preg_match('/^[\w\.]+$/', $key)) {
$array[] = $this->parseOrderField($query, $key, $val);
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand($query);
@ -808,15 +806,17 @@ abstract class Builder
$sort = $val;
}
if (false === strpos($key, ')') && false === strpos($key, '#')) {
if (preg_match('/^[\w\.]+$/', $key)) {
$sort = strtoupper($sort);
$sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($query, $key, true) . $sort;
} else {
throw new Exception('order express error:' . $key);
}
}
}
return ' ORDER BY ' . implode(',', $array);
return empty($array) ? '' : ' ORDER BY ' . implode(',', $array);
}
/**

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

@ -1887,10 +1887,21 @@ class Query
* 表达式方式指定Field排序
* @access public
* @param string $field 排序字段
* @param array $bind 参数绑定
* @return $this
*/
public function orderRaw($field)
public function orderRaw($field, $bind = [])
{
if ($bind) {
foreach ($bind as $key => $value) {
if (!is_numeric($key)) {
$field = str_replace(':' . $key, '?', $field);
}
}
$this->bind(array_values($bind));
}
$this->options['order'][] = $this->raw($field);
return $this;

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

@ -14,6 +14,7 @@ namespace think\db\builder;
use think\db\Builder;
use think\db\Expression;
use think\db\Query;
use think\Exception;
/**
* mysql数据库驱动
@ -124,7 +125,7 @@ class Mysql extends Builder
// JSON字段支持
list($field, $name) = explode('->', $key, 2);
return 'json_extract(' . $this->parseKey($query, $field) . ', \'$.' . str_replace('->', '.', $name) . '\')';
return 'json_extract(' . $this->parseKey($query, $field, true) . ', \'$.' . str_replace('->', '.', $name) . '\')';
} elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
list($table, $key) = explode('.', $key, 2);
@ -140,6 +141,10 @@ class Mysql extends Builder
}
}
if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
throw new Exception('not support data:' . $key);
}
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) {
$key = '`' . $key . '`';
}

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

@ -14,6 +14,7 @@ namespace think\db\builder;
use think\db\Builder;
use think\db\Expression;
use think\db\Query;
use think\Exception;
/**
* Sqlsrv数据库驱动
@ -40,8 +41,6 @@ class Sqlsrv extends Builder
return ' ORDER BY rand()';
}
$array = [];
foreach ($order as $key => $val) {
if ($val instanceof Expression) {
$array[] = $val->getValue();
@ -54,12 +53,17 @@ class Sqlsrv extends Builder
$sort = $val;
}
$sort = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($query, $key, true) . $sort;
if (preg_match('/^[\w\.]+$/', $key)) {
$sort = strtoupper($sort);
$sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
$array[] = $this->parseKey($query, $key, true) . $sort;
} else {
throw new Exception('order express error:' . $key);
}
}
}
return ' ORDER BY ' . implode(',', $array);
return empty($array) ? '' : ' ORDER BY ' . implode(',', $array);
}
/**
@ -106,6 +110,10 @@ class Sqlsrv extends Builder
}
}
if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
throw new Exception('not support data:' . $key);
}
if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) {
$key = '[' . $key . ']';
}

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

@ -72,6 +72,12 @@ trait Attribute
*/
private $data = [];
/**
* 修改器执行记录
* @var array
*/
private $set = [];
/**
* 原始数据
* @var array
@ -304,10 +310,14 @@ trait Attribute
* @param string $name 属性名
* @param mixed $value 属性值
* @param array $data 数据
* @return $this
* @return void
*/
public function setAttr($name, $value, $data = [])
{
if (isset($this->set[$name])) {
return;
}
if (is_null($value) && $this->autoWriteTimestamp && in_array($name, [$this->createTime, $this->updateTime])) {
// 自动写入的时间戳字段
$value = $this->autoWriteTimestamp($name);
@ -325,8 +335,7 @@ trait Attribute
// 设置数据对象属性
$this->data[$name] = $value;
return $this;
$this->set[$name] = true;
}
/**

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

@ -13,6 +13,7 @@ namespace think\route;
use think\Container;
use think\exception\ValidateException;
use think\App;
use think\Request;
use think\Response;

29
thinkphp/library/think/route/Domain.php
View File

@ -20,8 +20,6 @@ use think\route\dispatch\Module as ModuleDispatch;
class Domain extends RuleGroup
{
protected $bind;
/**
* 架构函数
* @access public
@ -86,9 +84,7 @@ class Domain extends RuleGroup
*/
public function bind($bind)
{
$this->bind = $bind;
$this->router->bind($bind, $this->domain);
return $this;
}
@ -117,8 +113,9 @@ class Domain extends RuleGroup
*/
private function checkUrlBind($request, $url)
{
if (!empty($this->bind)) {
$bind = $this->bind;
$bind = $this->router->getBind($this->domain);
if (!empty($bind)) {
$this->parseBindAppendParam($bind);
// 记录绑定信息
@ -163,12 +160,13 @@ class Domain extends RuleGroup
{
$array = explode('|', $url, 2);
$action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
$param = [];
if (!empty($array[1])) {
$this->parseUrlParams($request, $array[1]);
$this->parseUrlParams($request, $array[1], $param);
}
return new CallbackDispatch($request, $this, [$class, $action]);
return new CallbackDispatch($request, $this, [$class, $action], $param);
}
/**
@ -184,12 +182,13 @@ class Domain extends RuleGroup
$array = explode('|', $url, 3);
$class = !empty($array[0]) ? $array[0] : $this->router->config('default_controller');
$method = !empty($array[1]) ? $array[1] : $this->router->config('default_action');
$param = [];
if (!empty($array[2])) {
$this->parseUrlParams($request, $array[2]);
$this->parseUrlParams($request, $array[2], $param);
}
return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method]);
return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method], $param);
}
/**
@ -204,12 +203,13 @@ class Domain extends RuleGroup
{
$array = explode('|', $url, 2);
$action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
$param = [];
if (!empty($array[1])) {
$this->parseUrlParams($request, $array[1]);
$this->parseUrlParams($request, $array[1], $param);
}
return new ControllerDispatch($request, $this, $controller . '/' . $action);
return new ControllerDispatch($request, $this, $controller . '/' . $action, $param);
}
/**
@ -224,12 +224,13 @@ class Domain extends RuleGroup
{
$array = explode('|', $url, 2);
$action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
$param = [];
if (!empty($array[1])) {
$this->parseUrlParams($request, $array[1]);
$this->parseUrlParams($request, $array[1], $param);
}
return new ModuleDispatch($request, $this, $controller . '/' . $action);
return new ModuleDispatch($request, $this, $controller . '/' . $action, $param);
}
}

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

@ -114,6 +114,7 @@ class Module extends Dispatch
$vars = $this->rule->getConfig('url_param_type')
? $this->request->route()
: $this->request->param();
$vars = array_merge($vars, $this->param);
} elseif (is_callable([$instance, '_empty'])) {
// 空操作
$call = [$instance, '_empty'];

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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

25
vendor/composer/installed.json vendored
View File

@ -50,17 +50,17 @@
},
{
"name": "topthink/framework",
"version": "v5.1.25",
"version_normalized": "5.1.25.0",
"version": "v5.1.27",
"version_normalized": "5.1.27.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "2e684d5fa38bd2d8ee864982f3114a28992da895"
"reference": "f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/2e684d5fa38bd2d8ee864982f3114a28992da895",
"reference": "2e684d5fa38bd2d8ee864982f3114a28992da895",
"url": "https://api.github.com/repos/top-think/framework/zipball/f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd",
"reference": "f607b8fd51cc25e4da7e2f4ef0d5e64f390d36bd",
"shasum": "",
"mirrors": [
{
@ -82,7 +82,7 @@
"sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*"
},
"time": "2018-10-04T05:04:50+00:00",
"time": "2018-10-22T02:10:08+00:00",
"type": "think-framework",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
@ -443,17 +443,17 @@
},
{
"name": "zoujingli/wechat-developer",
"version": "v1.1.14",
"version_normalized": "1.1.14.0",
"version": "v1.1.16",
"version_normalized": "1.1.16.0",
"source": {
"type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "328d21d32c3d06f5f050185a740f00fe475b6a03"
"reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/328d21d32c3d06f5f050185a740f00fe475b6a03",
"reference": "328d21d32c3d06f5f050185a740f00fe475b6a03",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/8cd19c0e19ada95428709aa35f58e2bd00340b47",
"reference": "8cd19c0e19ada95428709aa35f58e2bd00340b47",
"shasum": "",
"mirrors": [
{
@ -464,10 +464,11 @@
},
"require": {
"ext-curl": "*",
"ext-json": "*",
"ext-openssl": "*",
"php": ">=5.4"
},
"time": "2018-09-12T06:12:49+00:00",
"time": "2018-10-24T08:59:25+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

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

@ -20,7 +20,8 @@ return [
// 配置商户支付参数
'mch_id' => "1332187001",
'mch_key' => 'A82DC5BD1F3359081049C568D8502BC5',
// 配置商户支付双向证书目录
// 配置商户支付双向证书目录 （p12 | key,cert 二选一，两者都配置时p12优先）
// 'ssl_p12' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.p12',
'ssl_key' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_key.pem',
'ssl_cer' => __DIR__ . DIRECTORY_SEPARATOR . 'cert' . DIRECTORY_SEPARATOR . 'apiclient_cert.pem',
// 配置缓存目录，需要拥有写权限

25
vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicPay.php vendored
View File

@ -79,10 +79,8 @@ class BasicPay
public function getNotify()
{
$data = Tools::xml2arr(file_get_contents('php://input'));
if (!empty($data['sign'])) {
if ($this->getPaySign($data) === $data['sign']) {
return $data;
}
if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) {
return $data;
}
throw new InvalidResponseException('Invalid Notify.', '0');
}
@ -96,7 +94,6 @@ class BasicPay
*/
public function getPaySign(array $data, $signType = 'MD5', $buff = '')
{
unset($data['sign']);
ksort($data);
foreach ($data as $k => $v) {
$buff .= "{$k}={$v}&";
@ -112,7 +109,8 @@ class BasicPay
* 转换短链接
* @param string $longUrl 需要转换的URL，签名用原串，传输需URLencode
* @return array
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\ExcInvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function shortUrl($longUrl)
{
@ -145,17 +143,28 @@ class BasicPay
* @param bool $needSignType 是否需要传签名类型参数
* @return array
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
protected function callPostApi($url, array $data, $isCert = false, $signType = 'HMAC-SHA256', $needSignType = true)
{
$option = [];
if ($isCert) {
$option['ssl_p12'] = $this->config->get('ssl_p12');
$option['ssl_cer'] = $this->config->get('ssl_cer');
$option['ssl_key'] = $this->config->get('ssl_key');
if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer']))
if (is_string($option['ssl_p12']) && file_exists($option['ssl_p12'])) {
$content = file_get_contents($option['ssl_p12']);
if (openssl_pkcs12_read($content, $certs, $this->config->get('mch_id'))) {
$option['ssl_key'] = Tools::pushFile(md5($certs['pkey']) . '.pem', $certs['pkey']);
$option['ssl_cer'] = Tools::pushFile(md5($certs['cert']) . '.pem', $certs['cert']);
} else throw new InvalidArgumentException("P12 certificate does not match MCH_ID --- ssl_p12");
}
if (empty($option['ssl_cer']) || !file_exists($option['ssl_cer'])) {
throw new InvalidArgumentException("Missing Config -- ssl_cer", '0');
if (empty($option['ssl_key']) || !file_exists($option['ssl_key']))
}
if (empty($option['ssl_key']) || !file_exists($option['ssl_key'])) {
throw new InvalidArgumentException("Missing Config -- ssl_key", '0');
}
}
$params = $this->params->merge($data);
$needSignType && ($params['sign_type'] = strtoupper($signType));

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

@ -75,10 +75,8 @@ class Tools
if (empty($mines)) {
$content = file_get_contents('http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
preg_match_all('#^([^\s]{2,}?)\s+(.+?)$#ism', $content, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
foreach (explode(" ", $match[2]) as $ext) {
$mines[$ext] = $match[1];
}
foreach ($matches as $match) foreach (explode(" ", $match[2]) as $ext) {
$mines[$ext] = $match[1];
}
self::setCache('all_ext_mine', $mines);
}
@ -256,20 +254,34 @@ class Tools
return (intval($status["http_code"]) === 200) ? $content : false;
}
/**
* 写入文件
* @param string $name 文件名称
* @param string $content 文件内容
* @return string
* @throws LocalCacheException
*/
public static function pushFile($name, $content)
{
$file = self::getCacheName($name);
if (!file_put_contents($file, $content)) throw new LocalCacheException('local file write error.', '0');
return $file;
}
/**
* 缓存配置与存储
* @param string $name 缓存名称
* @param string $value 缓存内容
* @param int $expired 缓存时间(0表示永久缓存)
* @return string
* @throws LocalCacheException
*/
public static function setCache($name, $value = '', $expired = 3600)
{
$cache_file = self::getCacheName($name);
$file = self::getCacheName($name);
$content = serialize(['name' => $name, 'value' => $value, 'expired' => time() + intval($expired)]);
if (!file_put_contents($cache_file, $content)) {
throw new LocalCacheException('local cache error.', '0');
}
if (!file_put_contents($file, $content)) throw new LocalCacheException('local cache error.', '0');
return $file;
}
/**
@ -279,8 +291,8 @@ class Tools
*/
public static function getCache($name)
{
$cache_file = self::getCacheName($name);
if (file_exists($cache_file) && ($content = file_get_contents($cache_file))) {
$file = self::getCacheName($name);
if (file_exists($file) && ($content = file_get_contents($file))) {
$data = unserialize($content);
if (isset($data['expired']) && (intval($data['expired']) === 0 || intval($data['expired']) >= time())) {
return $data['value'];
@ -297,8 +309,8 @@ class Tools
*/
public static function delCache($name)
{
$cache_file = self::getCacheName($name);
return file_exists($cache_file) ? unlink($cache_file) : true;
$file = self::getCacheName($name);
return file_exists($file) ? unlink($file) : true;
}
/**

5
vendor/zoujingli/wechat-developer/WePay/TransfersBank.php vendored
View File

@ -53,7 +53,6 @@ class TransfersBank extends BasicPay
if (!isset($options['amount'])) {
throw new InvalidArgumentException('Missing Options -- [amount]');
}
isset($options['desc']) && $this->params->set('desc', $options['desc']);
$this->params->offsetUnset('appid');
return $this->callPostApi('https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank', [
'amount' => $options['amount'],
@ -61,6 +60,7 @@ class TransfersBank extends BasicPay
'partner_trade_no' => $options['partner_trade_no'],
'enc_bank_no' => $this->rsaEncode($options['enc_bank_no']),
'enc_true_name' => $this->rsaEncode($options['enc_true_name']),
'desc' => isset($options['desc']) ? $options['desc'] : '',
], true, 'MD5', false);
}
@ -68,7 +68,8 @@ class TransfersBank extends BasicPay
* 商户企业付款到银行卡操作进行结果查询
* @param string $partnerTradeNo 商户订单号，需保持唯一
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
*/
public function query($partnerTradeNo)
{

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

@ -20,6 +20,7 @@
],
"require": {
"php": ">=5.4",
"ext-json": "*",
"ext-curl": "*",
"ext-openssl": "*"
},