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

Merge pull request #159 from zoujingli/master

Browse Source 
master->v3
This commit is contained in:
邹景立 2019-01-16 18:09:12 +08:00 committed by GitHub
commit f16bf797dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
304 changed files with 12257 additions and 4194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -24,12 +24,12 @@ PHP开发技术交流（QQ群 513350915）
Repositorie
--
ThinkAdmin 为开源项目，允许把它用于任何地方，不受任何约束，欢迎 fork 项目。
* GitHub 托管地址：https://github.com/zoujingli/ThinkAdmin
* Gitee 托管地址：https://gitee.com/zoujingli/Think.Admin
* GitHub 托管地址：https://github.com/zoujingli/ThinkAdmin
对于新版本的微信模块使用的是授权模式，需要用到 ThinkService 项目。
* GitHub 托管地址：https://github.com/zoujingli/ThinkService
* Gitee 托管地址：https://gitee.com/zoujingli/ThinkService
* GitHub 托管地址：https://github.com/zoujingli/ThinkService
其安装与 ThinkAdmin 相似，这里就不多说了。具体可以参见微信开放平台官网
https://open.weixin.qq.com ，ThinkService 后台具体可以配置对应参数。

33
application/admin/controller/Login.php
View File

@ -18,6 +18,8 @@ use controller\BasicAdmin;
use service\LogService;
use service\NodeService;
use think\Db;
use think\facade\Validate;
/**
* 系统登录控制器
@ -54,19 +56,30 @@ class Login extends BasicAdmin
return $this->fetch('', ['title' => '用户登录']);
}
// 输入数据效验
$username = $this->request->post('username', '', 'trim');
$password = $this->request->post('password', '', 'trim');
strlen($username) < 4 && $this->error('登录账号长度不能少于4位有效字符!');
strlen($password) < 4 && $this->error('登录密码长度不能少于4位有效字符!');
$validate = Validate::make([
'username' => 'require|min:4',
'password' => 'require|min:4',
], [
'username.require' => '登录账号不能为空！',
'username.min' => '登录账号长度不能少于4位有效字符！',
'password.require' => '登录密码不能为空！',
'password.min' => '登录密码长度不能少于4位有效字符！',
]);
$data = [
'username' => $this->request->post('username', ''),
'password' => $this->request->post('password', ''),
];
$validate->check($data) || $this->error($validate->getError());
// 用户信息验证
$user = Db::name('SystemUser')->where('is_deleted', '0')->where('username', $username)->find();
$user = Db::name('SystemUser')->where(['username' => $data['username'], 'is_deleted' => '0'])->find();
empty($user) && $this->error('登录账号不存在，请重新输入!');
($user['password'] !== md5($password)) && $this->error('登录密码与账号不匹配，请重新输入!');
empty($user['is_deleted']) || $this->error('账号已经被删除，请联系管理！');
empty($user['status']) && $this->error('账号已经被禁用，请联系管理!');
empty($user['status']) && $this->error('账号已经被禁用，请联系管理员!');
$user['password'] !== md5($data['password']) && $this->error('登录密码错误，请重新输入!');
// 更新登录信息
$data = ['login_at' => Db::raw('now()'), 'login_num' => Db::raw('login_num+1')];
Db::name('SystemUser')->where(['id' => $user['id']])->update($data);
Db::name('SystemUser')->where(['id' => $user['id']])->update([
'login_at' => Db::raw('now()'),
'login_num' => Db::raw('login_num+1'),
]);
session('user', $user);
!empty($user['authorize']) && NodeService::applyAuthNode();
LogService::write('系统管理', '用户登录系统成功');

31
application/admin/controller/Plugs.php
View File

@ -59,8 +59,9 @@ class Plugs extends BasicAdmin
if (!$file->checkExt(strtolower(sysconf('storage_local_exts')))) {
return json(['code' => 'ERROR', 'msg' => '文件上传类型受限']);
}
$ext = strtolower(pathinfo($file->getInfo('name'), 4));
$names = str_split($this->request->post('md5'), 16);
$ext = strtolower(pathinfo($file->getInfo('name'), 4));
$ext = $ext ? $ext : 'tmp';
$filename = "{$names[0]}/{$names[1]}.{$ext}";
// 文件上传Token验证
if ($this->request->post('token') !== md5($filename . session_id())) {
@ -84,21 +85,22 @@ class Plugs extends BasicAdmin
public function upstate()
{
$post = $this->request->post();
$filename = join('/', str_split($post['md5'], 16)) . '.' . strtolower(pathinfo($post['filename'], 4));
$ext = strtolower(pathinfo($post['filename'], 4));
$filename = join('/', str_split($post['md5'], 16)) . '.' . ($ext ? $ext : 'tmp');
// 检查文件是否已上传
if (($site_url = FileService::getFileUrl($filename))) {
$this->result(['site_url' => $site_url], 'IS_FOUND');
return json(['data' => ['site_url' => $site_url], 'code' => "IS_FOUND"]);
}
// 需要上传文件，生成上传配置参数
$config = ['uptype' => $post['uptype'], 'file_url' => $filename];
$data = ['uptype' => $post['uptype'], 'file_url' => $filename];
switch (strtolower($post['uptype'])) {
case 'local':
$config['server'] = FileService::getUploadLocalUrl();
$config['token'] = md5($filename . session_id());
$data['token'] = md5($filename . session_id());
$data['server'] = FileService::getUploadLocalUrl();
break;
case 'qiniu':
$config['server'] = FileService::getUploadQiniuUrl(true);
$config['token'] = $this->_getQiniuToken($filename);
$data['token'] = $this->_getQiniuToken($filename);
$data['server'] = FileService::getUploadQiniuUrl(true);
break;
case 'oss':
$time = time() + 3600;
@ -106,13 +108,14 @@ class Plugs extends BasicAdmin
'expiration' => date('Y-m-d', $time) . 'T' . date('H:i:s', $time) . '.000Z',
'conditions' => [['content-length-range', 0, 1048576000]],
];
$config['server'] = FileService::getUploadOssUrl();
$config['policy'] = base64_encode(json_encode($policyText));
$config['site_url'] = FileService::getBaseUriOss() . $filename;
$config['signature'] = base64_encode(hash_hmac('sha1', $config['policy'], sysconf('storage_oss_secret'), true));
$config['OSSAccessKeyId'] = sysconf('storage_oss_keyid');
$data['server'] = FileService::getUploadOssUrl();
$data['policy'] = base64_encode(json_encode($policyText));
$data['site_url'] = FileService::getBaseUriOss() . $filename;
$data['signature'] = base64_encode(hash_hmac('sha1', $data['policy'], sysconf('storage_oss_secret'), true));
$data['OSSAccessKeyId'] = sysconf('storage_oss_keyid');
break;
}
$this->result($config, 'NOT_FOUND');
return json(['data' => $data, 'code' => "NOT_FOUND"]);
}
/**

57
application/tags.php → application/admin/middleware/Auth.php
View File

@ -12,29 +12,60 @@
// | github开源项目：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
namespace think;
namespace app\admin\middleware;
use service\NodeService;
use think\exception\HttpResponseException;
use think\Db;
use think\Request;
return [
// 控制器开始前，进行权限检查
'action_begin' => function () {
$request = app('request');
/**
* 系统权限访问管理
* Class Auth
* @package app\admin\middleware
*/
class Auth
{
/**
* @param Request $request
* @param \Closure $next
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function handle($request, \Closure $next)
{
list($module, $controller, $action) = [$request->module(), $request->controller(), $request->action()];
$node = NodeService::parseNodeStr("{$module}/{$controller}/{$action}");
$info = Db::name('SystemNode')->cache(true, 30)->where(['node' => $node])->find();
$access = ['is_menu' => intval(!empty($info['is_menu'])), 'is_auth' => intval(!empty($info['is_auth'])), 'is_login' => empty($info['is_auth']) ? intval(!empty($info['is_login'])) : 1];
$access = $this->buildAuth($node = NodeService::parseNodeStr("{$module}/{$controller}/{$action}"));
// 登录状态检查
if (!empty($access['is_login']) && !session('user')) {
$msg = ['code' => 0, 'msg' => '抱歉，您还没有登录获取访问权限！', 'url' => url('@admin/login')];
throw new HttpResponseException($request->isAjax() ? json($msg) : redirect($msg['url']));
return $request->isAjax() ? json($msg) : redirect($msg['url']);
}
// 访问权限检查
if (!empty($access['is_auth']) && !auth($node)) {
throw new HttpResponseException(json(['code' => 0, 'msg' => '抱歉，您没有访问该模块的权限！']));
return json(['code' => 0, 'msg' => '抱歉，您没有访问该模块的权限！']);
}
// 模板常量声明
app('view')->init(config('template.'))->assign(['classuri' => NodeService::parseNodeStr("{$module}/{$controller}")]);
},
];
return $next($request);
}
/**
* 根据节点获取对应权限配置
* @param string $node 权限节点
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
private function buildAuth($node)
{
$info = Db::name('SystemNode')->cache(true, 30)->where(['node' => $node])->find();
return [
'is_menu' => intval(!empty($info['is_menu'])),
'is_auth' => intval(!empty($info['is_auth'])),
'is_login' => empty($info['is_auth']) ? intval(!empty($info['is_login'])) : 1,
];
}
}

2
application/admin/view/auth/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">权限名称</label>

2
application/admin/view/auth/index.html
View File

@ -11,7 +11,7 @@
{/block}
{block name="content"}
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
<!--{if empty($list)}-->
<p class="help-block text-center well">没 有 记 录 哦！</p>
<!--{else}-->

2
application/admin/view/config/file.html
View File

@ -1,7 +1,7 @@
{extend name="admin@public/content"}
{block name="content"}
<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<form autocomplete="off" onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<div class="form-group">
<label class="col-sm-2 control-label label-required">

2
application/admin/view/config/index.html
View File

@ -1,7 +1,7 @@
{extend name="admin@public/content"}
{block name="content"}
<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<form autocomplete="off" onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<div class="form-group">
<label class="col-sm-2 control-label">

2
application/admin/view/log/index.html
View File

@ -9,7 +9,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">操作账号</label>

2
application/admin/view/login/index.html
View File

@ -29,7 +29,7 @@
<!-- 页面表单主体 开始 -->
<div class="container">
<form onsubmit="return false;" data-time="0.001" data-auto="true" method="post" class="content layui-form animated fadeInDown">
<form autocomplete="off" onsubmit="return false;" data-time="0.001" data-auto="true" method="post" class="content layui-form animated fadeInDown">
<div class="people">
<div class="tou"></div>
<div id="left-hander" class="initial_left_hand transition"></div>

2
application/admin/view/menu/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">上级菜单</label>

2
application/admin/view/menu/index.html
View File

@ -10,7 +10,7 @@
{/block}
{block name="content"}
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
<!--{empty name='list'}-->
<p class="help-block text-center well">没 有 记 录 哦！</p>
<!--{else}-->

16
application/admin/view/node/index.html
View File

@ -31,7 +31,7 @@
<!--{/foreach}-->
</ul>
<div class="layui-tab-content">
{foreach $groups as $key=>$group}
{foreach $groups as $k=>$group}
<div class="layui-tab-item">
<table class="layui-table border-none" lay-skin="line">
<!--{empty name='nodes'}-->
@ -41,7 +41,7 @@
<tr>
<td class='text-left nowrap'>
<span class="color-desc">{$vo.spl|raw}</span> {$vo.node}
{if auth("$classuri/save")}&nbsp;<input class='layui-input layui-input-inline title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">{/if}
{if auth("$classuri/save")}&nbsp;<input autocomplete="off" class='layui-input layui-input-inline title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">{/if}
</td>
<td class='text-left nowrap'>
{if auth("$classuri/save") and $vo.spt eq 1}
@ -61,27 +61,27 @@
<span class="color-desc">&nbsp;&nbsp;├─&nbsp;</span>
<label class="notselect margin-right-15 think-checkbox">
<!--{notempty name='vo.is_login'}-->
<input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
<input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$k}_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$k}_{$key}')[0].checked = !!this.checked)">
<!--{else}-->
<input data-login-filter="{$vo.pnode}" class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
<input data-login-filter="{$vo.pnode}" class="check-box login_{$k}_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$k}_{$key}')[0].checked = !!this.checked)">
<!--{/notempty}-->
加入登录控制
</label>
<span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
<label class="notselect margin-right-15 think-checkbox">
<!--{notempty name='vo.is_auth'}-->
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'>
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$k}_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$k}_{$key}')[0].checked = !!this.checked)" value='1'>
<!--{else}-->
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" class="check-box auth_{$key}" type='checkbox' value='1' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)">
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" class="check-box auth_{$k}_{$key}" type='checkbox' value='1' onclick="this.checked && ($('.login_{$k}_{$key}')[0].checked = !!this.checked)">
<!--{/notempty}-->
加入权限控制
</label>
<span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├─&nbsp;</span>
<label class="notselect think-checkbox">
<!--{notempty name='vo.is_menu'}-->
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'>
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$k}_{$key}' type='checkbox' value='1'>
<!--{else}-->
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" class='check-box menu_{$key}' type='checkbox' value='1'>
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" class='check-box menu_{$k}_{$key}' type='checkbox' value='1'>
<!--{/notempty}-->
加入菜单节点选择器
</label>

4530
application/admin/view/plugs/icon.html
View File

File diff suppressed because it is too large Load Diff

2
application/admin/view/user/auth.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">用户账号</label>

2
application/admin/view/user/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">用户账号</label>

2
application/admin/view/user/index.html
View File

@ -13,7 +13,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">用户账号</label>

2
application/admin/view/user/pass.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">用户账号</label>

5
config/trace.php → application/middleware.php
View File

@ -13,5 +13,6 @@
// +----------------------------------------------------------------------
return [
'type' => 'Html',
];
// 系统权限访问管理
\app\admin\middleware\Auth::class,
];

1
application/store/controller/wechat/Demo.php
View File

@ -91,6 +91,7 @@ class Demo
*/
public function scanQrc()
{
$wechat = new Pay(config('wechat.'));
$options = [
'body' => '测试商品',

2
application/store/init.php
View File

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

2
application/store/view/express/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box" style='padding:25px 30px 20px 0' action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box" style='padding:25px 30px 20px 0' action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">快递公司名称</label>

4
application/store/view/express/index.html
View File

@ -15,7 +15,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">快递公司</label>
@ -50,7 +50,7 @@
</script>
<!-- 表单搜索 结束 -->
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
<input type="hidden" value="resort" name="action"/>
{if empty($list)}
<p class="help-block text-center well">没 有 记 录 哦！</p>

2
application/store/view/goods/form.html
View File

@ -1,7 +1,7 @@
{extend name='admin@public/content'}
{block name="content"}
<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" id="ProductForm" class='form-horizontal layui-form padding-top-20'>
<form autocomplete="off" onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" id="ProductForm" class='form-horizontal layui-form padding-top-20'>
<!--{if !empty($brands)}-->
<div class="form-group">

2
application/store/view/goods/index.html
View File

@ -23,7 +23,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">商品名称</label>

2
application/store/view/goods/stock.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">商品名称</label>

2
application/store/view/goods_brand/form.html
View File

@ -1,7 +1,7 @@
{extend name='admin@public/content'}
{block name="content"}
<form onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<form autocomplete="off" onsubmit="return false;" action="{:request()->url()}" data-auto="true" method="post" class='form-horizontal layui-form padding-top-20'>
<div class="form-group">
<label class="col-sm-2 control-label">品牌名称</label>

2
application/store/view/goods_brand/index.html
View File

@ -15,7 +15,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">品牌名称</label>

2
application/store/view/goods_cate/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box modal-form-box" action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">商品主分类</label>

2
application/store/view/goods_cate/index.html
View File

@ -10,7 +10,7 @@
{/block}
{block name="content"}
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
<!--{if empty($list)}-->
<p class="help-block text-center well">没 有 记 录 哦！</p>
<!--{else}-->

2
application/store/view/goods_spec/form.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-box" style='padding:25px 30px 20px 0' method="post" id="spec-form">
<form autocomplete="off" class="layui-form layui-box" style='padding:25px 30px 20px 0' method="post" id="spec-form">
<div class="layui-form-item">
<label class="layui-form-label">规格名称</label>

4
application/store/view/goods_spec/index.html
View File

@ -15,7 +15,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">规格分组</label>
@ -43,7 +43,7 @@
</script>
<!-- 表单搜索 结束 -->
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
{if empty($list)}
<p class="help-block text-center well">没 有 记 录 哦！</p>
{else}

10
application/store/view/order/address.html
View File

@ -1,9 +1,9 @@
<form class="layui-form layui-box" style='padding:25px 30px 20px 0' action="{:request()->url()}" data-auto="true" method="post">
<form autocomplete="off" class="layui-form layui-box" style='padding:25px 30px 20px 0' action="{:request()->url()}" data-auto="true" method="post">
<div class="layui-form-item">
<label class="layui-form-label">收货人姓名</label>
<div class="layui-input-block">
<input class="layui-input" required placeholder="请输入收货人姓名" title="请输入收货人姓名" name="username" value="{$username}">
<input class="layui-input" required placeholder="请输入收货人姓名" title="请输入收货人姓名" name="express_username" value="{$username}">
</div>
</div>
@ -11,7 +11,7 @@
<div class="layui-form-item">
<label class="layui-form-label">收货人手机</label>
<div class="layui-input-block">
<input class="layui-input" pattern="^1\d{10}$" required placeholder="请输入收货人手机" title="请输入收货人手机" name="phone" value="{$phone}">
<input class="layui-input" pattern="^1\d{10}$" required placeholder="请输入收货人手机" title="请输入收货人手机" name="express_phone" value="{$phone}">
</div>
</div>
@ -33,14 +33,14 @@
<div class="layui-form-item">
<label class="layui-form-label">详细地址</label>
<div class="layui-input-block">
<textarea required placeholder="请输入详细地址" title="请输入详细地址" name="address" class="layui-textarea">{$address|default=""}</textarea>
<textarea required placeholder="请输入详细地址" title="请输入详细地址" name="express_address" class="layui-textarea">{$address|default=""}</textarea>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea required placeholder="请输入备注" title="请输入备注" name="desc" class="layui-textarea">{$desc|default=""}</textarea>
<textarea required placeholder="请输入备注" title="请输入备注" name="express_desc" class="layui-textarea">{$desc|default=""}</textarea>
</div>
</div>

10
application/store/view/order/index.html
View File

@ -2,7 +2,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">会员手机</label>
@ -175,7 +175,7 @@
</script>
<!-- 表单搜索 结束 -->
<form onsubmit="return false;" data-auto="true" method="post">
<form autocomplete="off" onsubmit="return false;" data-auto="true" method="post">
{if empty($list)}
<p class="help-block text-center well">没 有 记 录 哦！</p>
{else}
@ -210,8 +210,8 @@
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class="text-left text-top nowrap">
会员昵称：{$vo.member.nickname|default='<span class="color-desc">未设置会员昵称</span>'}<br>
会员手机：{$vo.member.phone|default='<span class="color-desc">未设置会员手机</span>'}
会员昵称：{$vo.member.nickname|default='<span class="color-desc">未设置会员昵称</span>'|raw}<br>
会员手机：{$vo.member.phone|default='<span class="color-desc">未设置会员手机</span>'|raw}
</td>
<td class="text-left text-top nowrap">
订单单号：<b>{$vo.order_no}</b> {if $vo.type eq 3}<span class="layui-badge-rim">套餐</span> {/if}
@ -284,4 +284,4 @@
{/if}
</form>
{/block}
{/block}

8
application/wechat/controller/api/Push.php
View File

@ -264,9 +264,13 @@ class Push
case 'music':
return $wechat->music($data['title'], $data['description'], $data['musicurl'], $data['hqmusicurl'], $data['thumb_media_id'])->reply([], true);
case 'news':
return $wechat->news($data['articles'])->reply([], true);
$articles = [];
foreach ($data['articles'] as $article) {
$articles[] = ['Url' => $article['url'], 'Title' => $article['title'], 'PicUrl' => $article['picurl'], 'Description' => $article['description']];
}
return $wechat->news($articles)->reply([], true);
case 'customservice':
WechatService::custom()->send(['touser' => $this->openid, 'msgtype' => 'text', "text" => $data['content']]);
WechatService::WeChatCustom()->send(['touser' => $this->openid, 'msgtype' => 'text', "text" => $data['content']]);
return $wechat->transferCustomerService()->reply([], true);
default:
return 'success';

2
application/wechat/view/api/tools/oauth.html
View File

@ -58,7 +58,7 @@
{if isset($fans.fansinfo.privilege.0)}
<div class="weui-cell">
<div class="weui-cell__bd">设备网络</div>
<div class="weui-cell__ft">{$fans.fansinfo.privilege.0}</div>
<div class="weui-cell__ft">{$fans.fansinfo.privilege.0|default='未获取到网络信息'}</div>
</div>
{/if}
</div>

2
application/wechat/view/fans/search_inc.html
View File

@ -1,4 +1,4 @@
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">昵 称</label>

72
application/wechat/view/fans/tags_inc.html
View File

@ -27,7 +27,7 @@
<div class="row margin-right-0" style='max-height:230px;overflow:auto;'>
{foreach $tags as $key=>$tag}
<div class="col-xs-4">
<label class="layui-elip block"><input value="{$key}" type="checkbox"/> {$tag}</label>
<label class="layui-elip block think-checkbox"><input value="{$key}" type="checkbox"/> {$tag}</label>
</div>
{/foreach}
</div>
@ -41,40 +41,42 @@
<script>
// 添加标签
$('body').find('[data-add-tag]').map(function () {
var self = this;
var fans_id = this.getAttribute('data-add-tag');
var used_ids = (this.getAttribute('data-used-id') || '').split(',');
var $content = $(document.getElementById('tags-box').innerHTML);
for (var i in used_ids) {
$content.find('[value="' + used_ids[i] + '"]').attr('checked', 'checked');
}
$content.attr('fans_id', fans_id);
// 标签面板关闭
$content.on('click', '[data-event="cancel"]', function () {
$(self).popover('hide');
});
// 标签面板确定
$content.on('click', '[data-event="confirm"]', function () {
var tags = [];
$content.find('input:checked').map(function () {
tags.push(this.value);
require(['bootstrap'], function () {
$('body').find('[data-add-tag]').map(function () {
var self = this;
var fans_id = this.getAttribute('data-add-tag');
var used_ids = (this.getAttribute('data-used-id') || '').split(',');
var $content = $(document.getElementById('tags-box').innerHTML);
for (var i in used_ids) {
$content.find('[value="' + used_ids[i] + '"]').attr('checked', 'checked');
}
$content.attr('fans_id', fans_id);
// 标签面板关闭
$content.on('click', '[data-event="cancel"]', function () {
$(self).popover('hide');
});
$.form.load('{:url("@wechat/fans/tagset")}', {fans_id: $content.attr('fans_id'), 'tags': tags.join(',')}, 'post');
});
// 限制每个表单最多只能选择三个
$content.on('click', 'input', function () {
($content.find('input:checked').size() > 3) && (this.checked = false);
});
// 标签选择面板
$(this).data('content', $content).on('shown.bs.popover', function () {
$('[data-add-tag]').not(this).popover('hide');
}).popover({
html: true,
trigger: 'click',
content: $content,
title: '标签编辑（最多选择三个标签）',
template: '<div class="popover" style="max-width:500px" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content" style="width:500px"></div></div>'
});
// 标签面板确定
$content.on('click', '[data-event="confirm"]', function () {
var tags = [];
$content.find('input:checked').map(function () {
tags.push(this.value);
});
$.form.load('{:url("@wechat/fans/tagset")}', {fans_id: $content.attr('fans_id'), 'tags': tags.join(',')}, 'post');
});
// 限制每个表单最多只能选择三个
$content.on('click', 'input', function () {
($content.find('input:checked').size() > 3) && (this.checked = false);
});
// 标签选择面板
$(this).data('content', $content).on('shown.bs.popover', function () {
$('[data-add-tag]').not(this).popover('hide');
}).popover({
html: true,
trigger: 'click',
content: $content,
title: '标签编辑（最多选择三个标签）',
template: '<div class="popover" style="max-width:500px" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content" style="width:500px"></div></div>'
});
})
});
</script>

43
application/wechat/view/menu/index.html
View File

@ -39,16 +39,16 @@
<div class="arrow"></div>
<h3 class="popover-title">
微信菜单编辑
{if auth("$classuri/edit")}
<!--{if auth("$classuri/edit")}-->
<button type="button" class="pull-right menu-item-deleted layui-btn layui-btn-sm layui-btn-danger">移除菜单项</button>
{/if}
<!--{/if}-->
</h3>
<div class="popover-content menu-content"></div>
</div>
</div>
<div class="hide menu-editor-parent-tpl">
<form class="form-horizontal">
<form class="form-horizontal" autocomplete="off">
<p class="help-block text-center">已添加子菜单，仅可设置菜单名称。</p>
<div class="form-group margin-top-20">
<label class="col-xs-3 control-label label-required">菜单名称</label>
@ -61,7 +61,7 @@
</div>
<div class="hide menu-editor-content-tpl">
<form class="form-horizontal">
<form class="form-horizontal" autocomplete="off">
<div class="form-group margin-top-20">
<label class="col-xs-3 control-label label-required">菜单名称</label>
<div class="col-xs-8">
@ -73,23 +73,23 @@
<label class="col-xs-3 control-label label-required">菜单内容</label>
<div class="col-xs-8">
<div class="row padding-top-5">
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="text"> 文字消息
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="text"> 文字消息
</label>
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="keys"> 关键字
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="keys"> 关键字
</label>
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="view"> 跳转网页
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="view"> 跳转网页
</label>
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="event"> 事件功能
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="event"> 事件功能
</label>
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="miniprogram"> 小程序
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="miniprogram"> 小程序
</label>
<label class="col-xs-5 margin-bottom-10 pointer">
<input class="cuci-radio" type="radio" name="menu-type" value="customservice"> 多客服
<label class="col-xs-5 margin-bottom-10 pointer think-radio">
<input type="radio" name="menu-type" value="customservice"> 多客服
</label>
</div>
</div>
@ -236,7 +236,7 @@
'location_select': '弹出地理位置选择器'
};
var select = [];
var tpl = '<p class="margin-bottom-10"><label class="font-noraml pointer"><input class="cuci-radio" name="content" type="radio" {checked} value="{value}"> {title}</label></p>';
var tpl = '<p class="margin-bottom-10"><label class="font-noraml pointer think-radio"><input name="content" type="radio" {checked} value="{value}"> {title}</label></p>';
if (!(options[content] || false)) {
(content = 'scancode_push'), $span.data('content', content);
}
@ -259,6 +259,13 @@
});
}
});
//解决菜单选事件提交后菜单总是变成扫描二维码的错误
$edit.find('input').on('click', function () {
$span.data(this.name, $(this).val() || $(this).html());
if (type === 'event') {
this.value === $span.data('content');
}
});
// 显示参数编辑器
$('.editor-content-input').html($edit);
// 跳转网页处理选择器切换，事件监听
@ -352,4 +359,4 @@
padding-top: 40px
}
</style>
{/block}
{/block}

2
application/wechat/view/tags/index.html
View File

@ -18,7 +18,7 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<form autocomplete="off" class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label">标 签</label>
<div class="layui-input-inline">

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

45
composer.json
View File

@ -1,39 +1,28 @@
{
"name": "topthink/think",
"description": "the new thinkphp framework",
"type": "project",
"keywords": [
"framework",
"thinkphp",
"ORM"
],
"homepage": "http://thinkphp.cn/",
"license": "Apache-2.0",
"authors": [
{
"name": "liu21st",
"email": "liu21st@gmail.com"
}
],
"name": "zoujingli/thinkadmin",
"license": "MIT",
"keywords": ["thinkphp", "thinkadmin"],
"homepage": "http://demo.thinkadmin.top",
"description": "ThinkAdmin Developer CMF",
"authors": [{"name": "Anyon", "email": "zoujingli@qq.com"}],
"extra": {"think-path": "thinkphp"},
"config": {"preferred-install": "dist"},
"autoload": {"psr-4": {"app\\": "application"}},
"require": {
"php": ">=5.6.0",
"qiniu/php-sdk": "^7.2",
"endroid/qr-code": "^1.9",
"topthink/framework": "5.1.*",
"zoujingli/ip2region": "dev-master",
"topthink/framework": "^5.1",
"zoujingli/ip2region": "^1.0",
"aliyuncs/oss-sdk-php": "^2.2",
"zoujingli/weopen-developer": "dev-master",
"topthink/think-captcha": "^2.0",
"qiniu/php-sdk": "^7.2"
"zoujingli/weopen-developer": "^1.1"
},
"autoload": {
"psr-4": {
"app\\": "application"
"repositories": {
"packagist": {
"type": "composer",
"url": "https://packagist.laravel-china.org"
}
},
"extra": {
"think-path": "thinkphp"
},
"config": {
"preferred-install": "dist"
}
}

97
config/app.php
View File

@ -14,98 +14,9 @@
return [
// 应用调试模式
'app_debug' => true,
// 应用Trace
'app_trace' => false,
// 应用模式状态
'app_status' => '',
// 是否支持多模块
'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' => 'PRC',
// 是否开启多语言
'lang_switch_on' => false,
// 默认全局过滤方法 用逗号分隔多个
'default_filter' => 'trim',
// 默认语言
'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_controller' => 'Error',
// 操作方法后缀
'action_suffix' => '',
// 自动搜索控制器
'controller_auto_search' => false,
// PATHINFO变量名 用于兼容模式
'var_pathinfo' => 's',
// 兼容PATH_INFO获取
'pathinfo_fetch' => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
// pathinfo分隔符
'pathinfo_depr' => '/',
// URL伪静态后缀
'url_html_suffix' => 'html',
// URL普通方式参数 用于自动生成
'url_common_param' => false,
'app_debug' => true,
// 应用Trace调试
'app_trace' => false,
// URL参数方式 0 按名称成对解析 1 按顺序解析
'url_param_type' => 1,
// 路由使用完整匹配
'route_complete_match' => false,
// 是否强制使用路由
'url_route_must' => false,
// 使用注解路由
'route_annotation' => false,
// 域名部署
'url_domain_deploy' => 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,
// 默认跳转页面对应的模板文件
'dispatch_success_tmpl' => env('think_path') . 'tpl/dispatch_jump.tpl',
'dispatch_error_tmpl' => env('think_path') . 'tpl/dispatch_jump.tpl',
// 异常页面的模板文件
'exception_tmpl' => env('think_path') . 'tpl/think_exception.tpl',
// 错误显示信息,非调试模式有效
'error_message' => '页面错误！请稍后再试～',
// 显示错误信息
'show_error_msg' => false,
// 异常处理handle类 留空使用 \think\exception\Handle
'exception_handle' => '',
'url_param_type' => 1,
];

20
config/cache.php
View File

@ -1,20 +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 [
'expire' => 0,
'prefix' => '',
'path' => '',
'type' => 'File',
];

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,
];

53
config/database.php
View File

@ -13,45 +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' => '',
// 是否严格检查字段是否存在
'fields_strict' => true,
// 数据集返回类型
'resultset_type' => 'array',
// 自动写入时间戳字段
'auto_timestamp' => false,
// 时间字段取出后的默认时间格式
'datetime_format' => 'Y-m-d H:i:s',
// 是否需要进行SQL性能分析
'sql_explain' => false,
// Query类
'query' => '\\think\\db\\Query',
'debug' => true,
// 数据库类型
'type' => 'mysql',
// 服务器地址
'hostname' => '127.0.0.1',
// 数据库名
'database' => 'admin_v3',
// 用户名
'username' => 'admin_v3',
// 密码
'password' => 'FbYBHcWKr2',
// 端口
'hostport' => '3306',
];

7
config/log.php
View File

@ -13,8 +13,7 @@
// +----------------------------------------------------------------------
return [
'path' => '',
'type' => 'File',
'file_size' => 1024 * 1024 * 10,
'apart_level' => ['emergency', 'alert', 'critical', 'error', 'sql'],
'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_,
];

20
config/template.php
View File

@ -12,32 +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',
// 模板路径
'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",
],
];
];

2
extend/controller/BasicAdmin.php
View File

@ -121,7 +121,7 @@ class BasicAdmin extends Controller
list($rowHTML, $curPage, $maxNum) = [[], $page->currentPage(), $page->lastPage()];
foreach ([10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200] as $num) {
list($query['rows'], $query['page']) = [$num, '1'];
$url = url('@admin') . '#' . $this->request->baseUrl() . '?' . http_build_query($query);
$url = url('@admin') . '#' . $this->request->baseUrl() . '?' . urldecode(http_build_query($query));
$rowHTML[] = "<option data-url='{$url}' " . ($rows === $num ? 'selected' : '') . " value='{$num}'>{$num}</option>";
}
list($pattern, $replacement) = [['|href="(.*?)"|', '|pagination|'], ['data-open="$1"', 'pagination pull-right']];

14
extend/controller/BasicApi.php
View File

@ -42,22 +42,24 @@ class BasicApi
/**
* 返回成功的操作
* @param string $msg 消息内容
* @param mixed $msg 消息内容
* @param array $data 返回数据
* @param integer $code 返回代码
*/
protected function success($msg, $data = [])
protected function success($msg, $data = [], $code = 1)
{
ToolsService::success($msg, $data);
ToolsService::success($msg, $data, $code);
}
/**
* 返回失败的请求
* @param string $msg 消息内容
* @param mixed $msg 消息内容
* @param array $data 返回数据
* @param integer $code 返回代码
*/
protected function error($msg, $data = [])
protected function error($msg, $data = [], $code = 0)
{
ToolsService::error($msg, $data);
ToolsService::error($msg, $data, $code);
}
}

7
extend/service/FileService.php
View File

@ -115,9 +115,9 @@ class FileService
switch ($region) {
case '华东':
if ($isHttps) {
return $isClient ? 'https:///upload.qiniup.com' : 'https://upload.qiniup.com';
return $isClient ? 'https://upload.qiniup.com' : 'https://upload.qiniup.com';
}
return $isClient ? 'http:///upload.qiniup.com' : 'http://upload.qiniup.com';
return $isClient ? 'http://upload.qiniup.com' : 'http://upload.qiniup.com';
case '华北':
if ($isHttps) {
return $isClient ? 'https://upload-z1.qiniup.com' : 'https://up-z1.qiniup.com';
@ -156,8 +156,9 @@ class FileService
*/
public static function getBaseUriLocal()
{
$appRoot = request()->root(true); // 如果你想获取相对url地址，这里改成 false
$appRoot = request()->root(true); // 去掉参数 true 将获得相对地址
$uriRoot = preg_match('/\.php$/', $appRoot) ? dirname($appRoot) : $appRoot;
$uriRoot = in_array($uriRoot, ['/', '\\']) ? '' : $uriRoot;
return "{$uriRoot}/static/upload/";
}

6
extend/service/NodeService.php
View File

@ -124,11 +124,9 @@ class NodeService
continue;
}
$className = env('app_namespace') . str_replace('/', '\\', $matches[0]);
if (!class_exists($className)) {
continue;
}
if (!class_exists($className)) continue;
foreach (get_class_methods($className) as $funcName) {
if (strpos($funcName, '_') !== 0 && $funcName !== 'initialize') {
if (strpos($funcName, '_') !== 0 && $funcName !== 'initialize' && $funcName !== 'registerMiddleware') {
$nodes[] = self::parseNodeStr("{$matches[1]}/{$matches[2]}") . '/' . strtolower($funcName);
}
}

57
extend/service/ToolsService.php
View File

@ -33,20 +33,19 @@ class ToolsService
*/
public static function corsOptionsHandler()
{
Session::init(config('session.'));
$token = request()->header('token', '');
empty($token) && $token = request()->post('token', '');
empty($token) && $token = request()->get('token', '');
list($name, $value) = explode('=', decode($token) . '=');
if (!empty($value) && session_name() === $name) {
session_id($value);
if (PHP_SESSION_ACTIVE !== session_status()) Session::init(config('session.'));
try {
$token = request()->header('token', input('token', ''));
list($name, $value) = explode('=', decode($token) . '=');
if (!empty($value) && session_name() === $name) session_id($value);
} catch (\Exception $e) {
}
if (request()->isOptions()) {
header('Access-Control-Allow-Origin:*');
header('Access-Control-Allow-Credentials:true');
header('Access-Control-Allow-Methods:GET,POST,OPTIONS');
header("Access-Control-Allow-Headers:Accept,Referer,Host,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Cookie,token");
header('Content-Type:text/plain charset=UTF-8');
header('Content-Type:text/plain charset=utf-8');
header('Access-Control-Max-Age:1728000');
header('HTTP/1.0 204 No Content');
header('Content-Length:0');
@ -70,23 +69,25 @@ class ToolsService
/**
* 返回成功的操作
* @param string $msg 消息内容
* @param mixed $msg 消息内容
* @param array $data 返回数据
* @param integer $code 返回代码
*/
public static function success($msg, $data = [])
public static function success($msg, $data = [], $code = 1)
{
$result = ['code' => 1, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
$result = ['code' => $code, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
throw new HttpResponseException(Response::create($result, 'json', 200, self::corsRequestHander()));
}
/**
* 返回失败的请求
* @param string $msg 消息内容
* @param mixed $msg 消息内容
* @param array $data 返回数据
* @param integer $code 返回代码
*/
public static function error($msg, $data = [])
public static function error($msg, $data = [], $code = 0)
{
$result = ['code' => 0, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
$result = ['code' => $code, 'msg' => $msg, 'data' => $data, 'token' => encode(session_name() . '=' . session_id())];
throw new HttpResponseException(Response::create($result, 'json', 200, self::corsRequestHander()));
}
@ -125,16 +126,10 @@ class ToolsService
public static function arr2tree($list, $id = 'id', $pid = 'pid', $son = 'sub')
{
list($tree, $map) = [[], []];
foreach ($list as $item) {
$map[$item[$id]] = $item;
}
foreach ($list as $item) {
if (isset($item[$pid]) && isset($map[$item[$pid]])) {
$map[$item[$pid]][$son][] = &$map[$item[$id]];
} else {
$tree[] = &$map[$item[$id]];
}
}
foreach ($list as $item) $map[$item[$id]] = $item;
foreach ($list as $item) if (isset($item[$pid]) && isset($map[$item[$pid]])) {
$map[$item[$pid]][$son][] = &$map[$item[$id]];
} else $tree[] = &$map[$item[$id]];
unset($map);
return $tree;
}
@ -159,9 +154,7 @@ class ToolsService
$sub = $attr['sub'];
unset($attr['sub']);
$tree[] = $attr;
if (!empty($sub)) {
$tree = array_merge($tree, self::arr2table($sub, $id, $pid, $path, $attr[$path]));
}
if (!empty($sub)) $tree = array_merge($tree, self::arr2table($sub, $id, $pid, $path, $attr[$path]));
}
return $tree;
}
@ -177,10 +170,8 @@ class ToolsService
public static function getArrSubIds($list, $id = 0, $key = 'id', $pkey = 'pid')
{
$ids = [intval($id)];
foreach ($list as $vo) {
if (intval($vo[$pkey]) > 0 && intval($vo[$pkey]) === intval($id)) {
$ids = array_merge($ids, self::getArrSubIds($list, intval($vo[$key]), $key, $pkey));
}
foreach ($list as $vo) if (intval($vo[$pkey]) > 0 && intval($vo[$pkey]) === intval($id)) {
$ids = array_merge($ids, self::getArrSubIds($list, intval($vo[$key]), $key, $pkey));
}
return $ids;
}
@ -224,9 +215,7 @@ class ToolsService
private static function parseKeyDot(array $data, $rule)
{
list($temp, $attr) = [$data, explode('.', trim($rule, '.'))];
while ($key = array_shift($attr)) {
$temp = isset($temp[$key]) ? $temp[$key] : $temp;
}
while ($key = array_shift($attr)) $temp = isset($temp[$key]) ? $temp[$key] : $temp;
return (is_string($temp) || is_numeric($temp)) ? str_replace('"', '""', "\t{$temp}") : '';
}

2
extend/service/WechatService.php
View File

@ -48,7 +48,7 @@ use think\Exception;
* @method \WeMini\Basic WeMiniBasic() static 小程序基础信息设置
* @method \WeMini\Code WeMiniCode() static 小程序代码管理
* @method \WeMini\Domain WeMiniDomain() static 小程序域名管理
* @method \WeMini\Tester WeMinitester() static 小程序成员管理
* @method \WeMini\Tester WeMiniTester() static 小程序成员管理
* @method \WeMini\User WeMiniUser() static 小程序帐号管理
* --------------------
* @method \WeMini\Crypt WeMiniCrypt() static 小程序数据加密处理

5
static/admin.js
View File

@ -186,7 +186,7 @@ $(function () {
};
// 打开一个iframe窗口
this.iframe = function (url, title) {
return layer.open({title: title || '窗口', type: 2, area: ['800px', '530px'], fix: true, maxmin: false, content: url});
return layer.open({title: title || '窗口', type: 2, area: ['800px', '550px'], fix: true, maxmin: false, content: url});
};
// 加载HTML到弹出层
this.modal = function (url, data, title, callback, loading, tips) {
@ -631,6 +631,9 @@ $(function () {
}
});
};
img.onerror = function (e) {
$.msg.close(index);
};
img.src = this.getAttribute('data-tips-image') || this.src;
});

4
static/plugs/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/css/layui.mobile.css
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/css/modules/code.css
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}

2
static/plugs/layui/css/modules/laydate/default/laydate.css
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/css/modules/layer/default/layer.css
View File

File diff suppressed because one or more lines are too long

BIN
static/plugs/layui/font/iconfont.eot
View File

Binary file not shown.

159
static/plugs/layui/font/iconfont.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 271 KiB

BIN
static/plugs/layui/font/iconfont.ttf
View File

Binary file not shown.

BIN
static/plugs/layui/font/iconfont.woff
View File

Binary file not shown.

2
static/plugs/layui/lay/modules/carousel.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});

2
static/plugs/layui/lay/modules/code.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");

2
static/plugs/layui/lay/modules/element.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/flow.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});

4
static/plugs/layui/lay/modules/form.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/jquery.js vendored
View File

File diff suppressed because one or more lines are too long

4
static/plugs/layui/lay/modules/laydate.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/layedit.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/layer.js
View File

File diff suppressed because one or more lines are too long

4
static/plugs/layui/lay/modules/laypage.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1" title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;" data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1" title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;" data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});

2
static/plugs/layui/lay/modules/laytpl.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});

2
static/plugs/layui/lay/modules/mobile.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/rate.js Normal file
View File

@ -0,0 +1,2 @@
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});

2
static/plugs/layui/lay/modules/table.js
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/lay/modules/tree.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["&#xe623;","&#xe625;"],checkbox:["&#xe626;","&#xe627;"],radio:["&#xe62b;","&#xe62a;"],branch:["&#xe622;","&#xe624;"],leaf:"&#xe621;"};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});

4
static/plugs/layui/lay/modules/upload.js
View File

File diff suppressed because one or more lines are too long

4
static/plugs/layui/lay/modules/util.js
View File

@ -1,2 +1,2 @@
/** layui-v2.2.6 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var t=layui.$,i={fixbar:function(e){var i,o,a="layui-fixbar",r="layui-fixbar-top",n=t(document),l=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+a+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+r),u=function(){var t=n.scrollTop();t>=e.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};t("."+a)[0]||("object"==typeof e.css&&g.css(e.css),l.append(g),u(),g.find("li").on("click",function(){var i=t(this),o=i.attr("lay-type");"top"===o&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,o)}),n.on("scroll",function(){clearTimeout(o),o=setTimeout(function(){u()},100)}))},countdown:function(e,t,i){var o=this,a="function"==typeof t,r=new Date(e).getTime(),n=new Date(!t||a?(new Date).getTime():t).getTime(),l=r-n,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];a&&(i=t);var g=setTimeout(function(){o.countdown(e,n+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],t,g),l<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,o=[[],[]],a=(new Date).getTime()-new Date(e).getTime();return a>6912e5?(a=new Date(e),o[0][0]=i.digit(a.getFullYear(),4),o[0][1]=i.digit(a.getMonth()+1),o[0][2]=i.digit(a.getDate()),t||(o[1][0]=i.digit(a.getHours()),o[1][1]=i.digit(a.getMinutes()),o[1][2]=i.digit(a.getSeconds())),o[0].join("-")+" "+o[1].join(":")):a>=864e5?(a/1e3/60/60/24|0)+"天前":a>=36e5?(a/1e3/60/60|0)+"小时前":a>=12e4?(a/1e3/60|0)+"分钟前":a<0?"未来":"刚刚"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var o=e.length;o<t;o++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){var i=this,o=new Date(e||new Date),a=[i.digit(o.getFullYear(),4),i.digit(o.getMonth()+1),i.digit(o.getDate())],r=[i.digit(o.getHours()),i.digit(o.getMinutes()),i.digit(o.getSeconds())];return t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])}};e("util",i)});
/** layui-v2.3.0 MIT License By https://www.layui.com */
;layui.define("jquery",function(e){"use strict";var t=layui.$,i={fixbar:function(e){var i,a,o="layui-fixbar",r="layui-fixbar-top",l=t(document),n=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],g=t(['<ul class="'+o+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+r+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),u=g.find("."+r),s=function(){var t=l.scrollTop();t>=e.showHeight?i||(u.show(),i=1):i&&(u.hide(),i=0)};t("."+o)[0]||("object"==typeof e.css&&g.css(e.css),n.append(g),s(),g.find("li").on("click",function(){var i=t(this),a=i.attr("lay-type");"top"===a&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,a)}),l.on("scroll",function(){clearTimeout(a),a=setTimeout(function(){s()},100)}))},countdown:function(e,t,i){var a=this,o="function"==typeof t,r=new Date(e).getTime(),l=new Date(!t||o?(new Date).getTime():t).getTime(),n=r-l,c=[Math.floor(n/864e5),Math.floor(n/36e5)%24,Math.floor(n/6e4)%60,Math.floor(n/1e3)%60];o&&(i=t);var g=setTimeout(function(){a.countdown(e,l+1e3,i)},1e3);return i&&i(n>0?c:[0,0,0,0],t,g),n<=0&&clearTimeout(g),g},timeAgo:function(e,t){var i=this,a=[[],[]],o=(new Date).getTime()-new Date(e).getTime();return o>6912e5?(o=new Date(e),a[0][0]=i.digit(o.getFullYear(),4),a[0][1]=i.digit(o.getMonth()+1),a[0][2]=i.digit(o.getDate()),t||(a[1][0]=i.digit(o.getHours()),a[1][1]=i.digit(o.getMinutes()),a[1][2]=i.digit(o.getSeconds())),a[0].join("-")+" "+a[1].join(":")):o>=864e5?(o/1e3/60/60/24|0)+"天前":o>=36e5?(o/1e3/60/60|0)+"小时前":o>=12e4?(o/1e3/60|0)+"分钟前":o<0?"未来":"刚刚"},digit:function(e,t){var i="";e=String(e),t=t||2;for(var a=e.length;a<t;a++)i+="0";return e<Math.pow(10,t)?i+(0|e):e},toDateString:function(e,t){var i=this,a=new Date(e||new Date),o=[i.digit(a.getFullYear(),4),i.digit(a.getMonth()+1),i.digit(a.getDate())],r=[i.digit(a.getHours()),i.digit(a.getMinutes()),i.digit(a.getSeconds())];return t=t||"yyyy-MM-dd HH:mm:ss",t.replace(/yyyy/g,o[0]).replace(/MM/g,o[1]).replace(/dd/g,o[2]).replace(/HH/g,r[0]).replace(/mm/g,r[1]).replace(/ss/g,r[2])},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")}};e("util",i)});

6
static/plugs/layui/layui.all.js
View File

File diff suppressed because one or more lines are too long

4
static/plugs/layui/layui.js
View File

File diff suppressed because one or more lines are too long

1
static/theme/css/console.css
View File

@ -59,6 +59,7 @@ a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}but
.label-required:after{content:'*';color:red;position:absolute;margin-left:4px;font-weight:bold;line-height:1.8em;top:6px;right:5px}
/** Layui样式调整 */
.layui-btn-sm.layui-btn-primary{line-height:28px!important;}
.think-inner-table{border:none!important;margin:0!important}
.think-inner-table tr:first-child td{padding-top:5px!important}
.think-inner-table tr:last-child td{padding-bottom:5px!important}

2
thinkphp/LICENSE.txt
View File

@ -1,6 +1,6 @@
ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
版权所有Copyright © 2006-2018 by ThinkPHP (http://thinkphp.cn)
All rights reserved。
ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。

39
thinkphp/README.md
View File

@ -1,11 +1,13 @@
![](http://www.thinkphp.cn/Uploads/editor/2016-06-23/576b4732a6e04.png)
![](https://box.kancloud.cn/5a0aaa69a5ff42657b5c4715f3d49221)
ThinkPHP 5.1 —— 12载初心，你值得信赖的PHP框架
ThinkPHP 5.1（LTS） —— 12载初心，你值得信赖的PHP框架
===============
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/top-think/framework/badges/quality-score.png?b=5.1)](https://scrutinizer-ci.com/g/top-think/framework/?branch=5.1)
[![Build Status](https://travis-ci.org/top-think/framework.svg?branch=master)](https://travis-ci.org/top-think/framework)
[![Total Downloads](https://poser.pugx.org/topthink/framework/downloads)](https://packagist.org/packages/topthink/framework)
[![Latest Stable Version](https://poser.pugx.org/topthink/framework/v/stable)](https://packagist.org/packages/topthink/framework)
[![PHP Version](https://img.shields.io/badge/php-%3E%3D5.6-8892BF.svg)](http://www.php.net/)
[![License](https://poser.pugx.org/topthink/framework/license)](https://packagist.org/packages/topthink/framework)
ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特性包括：
@ -22,6 +24,10 @@ ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特
+ 模型和数据库增强
+ 依赖注入完善
+ 支持PSR-3日志规范
+ 中间件支持（`V5.1.6+`）
+ 支持`Swoole`/`Workerman`运行（`V5.1.18+`）
官方已经正式宣布`5.1.27`版本为LTS版本。
### 废除的功能：
@ -32,6 +38,33 @@ ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特
> ThinkPHP5.1的运行环境要求PHP5.6+。
## 安装
使用composer安装
~~~
composer create-project topthink/think tp
~~~
启动服务
~~~
cd tp
php think run
~~~
然后就可以在浏览器中访问
~~~
http://localhost:8000
~~~
更新框架
~~~
composer update topthink/framework
~~~
## 在线手册
+ [完全开发手册](https://www.kancloud.cn/manual/thinkphp5_1/content)
@ -39,7 +72,7 @@ ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特
## 命名规范
`ThinkPHP5`遵循PSR-2命名规范和PSR-4自动加载规范。
`ThinkPHP5.1`遵循PSR-2命名规范和PSR-4自动加载规范。
## 参与开发

22
thinkphp/base.php
View File

@ -28,28 +28,6 @@ if (interface_exists('Psr\Log\LoggerInterface')) {
{}
}
// 注册核心类的静态代理
Facade::bind([
facade\App::class => App::class,
facade\Build::class => Build::class,
facade\Cache::class => Cache::class,
facade\Config::class => Config::class,
facade\Cookie::class => Cookie::class,
facade\Debug::class => Debug::class,
facade\Env::class => Env::class,
facade\Hook::class => Hook::class,
facade\Lang::class => Lang::class,
facade\Log::class => Log::class,
facade\Middleware::class => Middleware::class,
facade\Request::class => Request::class,
facade\Response::class => Response::class,
facade\Route::class => Route::class,
facade\Session::class => Session::class,
facade\Url::class => Url::class,
facade\Validate::class => Validate::class,
facade\View::class => View::class,
]);
// 注册类库别名
Loader::addClassAlias([
'App' => facade\App::class,

38
thinkphp/convention.php
View File

@ -4,7 +4,7 @@ return [
// +----------------------------------------------------------------------
// | 应用设置
// +----------------------------------------------------------------------
'app' => [
'app' => [
// 应用名称
'app_name' => '',
// 应用地址
@ -84,7 +84,7 @@ return [
// HTTPS代理标识
'https_agent_name' => '',
// IP代理获取标识
'http_agent_ip' => 'X-REAL-IP',
'http_agent_ip' => 'HTTP_X_REAL_IP',
// URL伪静态后缀
'url_html_suffix' => 'html',
// 域名根，如thinkphp.cn
@ -128,6 +128,8 @@ return [
'route_check_cache' => false,
// 路由缓存的Key自定义设置（闭包），默认为当前URL和请求类型的md5
'route_check_cache_key' => '',
// 路由缓存的设置
'route_cache_option' => [],
// +----------------------------------------------------------------------
// | 异常及错误设置
@ -150,7 +152,7 @@ return [
// | 模板设置
// +----------------------------------------------------------------------
'template' => [
'template' => [
// 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
'auto_rule' => 1,
// 模板引擎类型 支持 php think 支持扩展
@ -177,7 +179,7 @@ return [
// | 日志设置
// +----------------------------------------------------------------------
'log' => [
'log' => [
// 日志记录方式，内置 file socket 支持扩展
'type' => 'File',
// 日志保存目录
@ -186,13 +188,15 @@ return [
'level' => [],
// 是否记录trace信息到日志
'record_trace' => false,
// 是否JSON格式记录
'json' => false,
],
// +----------------------------------------------------------------------
// | Trace设置 开启 app_trace 后 有效
// +----------------------------------------------------------------------
'trace' => [
'trace' => [
// 内置Html Console 支持扩展
'type' => 'Html',
'file' => __DIR__ . '/tpl/page_trace.tpl',
@ -202,7 +206,7 @@ return [
// | 缓存设置
// +----------------------------------------------------------------------
'cache' => [
'cache' => [
// 驱动方式
'type' => 'File',
// 缓存保存目录
@ -217,7 +221,7 @@ return [
// | 会话设置
// +----------------------------------------------------------------------
'session' => [
'session' => [
'id' => '',
// SESSION_ID的提交变量,解决flash上传跨域
'var_session_id' => '',
@ -235,7 +239,7 @@ return [
// | Cookie设置
// +----------------------------------------------------------------------
'cookie' => [
'cookie' => [
// cookie 名称前缀
'prefix' => '',
// cookie 保存时间
@ -256,7 +260,7 @@ return [
// | 数据库设置
// +----------------------------------------------------------------------
'database' => [
'database' => [
// 数据库类型
'type' => 'mysql',
// 数据库连接DSN配置
@ -302,16 +306,22 @@ return [
],
//分页配置
'paginate' => [
'paginate' => [
'type' => 'bootstrap',
'var_page' => 'page',
'list_rows' => 15,
],
//控制台配置
'console' => [
'name' => 'Think Console',
'version' => '0.1',
'user' => null,
'console' => [
'name' => 'Think Console',
'version' => '0.1',
'user' => null,
'auto_path' => '',
],
// 中间件配置
'middleware' => [
'default_namespace' => 'app\\http\\middleware\\',
],
];

53
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);
}
}
}
@ -304,6 +304,21 @@ if (!function_exists('debug')) {
}
}
if (!function_exists('download')) {
/**
* 获取\think\response\Download对象实例
* @param string $filename 要下载的文件
* @param string $name 显示文件名
* @param bool $content 是否为内容
* @param integer $expire 有效期（秒）
* @return \think\response\Download
*/
function download($filename, $name = '', $content = false, $expire = 360, $openinBrower = false)
{
return Response::create($filename, 'download')->name($name)->isContent($content)->expire($expire)->openinBrower($openinBrower);
}
}
if (!function_exists('dump')) {
/**
* 浏览器友好的变量输出
@ -689,3 +704,17 @@ if (!function_exists('xml')) {
return Response::create($data, 'xml', $code, $header, $options);
}
}
if (!function_exists('yaconf')) {
/**
* 获取yaconf配置
*
* @param string $name 配置参数名
* @param mixed $default 默认值
* @return mixed
*/
function yaconf($name, $default = null)
{
return Config::yaconf($name, $default);
}
}

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

@ -25,6 +25,7 @@ return [
'method param miss' => '方法参数错误',
'method not exists' => '方法不存在',
'function not exists' => '函数不存在',
'file not exists' => '文件不存在',
'module not exists' => '模块不存在',
'controller not exists' => '控制器不存在',
'class not exists' => '类不存在',
@ -49,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' => '不支持的数据表达式',

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

@ -20,7 +20,7 @@ use think\route\Dispatch;
*/
class App extends Container
{
const VERSION = '5.1.14';
const VERSION = '5.1.32 LTS';
/**
* 当前模块路径
@ -118,15 +118,16 @@ class App extends Container
*/
protected $bindModule;
/**
* 初始化
* @var bool
*/
protected $initialized = false;
public function __construct($appPath = '')
{
$this->appPath = $appPath ? realpath($appPath) . DIRECTORY_SEPARATOR : $this->getAppPath();
$this->thinkPath = dirname(dirname(__DIR__)) . 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;
$this->thinkPath = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
$this->path($appPath);
}
/**
@ -149,41 +150,9 @@ class App extends Container
*/
public function path($path)
{
$this->appPath = $path;
return $this;
}
$this->appPath = $path ? realpath($path) . DIRECTORY_SEPARATOR : $this->getAppPath();
/**
* 注册核心容器实例
* @access public
* @return void
*/
public function registerCoreContainer()
{
// 注册核心类到容器
$this->bindTo([
'app' => App::class,
'build' => Build::class,
'cache' => Cache::class,
'config' => Config::class,
'cookie' => Cookie::class,
'debug' => Debug::class,
'env' => Env::class,
'hook' => Hook::class,
'lang' => Lang::class,
'log' => Log::class,
'middleware' => Middleware::class,
'request' => Request::class,
'response' => Response::class,
'route' => Route::class,
'session' => Session::class,
'url' => Url::class,
'validate' => Validate::class,
'view' => View::class,
'rule_name' => route\RuleName::class,
// 接口依赖注入
'think\LoggerInterface' => Log::class,
]);
return $this;
}
/**
@ -193,15 +162,25 @@ class App extends Container
*/
public function initialize()
{
$this->beginTime = microtime(true);
$this->beginMem = memory_get_usage();
if ($this->initialized) {
return;
}
$this->initialized = true;
$this->beginTime = microtime(true);
$this->beginMem = memory_get_usage();
$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;
static::setInstance($this);
$this->registerCoreContainer();
$this->instance('app', $this);
$this->configExt = $this->env->get('config_ext', '.php');
// 加载惯例配置文件
$this->config->set(include $this->thinkPath . 'convention.php');
@ -228,8 +207,6 @@ class App extends Container
// 注册应用命名空间
Loader::addNamespace($this->namespace, $this->appPath);
$this->configExt = $this->env->get('config_ext', '.php');
// 初始化应用
$this->init();
@ -278,8 +255,8 @@ class App extends Container
// 读取语言包
$this->loadLangPack();
// 监听app_init
$this->hook->listen('app_init');
// 路由初始化
$this->routeInit();
}
/**
@ -310,7 +287,7 @@ class App extends Container
// 加载公共文件
if (is_file($path . 'common.php')) {
include $path . 'common.php';
include_once $path . 'common.php';
}
if ('' == $module) {
@ -336,7 +313,7 @@ class App extends Container
// 自动读取配置文件
if (is_dir($path . 'config')) {
$dir = $path . 'config';
$dir = $path . 'config' . DIRECTORY_SEPARATOR;
} elseif (is_dir($this->configPath . $module)) {
$dir = $this->configPath . $module;
}
@ -345,8 +322,7 @@ class App extends Container
foreach ($files as $file) {
if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
$filename = $dir . DIRECTORY_SEPARATOR . $file;
$this->config->load($filename, pathinfo($file, PATHINFO_FILENAME));
$this->config->load($dir . $file, pathinfo($file, PATHINFO_FILENAME));
}
}
}
@ -357,7 +333,6 @@ class App extends Container
// 对容器中的对象实例进行配置更新
$this->containerConfigUpdate($module);
}
}
protected function containerConfigUpdate($module)
@ -370,6 +345,8 @@ class App extends Container
}
Db::init($config['database']);
$this->middleware->setConfig($config['middleware']);
$this->route->setConfig($config['app']);
$this->request->init($config['app']);
$this->cookie->init($config['cookie']);
$this->view->init($config['template']);
@ -382,7 +359,7 @@ class App extends Container
$this->lang->load($this->appPath . $module . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php');
// 模块请求缓存检查
$this->request->cache(
$this->checkRequestCache(
$config['app']['request_cache'],
$config['app']['request_cache_expire'],
$config['app']['request_cache_except']
@ -401,6 +378,9 @@ class App extends Container
// 初始化应用
$this->initialize();
// 监听app_init
$this->hook->listen('app_init');
if ($this->bindModule) {
// 模块/控制器绑定
$this->route->bind($this->bindModule);
@ -419,7 +399,7 @@ class App extends Container
if (empty($dispatch)) {
// 路由检测
$dispatch = $this->routeCheck();
$dispatch = $this->routeCheck()->init();
}
// 记录当前调度信息
@ -436,7 +416,7 @@ class App extends Container
$this->hook->listen('app_begin');
// 请求缓存检查
$this->request->cache(
$this->checkRequestCache(
$this->config('request_cache'),
$this->config('request_cache_expire'),
$this->config('request_cache_except')
@ -449,28 +429,7 @@ class App extends Container
}
$this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {
if (is_null($data)) {
try {
// 执行调度
$data = $dispatch->run();
} catch (HttpResponseException $exception) {
$data = $exception->getResponse();
}
}
// 输出数据到客户端
if ($data instanceof Response) {
$response = $data;
} elseif (!is_null($data)) {
// 默认自动识别响应输出类型
$isAjax = $request->isAjax();
$type = $isAjax ? $this->config('app.default_ajax_return') : $this->config('app.default_return_type');
$response = Response::create($data, $type);
} else {
$response = Response::create();
}
return $response;
return is_null($data) ? $dispatch->run() : $data;
});
$response = $this->middleware->dispatch($this->request);
@ -503,7 +462,7 @@ class App extends Container
$this->lang->detect();
}
$this->request->langset($this->lang->range());
$this->request->setLangset($this->lang->range());
// 加载系统语言包
$this->lang->load([
@ -512,6 +471,40 @@ class App extends Container
]);
}
/**
* 设置当前地址的请求缓存
* @access public
* @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
* @param mixed $expire 缓存有效期
* @param array $except 缓存排除
* @param string $tag 缓存标签
* @return void
*/
public function checkRequestCache($key, $expire = null, $except = [], $tag = null)
{
$cache = $this->request->cache($key, $expire, $except, $tag);
if ($cache) {
$this->setResponseCache($cache);
}
}
public function setResponseCache($cache)
{
list($key, $expire, $tag) = $cache;
if (strtotime($this->request->server('HTTP_IF_MODIFIED_SINCE')) + $expire > $this->request->server('REQUEST_TIME')) {
// 读取缓存
$response = Response::create()->code(304);
throw new HttpResponseException($response);
} elseif ($this->cache->has($key)) {
list($content, $header) = $this->cache->get($key);
$response = Response::create($content)->header($header);
throw new HttpResponseException($response);
}
}
/**
* 设置当前请求的调度信息
* @access public
@ -548,23 +541,12 @@ class App extends Container
}
/**
* URL路由检测（根据PATH_INFO)
* 路由初始化 导入路由定义规则
* @access public
* @return Dispatch
* @return void
*/
public function routeCheck()
public function routeInit()
{
// 获取应用调度信息
if (!$this->appDebug && $this->config->get('route_check_cache')) {
$routeKey = $this->getRouteCacheKey();
if ($this->cache->has($routeKey)) {
return $this->cache->get($routeKey);
}
}
$path = $this->request->path();
// 路由检测
$files = scandir($this->routePath);
foreach ($files as $file) {
@ -578,10 +560,11 @@ class App extends Container
}
}
if ($this->config('route.route_annotation')) {
if ($this->route->config('route_annotation')) {
// 自动生成路由定义
if ($this->appDebug) {
$this->build->buildRoute($this->config('route.controller_suffix'));
$suffix = $this->route->config('controller_suffix') || $this->route->config('class_suffix');
$this->build->buildRoute($suffix);
}
$filename = $this->runtimePath . 'build_route.php';
@ -590,11 +573,30 @@ class App extends Container
include $filename;
}
}
}
if (is_file($this->runtimePath . 'rule_regex.php')) {
$this->route->setRuleRegexs(include $this->runtimePath . 'rule_regex.php');
/**
* URL路由检测（根据PATH_INFO)
* @access public
* @return Dispatch
*/
public function routeCheck()
{
// 检测路由缓存
if (!$this->appDebug && $this->config->get('route_check_cache')) {
$routeKey = $this->getRouteCacheKey();
$option = $this->config->get('route_cache_option');
if ($option && $this->cache->connect($option)->has($routeKey)) {
return $this->cache->connect($option)->get($routeKey);
} elseif ($this->cache->has($routeKey)) {
return $this->cache->get($routeKey);
}
}
// 获取应用调度信息
$path = $this->request->path();
// 是否强制路由模式
$must = !is_null($this->routeMust) ? $this->routeMust : $this->route->config('url_route_must');
@ -603,9 +605,11 @@ class App extends Container
if (!empty($routeKey)) {
try {
$this->cache
->tag('route_cache')
->set($routeKey, $dispatch);
if ($option) {
$this->cache->connect($option)->tag('route_cache')->set($routeKey, $dispatch);
} else {
$this->cache->tag('route_cache')->set($routeKey, $dispatch);
}
} catch (\Exception $e) {
// 存在闭包的时候缓存无效
}
@ -718,9 +722,9 @@ class App extends Container
list($module, $class) = $this->parseModuleAndClass($name, $layer, $appendSuffix);
if (class_exists($class)) {
return $this->__get($class);
return $this->make($class, true);
} elseif ($empty && class_exists($emptyClass = $this->parseClass($module, $layer, $empty, $appendSuffix))) {
return $this->__get($emptyClass);
return $this->make($emptyClass, true);
}
throw new ClassNotFoundException('class not exists:' . $class, $class);

46
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,17 +238,19 @@ class Build
foreach ($controllers as $controller) {
$controller = basename($controller, '.php');
if ($suffix) {
// 控制器后缀
$controller = substr($controller, 0, -10);
}
$class = new \ReflectionClass($namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $controller);
$class = new \ReflectionClass($namespace . '\\' . $module . '\\' . $layer . '\\' . $controller);
if (strpos($layer, DIRECTORY_SEPARATOR)) {
if (strpos($layer, '\\')) {
// 多级控制器
$level = str_replace(DIRECTORY_SEPARATOR, '.', substr($layer, 11));
$controller = $level . '.' . $controller;
$length = strlen(strstr($layer, '\\', true));
} else {
$length = strlen($layer);
}
if ($suffix) {
$controller = substr($controller, 0, -$length);
}
$content .= $this->getControllerRoute($class, $module, $controller);
@ -272,12 +280,12 @@ class Build
if (false !== strpos($comment, '@route(')) {
$comment = $this->parseRouteComment($comment);
$route = $module . '/' . $controller;
$comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resourece(\1,\'' . $route . '\')', $comment);
$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;
}
@ -342,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);

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

@ -100,6 +100,11 @@ class Cache
return new static($config->pull('cache'));
}
public function getConfig()
{
return $this->config;
}
public function setConfig(array $config)
{
$this->config = array_merge($this->config, $config);

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

@ -69,18 +69,6 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static(array_merge($this->items, $this->convertToArray($items)));
}
/**
* 比较数组，返回差集
*
* @access public
* @param mixed $items
* @return static
*/
public function diff($items)
{
return new static(array_diff($this->items, $this->convertToArray($items)));
}
/**
* 交换数组中的键和值
*
@ -92,27 +80,108 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static(array_flip($this->items));
}
/**
* 按指定键整理数据
*
* @access public
* @param mixed $items 数据
* @param string $indexKey 键名
* @return array
*/
public function dictionary($items = null, &$indexKey = null)
{
if ($items instanceof self || $items instanceof Paginator) {
$items = $items->all();
}
$items = is_null($items) ? $this->items : $items;
if ($items && empty($indexKey)) {
$indexKey = is_array($items[0]) ? 'id' : $items[0]->getPk();
}
if (isset($indexKey) && is_string($indexKey)) {
return array_column($items, null, $indexKey);
}
return $items;
}
/**
* 比较数组，返回差集
*
* @access public
* @param mixed $items 数据
* @param string $indexKey 指定比较的键名
* @return static
*/
public function diff($items, $indexKey = null)
{
if ($this->isEmpty() || is_scalar($this->items[0])) {
return new static(array_diff($this->items, $this->convertToArray($items)));
}
$diff = [];
$dictionary = $this->dictionary($items, $indexKey);
if (is_string($indexKey)) {
foreach ($this->items as $item) {
if (!isset($dictionary[$item[$indexKey]])) {
$diff[] = $item;
}
}
}
return new static($diff);
}
/**
* 比较数组，返回交集
*
* @access public
* @param mixed $items
* @param mixed $items 数据
* @param string $indexKey 指定比较的键名
* @return static
*/
public function intersect($items)
public function intersect($items, $indexKey = null)
{
return new static(array_intersect($this->items, $this->convertToArray($items)));
if ($this->isEmpty() || is_scalar($this->items[0])) {
return new static(array_diff($this->items, $this->convertToArray($items)));
}
$intersect = [];
$dictionary = $this->dictionary($items, $indexKey);
if (is_string($indexKey)) {
foreach ($this->items as $item) {
if (isset($dictionary[$item[$indexKey]])) {
$intersect[] = $item;
}
}
}
return new static($intersect);
}
/**
* 返回数组中所有的键名
*
* @access public
* @return static
* @return array
*/
public function keys()
{
return new static(array_keys($this->items));
$current = current($this->items);
if (is_scalar($current)) {
$array = $this->items;
} elseif (is_array($current)) {
$array = $current;
} else {
$array = $current->toArray();
}
return array_keys($array);
}
/**
@ -234,6 +303,17 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return $this;
}
/**
* 用回调函数处理数组中的元素
* @access public
* @param callable|null $callback
* @return static
*/
public function map(callable $callback)
{
return new static(array_map($callback, $this->items));
}
/**
* 用回调函数过滤数组中的元素
* @access public
@ -249,6 +329,68 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static(array_filter($this->items));
}
/**
* 根据字段条件过滤数组中的元素
* @access public
* @param string $field 字段名
* @param mixed $operator 操作符
* @param mixed $value 数据
* @return static
*/
public function where($field, $operator, $value = null)
{
if (is_null($value)) {
$value = $operator;
$operator = '=';
}
return $this->filter(function ($data) use ($field, $operator, $value) {
if (strpos($field, '.')) {
list($field, $relation) = explode('.', $field);
$result = isset($data[$field][$relation]) ? $data[$field][$relation] : null;
} else {
$result = isset($data[$field]) ? $data[$field] : null;
}
switch ($operator) {
case '===':
return $result === $value;
case '!==':
return $result !== $value;
case '!=':
case '<>':
return $result != $value;
case '>':
return $result > $value;
case '>=':
return $result >= $value;
case '<':
return $result < $value;
case '<=':
return $result <= $value;
case 'like':
return is_string($result) && false !== strpos($result, $value);
case 'not like':
return is_string($result) && false === strpos($result, $value);
case 'in':
return is_scalar($result) && in_array($result, $value, true);
case 'not in':
return is_scalar($result) && !in_array($result, $value, true);
case 'between':
list($min, $max) = is_string($value) ? explode(',', $value) : $value;
return is_scalar($result) && $result >= $min && $result <= $max;
case 'not between':
list($min, $max) = is_string($value) ? explode(',', $value) : $value;
return is_scalar($result) && $result > $max || $result < $min;
case '==':
case '=':
default:
return $result == $value;
}
});
}
/**
* 返回数据中指定的一列
* @access public
@ -282,6 +424,28 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
return new static($items);
}
/**
* 指定字段排序
* @access public
* @param string $field 排序字段
* @param string $order 排序
* @param bool $intSort 是否为数字排序
* @return $this
*/
public function order($field, $order = null, $intSort = true)
{
return $this->sort(function ($a, $b) use ($field, $order, $intSort) {
$fieldA = isset($a[$field]) ? $a[$field] : null;
$fieldB = isset($b[$field]) ? $b[$field] : null;
if ($intSort) {
return 'desc' == strtolower($order) ? $fieldB >= $fieldA : $fieldA >= $fieldB;
} else {
return 'desc' == strtolower($order) ? strcmp($fieldB, $fieldA) : strcmp($fieldA, $fieldB);
}
});
}
/**
* 将数组打乱
*

173
thinkphp/library/think/Config.php
View File

@ -11,29 +11,69 @@
namespace think;
use Yaconf;
class Config implements \ArrayAccess
{
/**
* 配置参数
* @var array
*/
private $config = [];
protected $config = [];
/**
* 配置前缀
* @var string
*/
private $prefix = 'app';
protected $prefix = 'app';
/**
* 应用对象
* @var App
* 配置文件目录
* @var string
*/
protected $app;
protected $path;
public function __construct(App $app)
/**
* 配置文件后缀
* @var string
*/
protected $ext;
/**
* 是否支持Yaconf
* @var bool
*/
protected $yaconf;
/**
* 构造方法
* @access public
*/
public function __construct($path = '', $ext = '.php')
{
$this->app = $app;
$this->path = $path;
$this->ext = $ext;
$this->yaconf = class_exists('Yaconf');
}
public static function __make(App $app)
{
$path = $app->getConfigPath();
$ext = $app->getConfigExt();
return new static($path, $ext);
}
/**
* 设置开启Yaconf
* @access public
* @param bool|string $yaconf 是否使用Yaconf
* @return void
*/
public function setYaconf($yaconf)
{
if ($this->yaconf) {
$this->yaconf = $yaconf;
}
}
/**
@ -76,42 +116,67 @@ class Config implements \ArrayAccess
public function load($file, $name = '')
{
if (is_file($file)) {
$name = strtolower($name);
$type = pathinfo($file, PATHINFO_EXTENSION);
$filename = $file;
} elseif (is_file($this->path . $file . $this->ext)) {
$filename = $this->path . $file . $this->ext;
}
if ('php' == $type) {
return $this->set(include $file, $name);
} elseif ('yaml' == $type && function_exists('yaml_parse_file')) {
return $this->set(yaml_parse_file($file), $name);
}
return $this->parse($file, $type, $name);
if (isset($filename)) {
return $this->loadFile($filename, $name);
} elseif ($this->yaconf && Yaconf::has($file)) {
return $this->set(Yaconf::get($file), $name);
}
return $this->config;
}
/**
* 自动加载配置文件（PHP格式）
* @access public
* @param string $name 配置名
* @return void
* 获取实际的yaconf配置参数
* @access protected
* @param string $name 配置参数名
* @return string
*/
protected function autoLoad($name)
protected function getYaconfName($name)
{
// 如果尚未载入 则动态加载配置文件
$module = $this->app->request->module();
$module = $module ? $module . DIRECTORY_SEPARATOR : '';
$path = $this->app->getAppPath() . $module;
if (is_dir($path . 'config')) {
$file = $path . 'config' . DIRECTORY_SEPARATOR . $name . $this->app->getConfigExt();
} elseif (is_dir($this->app->getConfigPath() . $module)) {
$file = $this->app->getConfigPath() . $module . $name . $this->app->getConfigExt();
if ($this->yaconf && is_string($this->yaconf)) {
return $this->yaconf . '.' . $name;
}
if (isset($file) && is_file($file)) {
$this->load($file, $name);
return $name;
}
/**
* 获取yaconf配置
* @access public
* @param string $name 配置参数名
* @param mixed $default 默认值
* @return mixed
*/
public function yaconf($name, $default = null)
{
if ($this->yaconf) {
$yaconfName = $this->getYaconfName($name);
if (Yaconf::has($yaconfName)) {
return Yaconf::get($yaconfName);
}
}
return $default;
}
protected function loadFile($file, $name)
{
$name = strtolower($name);
$type = pathinfo($file, PATHINFO_EXTENSION);
if ('php' == $type) {
return $this->set(include $file, $name);
} elseif ('yaml' == $type && function_exists('yaml_parse_file')) {
return $this->set(yaml_parse_file($file), $name);
}
return $this->parse($file, $type, $name);
}
/**
@ -122,11 +187,11 @@ class Config implements \ArrayAccess
*/
public function has($name)
{
if (!strpos($name, '.')) {
if (false === strpos($name, '.')) {
$name = $this->prefix . '.' . $name;
}
return !is_null($this->get($name)) ? true : false;
return !is_null($this->get($name));
}
/**
@ -139,9 +204,13 @@ class Config implements \ArrayAccess
{
$name = strtolower($name);
if (!isset($this->config[$name])) {
// 如果尚未载入 则动态加载配置文件
$this->autoLoad($name);
if ($this->yaconf) {
$yaconfName = $this->getYaconfName($name);
if (Yaconf::has($yaconfName)) {
$config = Yaconf::get($yaconfName);
return isset($this->config[$name]) ? array_merge($this->config[$name], $config) : $config;
}
}
return isset($this->config[$name]) ? $this->config[$name] : [];
@ -150,37 +219,43 @@ class Config implements \ArrayAccess
/**
* 获取配置参数 为空则获取所有配置
* @access public
* @param string $name 配置参数名（支持多级配置 .号分割）
* @param string $name 配置参数名（支持多级配置 .号分割）
* @param mixed $default 默认值
* @return mixed
*/
public function get($name = null)
public function get($name = null, $default = null)
{
if ($name && false === strpos($name, '.')) {
$name = $this->prefix . '.' . $name;
}
// 无参数时获取所有
if (empty($name)) {
return $this->config;
}
if (!strpos($name, '.')) {
$name = $this->prefix . '.' . $name;
} elseif ('.' == substr($name, -1)) {
if ('.' == substr($name, -1)) {
return $this->pull(substr($name, 0, -1));
}
if ($this->yaconf) {
$yaconfName = $this->getYaconfName($name);
if (Yaconf::has($yaconfName)) {
return Yaconf::get($yaconfName);
}
}
$name = explode('.', $name);
$name[0] = strtolower($name[0]);
$config = $this->config;
if (!isset($config[$name[0]])) {
// 如果尚未载入 则动态加载配置文件
$this->autoLoad($name[0]);
}
// 按.拆分成多维数组进行判断
foreach ($name as $val) {
if (isset($config[$val])) {
$config = $config[$val];
} else {
return;
return $default;
}
}
@ -197,7 +272,7 @@ class Config implements \ArrayAccess
public function set($name, $value = null)
{
if (is_string($name)) {
if (!strpos($name, '.')) {
if (false === strpos($name, '.')) {
$name = $this->prefix . '.' . $name;
}
@ -239,7 +314,7 @@ class Config implements \ArrayAccess
*/
public function remove($name)
{
if (!strpos($name, '.')) {
if (false === strpos($name, '.')) {
$name = $this->prefix . '.' . $name;
}

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

@ -35,18 +35,22 @@ class Console
private $defaultCommand;
private static $defaultCommands = [
"think\\console\\command\\Help",
"think\\console\\command\\Lists",
"think\\console\\command\\Build",
"think\\console\\command\\Clear",
"think\\console\\command\\make\\Controller",
"think\\console\\command\\make\\Model",
"think\\console\\command\\make\\Middleware",
"think\\console\\command\\optimize\\Autoload",
"think\\console\\command\\optimize\\Config",
"think\\console\\command\\optimize\\Schema",
"think\\console\\command\\optimize\\Route",
"think\\console\\command\\RunServer",
'help' => "think\\console\\command\\Help",
'list' => "think\\console\\command\\Lists",
'build' => "think\\console\\command\\Build",
'clear' => "think\\console\\command\\Clear",
'make:command' => "think\\console\\command\\make\\Command",
'make:controller' => "think\\console\\command\\make\\Controller",
'make:model' => "think\\console\\command\\make\\Model",
'make:middleware' => "think\\console\\command\\make\\Middleware",
'make:validate' => "think\\console\\command\\make\\Validate",
'optimize:autoload' => "think\\console\\command\\optimize\\Autoload",
'optimize:config' => "think\\console\\command\\optimize\\Config",
'optimize:schema' => "think\\console\\command\\optimize\\Schema",
'optimize:route' => "think\\console\\command\\optimize\\Route",
'run' => "think\\console\\command\\RunServer",
'version' => "think\\console\\command\\Version",
'route:list' => "think\\console\\command\\RouteList",
];
/**
@ -67,10 +71,6 @@ class Console
$this->defaultCommand = 'list';
$this->definition = $this->getDefaultInputDefinition();
foreach ($this->getDefaultCommands() as $command) {
$this->add($command);
}
}
/**
@ -79,6 +79,10 @@ class Console
*/
public function setUser($user)
{
if (DIRECTORY_SEPARATOR == '\\') {
return;
}
$user = posix_getpwnam($user);
if ($user) {
posix_setuid($user['uid']);
@ -97,25 +101,13 @@ class Console
static $console;
if (!$console) {
$config = Container::get('config')->pull('console');
// 实例化 console
$config = Container::get('config')->pull('console');
$console = new self($config['name'], $config['version'], $config['user']);
// 读取指令集
$file = Container::get('env')->get('app_path') . 'command.php';
$commands = $console->getDefinedCommands($config);
if (is_file($file)) {
$commands = include $file;
if (is_array($commands)) {
foreach ($commands as $command) {
if (class_exists($command) && is_subclass_of($command, "\\think\\console\\Command")) {
// 注册指令
$console->add(new $command());
}
}
}
}
// 添加指令集
$console->addCommands($commands);
}
if ($run) {
@ -126,6 +118,46 @@ class Console
}
}
/**
* @access public
* @param array $config
* @return array
*/
public function getDefinedCommands(array $config = [])
{
$commands = self::$defaultCommands;
if (!empty($config['auto_path']) && is_dir($config['auto_path'])) {
// 自动加载指令类
$files = scandir($config['auto_path']);
if (count($files) > 2) {
$beforeClass = get_declared_classes();
foreach ($files as $file) {
if (pathinfo($file, PATHINFO_EXTENSION) == 'php') {
include $config['auto_path'] . $file;
}
}
$afterClass = get_declared_classes();
$commands = array_merge($commands, array_diff($afterClass, $beforeClass));
}
}
$file = Container::get('env')->get('app_path') . 'command.php';
if (is_file($file)) {
$appCommands = include $file;
if (is_array($appCommands)) {
$commands = array_merge($commands, $appCommands);
}
}
return $commands;
}
/**
* @access public
* @param string $command
@ -339,9 +371,9 @@ class Console
}
/**
* 注册一个指令
* 注册一个指令 （便于动态创建指令）
* @access public
* @param string $name
* @param string $name 指令名
* @return Command
*/
public function register($name)
@ -350,25 +382,38 @@ class Console
}
/**
* 添加指令
* 添加指令集
* @access public
* @param Command[] $commands
* @param array $commands
*/
public function addCommands(array $commands)
{
foreach ($commands as $command) {
$this->add($command);
foreach ($commands as $key => $command) {
if (is_subclass_of($command, "\\think\\console\\Command")) {
// 注册指令
$this->add($command, is_numeric($key) ? '' : $key);
}
}
}
/**
* 添加一个指令
* 注册一个指令（对象）
* @access public
* @param Command $command
* @return Command
* @param mixed $command 指令对象或者指令类名
* @param string $name 指令名 留空则自动获取
* @return mixed
*/
public function add(Command $command)
public function add($command, $name)
{
if ($name) {
$this->commands[$name] = $command;
return;
}
if (is_string($command)) {
$command = new $command();
}
$command->setConsole($this);
if (!$command->isEnabled()) {
@ -404,6 +449,12 @@ class Console
$command = $this->commands[$name];
if (is_string($command)) {
$command = new $command();
}
$command->setConsole($this);
if ($this->wantHelps) {
$this->wantHelps = false;
@ -522,16 +573,6 @@ class Console
throw new \InvalidArgumentException($message);
}
if (count($commands) > 1) {
$commandList = $this->commands;
$commands = array_filter($commands, function ($nameOrAlias) use ($commandList, $commands) {
$commandName = $commandList[$nameOrAlias]->getName();
return $commandName === $nameOrAlias || !in_array($commandName, $commands);
});
}
$exact = in_array($name, $commands, true);
if (count($commands) > 1 && !$exact) {
$suggestions = $this->getAbbreviationSuggestions(array_values($commands));
@ -659,24 +700,6 @@ class Console
]);
}
/**
* 设置默认命令
* @access protected
* @return Command[] An array of default Command instances
*/
protected function getDefaultCommands()
{
$defaultCommands = [];
foreach (self::$defaultCommands as $classname) {
if (class_exists($classname) && is_subclass_of($classname, "think\\console\\Command")) {
$defaultCommands[] = new $classname();
}
}
return $defaultCommands;
}
public static function addDefaultCommands(array $classnames)
{
self::$defaultCommands = array_merge(self::$defaultCommands, $classnames);
@ -791,4 +814,11 @@ class Console
return $namespaces;
}
public function __debugInfo()
{
$data = get_object_vars($this);
unset($data['commands'], $data['definition']);
return $data;
}
}

116
thinkphp/library/think/Container.php
View File

@ -11,15 +11,41 @@
namespace think;
use ArrayAccess;
use ArrayIterator;
use Closure;
use Countable;
use InvalidArgumentException;
use IteratorAggregate;
use ReflectionClass;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
use think\exception\ClassNotFoundException;
class Container implements \ArrayAccess
/**
* @package think
* @property Build $build
* @property Cache $cache
* @property Config $config
* @property Cookie $cookie
* @property Debug $debug
* @property Env $env
* @property Hook $hook
* @property Lang $lang
* @property Middleware $middleware
* @property Request $request
* @property Response $response
* @property Route $route
* @property Session $session
* @property Template $template
* @property Url $url
* @property Validate $validate
* @property View $view
* @property route\RuleName $rule_name
* @property Log $log
*/
class Container implements ArrayAccess, IteratorAggregate, Countable
{
/**
* 容器对象实例
@ -38,12 +64,28 @@ class Container implements \ArrayAccess
* @var array
*/
protected $bind = [
'app' => 'think\App',
'config' => 'think\Config',
'lang' => 'think\Lang',
'log' => 'think\Log',
'request' => 'think\Request',
'response' => 'think\Response',
'app' => App::class,
'build' => Build::class,
'cache' => Cache::class,
'config' => Config::class,
'cookie' => Cookie::class,
'debug' => Debug::class,
'env' => Env::class,
'hook' => Hook::class,
'lang' => Lang::class,
'log' => Log::class,
'middleware' => Middleware::class,
'request' => Request::class,
'response' => Response::class,
'route' => Route::class,
'session' => Session::class,
'template' => Template::class,
'url' => Url::class,
'validate' => Validate::class,
'view' => View::class,
'rule_name' => route\RuleName::class,
// 接口依赖注入
'think\LoggerInterface' => Log::class,
];
/**
@ -137,6 +179,9 @@ class Container implements \ArrayAccess
} elseif ($concrete instanceof Closure) {
$this->bind[$abstract] = $concrete;
} elseif (is_object($concrete)) {
if (isset($this->bind[$abstract])) {
$abstract = $this->bind[$abstract];
}
$this->instances[$abstract] = $concrete;
} else {
$this->bind[$abstract] = $concrete;
@ -178,6 +223,21 @@ class Container implements \ArrayAccess
return isset($this->bind[$abstract]) || isset($this->instances[$abstract]);
}
/**
* 判断容器中是否存在对象实例
* @access public
* @param string $abstract 类名或者标识
* @return bool
*/
public function exists($abstract)
{
if (isset($this->bind[$abstract])) {
$abstract = $this->bind[$abstract];
}
return isset($this->instances[$abstract]);
}
/**
* 判断容器中是否存在类及标识
* @access public
@ -248,6 +308,16 @@ class Container implements \ArrayAccess
}
}
/**
* 获取容器中的对象实例
* @access public
* @return array
*/
public function all()
{
return $this->instances;
}
/**
* 清除容器中的对象实例
* @access public
@ -392,8 +462,9 @@ class Container implements \ArrayAccess
$params = $reflect->getParameters();
foreach ($params as $param) {
$name = $param->getName();
$class = $param->getClass();
$name = $param->getName();
$lowerName = Loader::parseName($name);
$class = $param->getClass();
if ($class) {
$args[] = $this->getObjectParam($class->getName(), $vars);
@ -401,6 +472,8 @@ class Container implements \ArrayAccess
$args[] = array_shift($vars);
} elseif (0 == $type && isset($vars[$name])) {
$args[] = $vars[$name];
} elseif (0 == $type && isset($vars[$lowerName])) {
$args[] = $vars[$lowerName];
} elseif ($param->isDefaultValueAvailable()) {
$args[] = $param->getDefaultValue();
} else {
@ -420,12 +493,13 @@ class Container implements \ArrayAccess
*/
protected function getObjectParam($className, &$vars)
{
$value = array_shift($vars);
$array = $vars;
$value = array_shift($array);
if ($value instanceof $className) {
$result = $value;
array_shift($vars);
} else {
array_unshift($vars, $value);
$result = $this->make($className);
}
@ -471,4 +545,24 @@ class Container implements \ArrayAccess
{
$this->__unset($key);
}
//Countable
public function count()
{
return count($this->instances);
}
//IteratorAggregate
public function getIterator()
{
return new ArrayIterator($this->instances);
}
public function __debugInfo()
{
$data = get_object_vars($this);
unset($data['instances'], $data['instance']);
return $data;
}
}

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

@ -43,11 +43,17 @@ class Controller
protected $batchValidate = false;
/**
* 前置操作方法列表
* 前置操作方法列表（即将废弃）
* @var array $beforeActionList
*/
protected $beforeActionList = [];
/**
* 控制器中间件
* @var array
*/
protected $middleware = [];
/**
* 构造方法
* @access public
@ -61,7 +67,9 @@ class Controller
// 控制器初始化
$this->initialize();
// 前置操作方法
$this->registerMiddleware();
// 前置操作方法 即将废弃
foreach ((array) $this->beforeActionList as $method => $options) {
is_numeric($method) ?
$this->beforeAction($options) :
@ -73,6 +81,36 @@ class Controller
protected function initialize()
{}
// 注册控制器中间件
public function registerMiddleware()
{
foreach ($this->middleware as $key => $val) {
if (!is_int($key)) {
$only = $except = null;
if (isset($val['only'])) {
$only = array_map(function ($item) {
return strtolower($item);
}, $val['only']);
} elseif (isset($val['except'])) {
$except = array_map(function ($item) {
return strtolower($item);
}, $val['except']);
}
if (isset($only) && !in_array($this->request->action(), $only)) {
continue;
} elseif (isset($except) && in_array($this->request->action(), $except)) {
continue;
} else {
$val = $key;
}
}
$this->app['middleware']->controller($val);
}
}
/**
* 前置操作
* @access protected
@ -85,14 +123,24 @@ class Controller
if (is_string($options['only'])) {
$options['only'] = explode(',', $options['only']);
}
if (!in_array($this->request->action(), $options['only'])) {
$only = array_map(function ($val) {
return strtolower($val);
}, $options['only']);
if (!in_array($this->request->action(), $only)) {
return;
}
} elseif (isset($options['except'])) {
if (is_string($options['except'])) {
$options['except'] = explode(',', $options['except']);
}
if (in_array($this->request->action(), $options['except'])) {
$except = array_map(function ($val) {
return strtolower($val);
}, $options['except']);
if (in_array($this->request->action(), $except)) {
return;
}
}
@ -228,4 +276,12 @@ class Controller
return true;
}
public function __debugInfo()
{
$data = get_object_vars($this);
unset($data['app'], $data['request']);
return $data;
}
}

22
thinkphp/library/think/Cookie.php
View File

@ -53,7 +53,7 @@ class Cookie
{
$this->config = array_merge($this->config, array_change_key_case($config));
if (!empty($this->config['httponly'])) {
if (!empty($this->config['httponly']) && PHP_SESSION_ACTIVE != session_status()) {
ini_set('session.cookie_httponly', 1);
}
}
@ -113,12 +113,26 @@ class Cookie
$expire = !empty($config['expire']) ? $_SERVER['REQUEST_TIME'] + intval($config['expire']) : 0;
if ($config['setcookie']) {
setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
$this->setCookie($name, $value, $expire, $config);
}
$_COOKIE[$name] = $value;
}
/**
* Cookie 设置保存
*
* @access public
* @param string $name cookie名称
* @param mixed $value cookie值
* @param array $option 可选参数
* @return void
*/
protected function setCookie($name, $value, $expire, $option = [])
{
setcookie($name, $value, $expire, $option['path'], $option['domain'], $option['secure'], $option['httponly']);
}
/**
* 永久保存Cookie数据
* @access public
@ -205,7 +219,7 @@ class Cookie
$name = $prefix . $name;
if ($config['setcookie']) {
setcookie($name, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
$this->setcookie($name, '', $_SERVER['REQUEST_TIME'] - 3600, $config);
}
// 删除指定cookie
@ -234,7 +248,7 @@ class Cookie
foreach ($_COOKIE as $key => $val) {
if (0 === strpos($key, $prefix)) {
if ($config['setcookie']) {
setcookie($key, '', $_SERVER['REQUEST_TIME'] - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
$this->setcookie($key, '', $_SERVER['REQUEST_TIME'] - 3600, $config);
}
unset($_COOKIE[$key]);
}

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