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

[更新]升级ThinkPHP框架至5.0.11，优化UI统一效果

Browse Source
This commit is contained in:
Anyon 2017-09-09 09:43:57 +08:00
parent 0cd19a93b1
commit 292d00a026
91 changed files with 1805 additions and 1174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/controller/Auth.php
View File

@ -151,7 +151,7 @@ class Auth extends BasicAdmin
{
if (DataService::update($this->table)) {
$id = $this->request->post('id');
Db::name('SystemAuthNode')->where('auth', $id)->delete();
Db::name('SystemAuthNode')->where(['auth' => $id])->delete();
$this->success("权限删除成功！", '');
}
$this->error("权限删除失败，请稍候再试！");

2
application/admin/controller/Config.php
View File

@ -60,7 +60,7 @@ class Config extends BasicAdmin
public function file()
{
$this->title = '文件存储配置';
$alert = ['type' => 'success', 'title' => '操作提示', 'content' => '文件引擎参数影响全局文件上传功能,请勿随意修改！'];
$alert = ['type' => 'success', 'title' => '操作提示', 'content' => '文件引擎参数影响全局文件上传功能，请勿随意修改！'];
$this->assign('alert', $alert);
return $this->index();
}

2
application/admin/controller/Index.php
View File

@ -38,7 +38,7 @@ class Index extends BasicAdmin
public function index()
{
NodeService::applyAuthNode();
$list = (array) Db::name('SystemMenu')->where(['status' => '1'])->order('sort asc,id asc')->select();
$list = (array)Db::name('SystemMenu')->where(['status' => '1'])->order('sort asc,id asc')->select();
$menus = $this->_filterMenu(ToolsService::arr2tree($list), NodeService::get());
return view('', ['title' => '系统管理', 'menus' => $menus]);
}

2
application/admin/controller/Log.php
View File

@ -20,7 +20,7 @@ use think\Db;
/**
* 系统日志管理
* Class User
* Class Log
* @package app\admin\controller
* @author Anyon <zoujingli@qq.com>
* @date 2017/02/15 18:12

2
application/admin/controller/Menu.php
View File

@ -83,7 +83,7 @@ class Menu extends BasicAdmin
{
if ($this->request->isGet()) {
// 上级菜单处理
$_menus = Db::name($this->table)->where('status', '1')->order('sort desc,id desc')->select();
$_menus = Db::name($this->table)->where(['status' => '1'])->order('sort desc,id desc')->select();
$_menus[] = ['title' => '顶级菜单', 'id' => '0', 'pid' => '-1'];
$menus = ToolsService::arr2table($_menus);
foreach ($menus as $key => &$menu) {

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

@ -117,7 +117,7 @@ class Plugs extends BasicAdmin
$secretKey = sysconf('storage_qiniu_secret_key');
$protocol = sysconf('storage_qiniu_is_https') ? 'https' : 'http';
$params = [
"scope" => "{$bucket}:{$key}", "deadline" => 3600 + time(),
"scope" => "{$bucket}:{$key}", "deadline" => 3600 + time(),
"returnBody" => "{\"data\":{\"site_url\":\"{$protocol}://{$host}/$(key)\",\"file_url\":\"$(key)\"}, \"code\": \"SUCCESS\"}",
];
$data = str_replace(['+', '/'], ['-', '_'], base64_encode(json_encode($params)));

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

@ -2,81 +2,89 @@
{block name="button"}
<div class="nowrap pull-right" style="margin-top:10px">
<button data-modal='{:url("$classuri/add")}' data-title="添加权限" class='layui-btn layui-btn-small'><i class='fa fa-plus'></i> 添加权限</button>
<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-small layui-btn-danger'><i class='fa fa-remove'></i> 删除权限</button>
<button data-modal='{:url("$classuri/add")}' data-title="添加权限" class='layui-btn layui-btn-small'>
<i class='fa fa-plus'></i> 添加权限
</button>
<button data-update data-field='delete' data-action='{:url("$classuri/del")}'
class='layui-btn layui-btn-small layui-btn-danger'>
<i class='fa fa-remove'></i> 删除权限
</button>
</div>
{/block}
{block name="content"}
<form onsubmit="return false;" data-auto="true" method="post">
{if !empty($list)}
{if empty($list)}
<p class="help-block text-center well">没 有 记 录 哦！</p>
{else}
<input type="hidden" value="resort" name="action"/>
<table class="table table-hover">
<table class="layui-table" lay-skin="line" lay-size="sm">
<thead>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='list-table-sort-td'>
<button type="submit" class="layui-btn layui-btn-normal layui-btn-mini">排 序</button>
</th>
<th class='text-center'>权限名称</th>
<th class='text-center'>权限描述</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='list-table-sort-td'>
<button type="submit" class="layui-btn layui-btn-normal layui-btn-mini">排 序</button>
</th>
<th class='text-center'>权限名称</th>
<th class='text-center'>权限描述</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
</thead>
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='list-table-sort-td'>
<input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
</td>
<td class='text-center'>{$vo.title}</td>
<td class='text-center'>{$vo.desc|default="<span style='color:#ccc'>没有写描述哦！</span>"}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='list-table-sort-td'>
<input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
</td>
<td class='text-center'>{$vo.title}</td>
<td class='text-center'>{$vo.desc|default="<span style='color:#ccc'>没有写描述哦！</span>"}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if auth("$classuri/apply")}
<span class="text-explode">|</span>
<a data-open='{:url("$classuri/apply")}?id={$vo.id}' href="javascript:void(0)">授权</a>
{/if}
{if auth("$classuri/apply")}
<span class="text-explode">|</span>
<a data-open='{:url("$classuri/apply")}?id={$vo.id}' href="javascript:void(0)">授权</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='0'data-action='{:url("$classuri/forbid")}' href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}' href="javascript:void(0)">启用</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'
href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'
href="javascript:void(0)">启用</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}' href="javascript:void(0)">删除</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'
href="javascript:void(0)">删除</a>
{/if}
</td>
</tr>
{/foreach}
</td>
</tr>
{/foreach}
</tbody>
</table>
{if isset($page)}<p>{$page}</p>{/if}
{else}
<p class="help-blok">暂时无记录</p>
{/if}
</form>
{/block}

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

@ -3,7 +3,8 @@
{block name="button"}
<div class="nowrap pull-right" style="margin-top:10px">
{if auth("$classuri/del")}
<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-small layui-btn-danger'>
<button data-update data-field='delete' data-action='{:url("$classuri/del")}'
class='layui-btn layui-btn-small layui-btn-danger'>
<i class='fa fa-remove'></i> 删除日志
</button>
{/if}
@ -13,77 +14,78 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="animated form-search" action="__SELF__" onsubmit="return false" method="get">
<div class="row">
<div class="col-xs-3">
<div class="form-group">
<input type="text" name="username" value="{$Think.get.username|default=''}" placeholder="操作者" class="input-sm form-control">
</div>
<form class="layui-form layui-form-pane form-search" action="__SELF__" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label" style="width:auto">操作者</label>
<div class="layui-input-inline">
<input name="username" value="{$Think.get.username|default=''}" placeholder="请输入操作者" class="layui-input">
</div>
</div>
<div class="col-xs-3">
<div class="form-group">
<select name='action' class='input-sm form-control'>
<option value=''> - 行为 - </option>
<!--{foreach $actions as $action}-->
<!--{if $action===$Think.get.action}-->
<option selected="selected" value='{$action}'>{$action}</option>
<!--{else}-->
<option value='{$action}'>{$action}</option>
<!--{/if}-->
<!--{/foreach}-->
</select>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label" style="width:auto">操作行为</label>
<div class="layui-input-inline">
<select name='action' class='layui-select' lay-search="">
<option value=''> - 所有记录 -</option>
<!--{foreach $actions as $action}-->
<!--{if $action===$Think.get.action}-->
<option selected="selected" value='{$action}'>{$action}</option>
<!--{else}-->
<option value='{$action}'>{$action}</option>
<!--{/if}-->
<!--{/foreach}-->
</select>
</div>
</div>
<div class="col-xs-3">
<div class="form-group">
<input type="text" name="content" value="{$Think.get.content|default=''}" placeholder="操作内容" class="input-sm form-control">
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label" style="width:auto">操作内容</label>
<div class="layui-input-inline">
<input name="content" value="{$Think.get.content|default=''}" placeholder="请输入操作内容" class="layui-input">
</div>
</div>
<div class="col-xs-1">
<div class="form-group">
<button type="submit" class="btn btn-sm btn-white"><i class="fa fa-search"></i> 搜索</button>
</div>
</div>
<div class="layui-form-item layui-inline">
<button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
</div>
</form>
<!-- 表单搜索 结束 -->
<form onsubmit="return false;" data-auto="" method="POST">
<input type="hidden" value="resort" name="action"/>
<table class="table table-hover">
<table class="layui-table" lay-skin="line" lay-size="sm">
<thead>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='text-center'>操作者</th>
<th class='text-left'>节点</th>
<th class='text-left'>行为</th>
<th class='text-left'>操作内容</th>
<th class='text-left'>操作位置</th>
<th class='text-left'>操作时间</th>
</tr>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='text-center'>操作者</th>
<th class='text-left'>节点</th>
<th class='text-left'>行为</th>
<th class='text-left'>操作内容</th>
<th class='text-left'>操作位置</th>
<th class='text-left'>操作时间</th>
</tr>
</thead>
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='text-center'>{$vo.username}</td>
<td class='text-left'>{$vo.node}</td>
<td class='text-left'>{$vo.action}</td>
<td class='text-left'>{$vo.content}</td>
<td class='text-left'>{$vo.isp|default=$vo.ip}</td>
<td class='text-left'>{$vo.create_at}</td>
</tr>
{/foreach}
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='text-center'>{$vo.username}</td>
<td class='text-left'>{$vo.node}</td>
<td class='text-left'>{$vo.action}</td>
<td class='text-left'>{$vo.content}</td>
<td class='text-left'>{$vo.isp|default=$vo.ip}</td>
<td class='text-left'>{$vo.create_at}</td>
</tr>
{/foreach}
</tbody>
</table>
{if isset($page)}<p>{$page}</p>{/if}
<script>
window.form.render();
</script>
</form>
{/block}

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

@ -41,13 +41,13 @@
<ul>
<li>
<input name='username' class="hide"/>
<input required="required" pattern="^\S{4,}$" value="admin" name="username"
<input required="required" pattern="^\S{4,}$" value="" name="username"
autofocus="autofocus" autocomplete="off" class="login-input username"
title="请输入4位及以上的字符" placeholder="请输入用户名/手机号码"/>
</li>
<li>
<input name='password' class="hide"/>
<input required="required" pattern="^\S{4,}$" value="admin" name="password"
<input required="required" pattern="^\S{4,}$" value="" name="password"
type="password" autocomplete="off" class="login-input password"
title="请输入4位及以上的字符" placeholder="请输入密码"/>
</li>

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

@ -2,8 +2,12 @@
{block name="button"}
<div class="nowrap pull-right" style="margin-top:10px">
<button data-modal='{:url("$classuri/add")}' data-title="添加菜单" class='layui-btn layui-btn-small'><i class='fa fa-plus'></i> 添加菜单</button>
<button data-update data-field='delete' data-action='{:url("$classuri/del")}' class='layui-btn layui-btn-small layui-btn-danger'><i class='fa fa-remove'></i> 删除菜单</button>
<button data-modal='{:url("$classuri/add")}' data-title="添加菜单" class='layui-btn layui-btn-small'><i
class='fa fa-plus'></i> 添加菜单
</button>
<button data-update data-field='delete' data-action='{:url("$classuri/del")}'
class='layui-btn layui-btn-small layui-btn-danger'><i class='fa fa-remove'></i> 删除菜单
</button>
</div>
{/block}
@ -11,62 +15,65 @@
<form onsubmit="return false;" data-auto="true" method="post">
<input type="hidden" value="resort" name="action"/>
<table class="table table-hover">
<table class="layui-table" lay-skin="line" lay-size="sm">
<thead>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='list-table-sort-td'>
<button type="submit" class="layui-btn layui-btn-normal layui-btn-mini">排 序</button>
</th>
<th class='text-center'></th>
<th>菜单名称</th>
<th class='visible-lg'>菜单链接</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='list-table-sort-td'>
<button type="submit" class="layui-btn layui-btn-normal layui-btn-mini">排 序</button>
</th>
<th class='text-center'></th>
<th>菜单名称</th>
<th class='visible-lg'>菜单链接</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
</thead>
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.ids}' type='checkbox'/>
</td>
<td class='list-table-sort-td'>
<input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
</td>
<td class='text-center'>
<i style="font-size:18px;" class="{$vo.icon}"></i>
</td>
<td>{$vo.spl}{$vo.title}</td>
<td class='visible-lg'>{$vo.url}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='status' data-value='0'data-action='{:url("$classuri/forbid")}' href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}' href="javascript:void(0)">启用</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='delete' data-action='{:url("$classuri/del")}' href="javascript:void(0)">删除</a>
{/if}
</td>
</tr>
{/foreach}
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.ids}' type='checkbox'/>
</td>
<td class='list-table-sort-td'>
<input name="_{$vo.id}" value="{$vo.sort}" class="list-sort-input"/>
</td>
<td class='text-center'>
<i style="font-size:18px;" class="{$vo.icon}"></i>
</td>
<td>{$vo.spl}{$vo.title}</td>
<td class='visible-lg'>{$vo.url}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'
href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'
href="javascript:void(0)">启用</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.ids}" data-field='delete' data-action='{:url("$classuri/del")}'
href="javascript:void(0)">删除</a>
{/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
</form>

1098
application/admin/view/plugs.upfile.html
View File

File diff suppressed because it is too large Load Diff

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

@ -14,97 +14,98 @@
{block name="content"}
<!-- 表单搜索 开始 -->
<form class="animated form-search" action="__SELF__" onsubmit="return false" method="get">
<div class="row">
<div class="col-xs-3">
<div class="form-group">
<input type="text" name="username" value="{$Think.get.username|default=''}" placeholder="用户名" class="input-sm form-control">
</div>
<form class="layui-form layui-form-pane form-search" action="__SELF__" onsubmit="return false" method="get">
<div class="layui-form-item layui-inline">
<label class="layui-form-label" style="width:auto">用户名</label>
<div class="layui-input-inline">
<input name="username" value="{$Think.get.username|default=''}" placeholder="请输入用户名" class="layui-input">
</div>
</div>
<div class="col-xs-3">
<div class="form-group">
<input type="text" name="phone" value="{$Think.get.phone|default=''}" placeholder="手机号" class="input-sm form-control">
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label" style="width:auto">手机号</label>
<div class="layui-input-inline">
<input name="phone" value="{$Think.get.phone|default=''}" placeholder="请输入手机号" class="layui-input">
</div>
</div>
<div class="col-xs-1">
<div class="form-group">
<button type="submit" class="btn btn-sm btn-white"><i class="fa fa-search"></i> 搜索</button>
</div>
</div>
<div class="layui-form-item layui-inline">
<button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
</div>
</form>
<!-- 表单搜索 结束 -->
<form onsubmit="return false;" data-auto="" method="POST">
<form onsubmit="return false;" data-auto="true" method="post">
{if empty($list)}
<p class="help-block text-center well">没 有 记 录 哦！</p>
{else}
<input type="hidden" value="resort" name="action"/>
<table class="table table-hover">
<table class="layui-table" lay-skin="line" lay-size="sm">
<thead>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='text-center'>用户账号</th>
<th class='text-center'>手机号</th>
<th class='text-center'>电子邮箱</th>
<th class='text-center'>登录次数</th>
<th class='text-center'>最后登录</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
<tr>
<th class='list-table-check-td'>
<input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
</th>
<th class='text-center'>用户账号</th>
<th class='text-center'>手机号</th>
<th class='text-center'>电子邮箱</th>
<th class='text-center'>登录次数</th>
<th class='text-center'>最后登录</th>
<th class='text-center'>状态</th>
<th class='text-center'>操作</th>
</tr>
</thead>
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='text-center'>{$vo.username}</td>
<td class='text-center'>{$vo.phone|default="<span style='color:#ccc'>还没有设置手机号</span>"}</td>
<td class='text-center'>{$vo.mail|default="<span style='color:#ccc'>还没有设置邮箱</span>"}</td>
<td class='text-center'>{$vo.login_num|default="<span style='color:#ccc'>从未登录</span>"}</td>
<td class='text-center'>{$vo.login_at|default="<span style='color:#ccc'>从未登录</span>"}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if auth("$classuri/auth")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/auth")}?id={$vo.id}' href="javascript:void(0)">授权</a>
{/if}
{if auth("$classuri/pass")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/pass")}?id={$vo.id}' href="javascript:void(0)">密码</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'
href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'
href="javascript:void(0)">启用</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'
href="javascript:void(0)">删除</a>
{/if}
</td>
</tr>
{/foreach}
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/>
</td>
<td class='text-center'>{$vo.username}</td>
<td class='text-center'>{$vo.phone|default="<span style='color:#ccc'>还没有设置手机号</span>"}</td>
<td class='text-center'>{$vo.mail|default="<span style='color:#ccc'>还没有设置邮箱</span>"}</td>
<td class='text-center'>{$vo.login_num|default="<span style='color:#ccc'>从未登录</span>"}</td>
<td class='text-center'>{$vo.login_at|default="<span style='color:#ccc'>从未登录</span>"}</td>
<td class='text-center'>
{if $vo.status eq 0}
<span>已禁用</span>
{elseif $vo.status eq 1}
<span style="color:#090">使用中</span>
{/if}
</td>
<td class='text-center nowrap'>
{if auth("$classuri/edit")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/edit")}?id={$vo.id}' href="javascript:void(0)">编辑</a>
{/if}
{if auth("$classuri/auth")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/auth")}?id={$vo.id}' href="javascript:void(0)">授权</a>
{/if}
{if auth("$classuri/pass")}
<span class="text-explode">|</span>
<a data-modal='{:url("$classuri/pass")}?id={$vo.id}' href="javascript:void(0)">密码</a>
{/if}
{if $vo.status eq 1 and auth("$classuri/forbid")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='0' data-action='{:url("$classuri/forbid")}'
href="javascript:void(0)">禁用</a>
{elseif auth("$classuri/resume")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='status' data-value='1' data-action='{:url("$classuri/resume")}'
href="javascript:void(0)">启用</a>
{/if}
{if auth("$classuri/del")}
<span class="text-explode">|</span>
<a data-update="{$vo.id}" data-field='delete' data-action='{:url("$classuri/del")}'
href="javascript:void(0)">删除</a>
{/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
{if isset($page)}<p>{$page}</p>{/if}
{/if}
</form>
{/block}

2
extend/controller/BasicAdmin.php
View File

@ -16,8 +16,8 @@ namespace controller;
use service\DataService;
use think\Controller;
use think\db\Query;
use think\Db;
use think\db\Query;
/**
* 后台权限基础控制器

4
extend/hook/FilterView.php
View File

@ -41,7 +41,7 @@ class FilterView
$this->request = Request::instance();
list($appRoot, $uriSelf) = [$this->request->root(true), $this->request->url(true)];
$uriRoot = strpos($appRoot, EXT) ? ltrim(dirname($appRoot), DS) : $appRoot;
$uriStatic = "{$uriRoot}/static";
$uriStatic = ($this->request->isSsl() ? 'https' : 'http') . "://plugs.ctolog.com";
$replace = ['__APP__' => $appRoot, '__SELF__' => $uriSelf, '__PUBLIC__' => $uriRoot, '__STATIC__' => $uriStatic];
$params = str_replace(array_keys($replace), array_values($replace), $params);
!IS_CLI && $this->baidu($params);
@ -54,7 +54,7 @@ class FilterView
public function baidu(&$params)
{
if (($key = sysconf('tongji_baidu_key'))) {
$https = Request::instance()->isSsl() ? 'https' : 'http';
$https = $this->request->isSsl() ? 'https' : 'http';
$script = <<<SCRIPT
\n<!-- 百度统计 开始 -->
<script>

4
extend/service/NodeService.php
View File

@ -42,7 +42,7 @@ class NodeService
if (empty($authorizeids)) {
return session('user.nodes', []);
}
$nodes = Db::name('SystemAuthNode')->where('auth', 'in', $authorizeids)->column('node');
$nodes = Db::name('SystemAuthNode')->whereIn('auth', $authorizeids)->column('node');
return session('user.nodes', $nodes);
}
return false;
@ -56,7 +56,7 @@ class NodeService
{
$nodes = cache('need_access_node');
if (empty($nodes)) {
$nodes = Db::name('SystemNode')->where('is_auth', '1')->column('node');
$nodes = Db::name('SystemNode')->where(['is_auth' => '1'])->column('node');
cache('need_access_node', $nodes);
}
return $nodes;

4
extend/service/SoapService.php
View File

@ -63,6 +63,8 @@ class SoapService
return $this->getError();
case 'errcode':
return $this->getErrorCode();
case 'appid':
return $this->getAppid();
}
return '';
}
@ -79,8 +81,8 @@ class SoapService
return $this->soap->__call($name, $arguments);
} catch (\Exception $e) {
Log::error("Soap Error. Call {$name} Method --- " . $e->getMessage());
return false;
}
return false;
}
}

70
extend/service/WechatService.php
View File

@ -35,9 +35,9 @@ class WechatService
*/
public static function getNewsById($id, $where = [])
{
$data = Db::name('WechatNews')->where('id', $id)->where($where)->find();
$data = Db::name('WechatNews')->where(['id' => $id])->where($where)->find();
$article_ids = explode(',', $data['article_id']);
$articles = Db::name('WechatNewsArticle')->where('id', 'in', $article_ids)->select();
$articles = Db::name('WechatNewsArticle')->whereIn('id', $article_ids)->select();
$data['articles'] = [];
foreach ($article_ids as $article_id) {
foreach ($articles as $article) {
@ -59,18 +59,19 @@ class WechatService
public static function uploadImage($local_url)
{
# 检测文件上否已经上传过了
if (($img = Db::name('WechatNewsImage')->where('md5', md5($local_url))->find()) && isset($img['media_url'])) {
$md5 = md5($local_url);
if (($img = Db::name('WechatNewsImage')->where(['md5' => $md5])->find()) && !empty($img['media_url'])) {
return $img['media_url'];
}
# 下载临时文件到本地
$filename = 'wechat/image/' . join('/', str_split(md5($local_url), 16)) . '.' . strtolower(pathinfo($local_url, 4));
$result = FileService::local($filename, file_get_contents($local_url));
$content = file_get_contents($local_url);
$filename = 'wechat/image/' . join('/', str_split($md5, 16)) . '.' . strtolower(pathinfo($local_url, 4));
# 上传图片到微信服务器
if ($result && isset($result['file'])) {
$wechat = &load_wechat('media');
$info = $wechat->uploadImg(['media' => "@{$result['file']}"]);
if (($result = FileService::local($filename, $content)) && isset($result['file'])) {
$wechat = load_wechat('media');
$info = $wechat->uploadImg(['media' => base64_encode($content)]);
if (!empty($info)) {
$data = ['local_url' => $local_url, 'media_url' => $info['url'], 'md5' => md5($local_url)];
$data = ['local_url' => $local_url, 'media_url' => $info['url'], 'md5' => $md5];
Db::name('WechatNewsImage')->insert($data);
return $info['url'];
}
@ -90,19 +91,18 @@ class WechatService
public static function uploadForeverMedia($local_url = '', $type = 'image', $is_video = false, $video_info = [])
{
# 检测文件上否已经上传过了
$wechat = &load_wechat('media');
# 检查文件URL是否已经上传为永久素材
$map = ['md5' => md5($local_url), 'appid' => $wechat->appid];
if (($img = Db::name('WechatNewsMedia')->where($map)->find()) && isset($img['media_id'])) {
$wechat = load_wechat('media');
$map = ['md5' => md5($local_url), 'appid' => $wechat->getAppid()];
if (($img = Db::name('WechatNewsMedia')->where($map)->find()) && !empty($img['media_id'])) {
return $img['media_id'];
}
# 下载临时文件到本地
$content = file_get_contents($local_url);
$filename = 'wechat/image/' . join('/', str_split(md5($local_url), 16)) . '.' . strtolower(pathinfo($local_url, 4));
$upload = FileService::local($filename, file_get_contents($local_url));
if (!empty($upload) && isset($upload['file']) && file_exists($upload['file'])) {
if (($upload = FileService::local($filename, $content)) && isset($upload['file']) && file_exists($upload['file'])) {
# 上传图片到微信服务器
if (false !== ($result = $wechat->uploadForeverMedia(['media' => "@{$upload['file']}"], $type, $is_video, $video_info))) {
$data = ['md5' => $map['md5'], 'type' => $type, 'appid' => $wechat->appid, 'media_id' => $result['media_id'], 'local_url' => $local_url];
if (false !== ($result = $wechat->uploadForeverMedia(['media' => base64_encode($content)], $type, $is_video, $video_info))) {
$data = ['md5' => $map['md5'], 'type' => $type, 'appid' => $wechat->getAppid(), 'media_id' => $result['media_id'], 'local_url' => $local_url];
isset($result['url']) && $data['media_url'] = $result['url'];
Db::name('WechatNewsMedia')->insert($data);
return $data['media_id'];
@ -118,14 +118,10 @@ class WechatService
*/
public static function syncFansTags()
{
$wechat = &load_wechat("User");
$wechat = load_wechat("User");
if (($result = $wechat->getTags()) !== false) {
$tags = $result['tags'];
foreach ($tags as &$tag) {
$tag['appid'] = $wechat->appid;
}
Db::name('WechatFansTags')->where('appid', $wechat->appid)->delete();
foreach (array_chunk($tags, 100) as $list) {
Db::name('WechatFansTags')->where('appid', $wechat->getAppid())->delete();
foreach (array_chunk($result['tags'], 100) as $list) {
Db::name('WechatFansTags')->insertAll($list);
}
}
@ -139,13 +135,13 @@ class WechatService
*/
public static function syncFansTagsByOpenid($openid)
{
$wechat = &load_wechat('User');
$wechat = load_wechat('User');
$tagsid = $wechat->getUserTags($openid);
if ($tagsid === false || !is_array($tagsid)) {
return false;
}
$data = ['appid' => $wechat->appid, 'openid' => $openid, 'tagid_list' => join(',', $tagsid)];
return DataService::save('wechat_fans', $data, 'openid', ['appid' => $wechat->appid]);
$data = ['openid' => $openid, 'tagid_list' => join(',', $tagsid)];
return DataService::save('wechat_fans', $data, 'openid', ['appid' => $wechat->getAppid()]);
}
/**
@ -162,8 +158,10 @@ class WechatService
if (!empty($user['tagid_list']) && is_array($user['tagid_list'])) {
$user['tagid_list'] = join(',', $user['tagid_list']);
}
foreach (['country', 'province', 'city', 'nickname', 'remark'] as $k) {
isset($user[$k]) && $user[$k] = ToolsService::emojiEncode($user[$k]);
}
$user['appid'] = $appid;
$user['nickname'] = ToolsService::emojiEncode($user['nickname']);
return DataService::save('WechatFans', $user, 'openid');
}
@ -177,10 +175,11 @@ class WechatService
{
$map = ['openid' => $openid];
is_string($appid) && $map['appid'] = $appid;
if (($fans = Db::name('WechatFans')->where($map)->find()) && isset($fans['nickname'])) {
$fans['nickname'] = ToolsService::emojiDecode($fans['nickname']);
$user = Db::name('WechatFans')->where($map)->find();
foreach (['country', 'province', 'city', 'nickname', 'remark'] as $k) {
isset($user[$k]) && $user[$k] = ToolsService::emojiDecode($user[$k]);
}
return $fans;
return $user;
}
/**
@ -190,7 +189,8 @@ class WechatService
*/
public static function syncAllFans($next_openid = '')
{
$wechat = &load_wechat('User');
$wechat = load_wechat('User');
$appid = $wechat->getAppid();
if (false === ($result = $wechat->getUserList($next_openid)) || empty($result['data']['openid'])) {
Log::error("获取粉丝列表失败, {$wechat->errMsg} [{$wechat->errCode}]");
return false;
@ -201,7 +201,7 @@ class WechatService
return false;
}
foreach ($info as $user) {
if (false === self::setFansInfo($user, $wechat->appid)) {
if (false === self::setFansInfo($user, $appid)) {
Log::error('更新粉丝信息更新失败!');
return false;
}
@ -220,9 +220,9 @@ class WechatService
*/
public static function syncBlackFans($next_openid = '')
{
$wechat = &load_wechat('User');
$wechat = load_wechat('User');
$result = $wechat->getBacklist($next_openid);
if ($result === false || (empty($result['data']['openid']))) {
if ($result === false || empty($result['data']['openid'])) {
if (empty($result['total'])) {
return true;
}

22
static/admin/app.js
View File

@ -12,7 +12,7 @@
// +----------------------------------------------------------------------
// 当前资源URL目录
var baseUrl = (function () {
var _root = (function () {
var scripts = document.scripts, src = scripts[scripts.length - 1].src;
return src.substring(0, src.lastIndexOf("/") + 1);
})();
@ -20,8 +20,8 @@ var baseUrl = (function () {
// RequireJs 配置参数
require.config({
waitSeconds: 0,
baseUrl: baseUrl,
map: {'*': {css: baseUrl + '../plugs/require/require.css.js'}},
baseUrl: _root,
map: {'*': {css: _root + '../plugs/require/require.css.js'}},
paths: {
// 自定义插件（源码自创建或已修改源码）
'admin.plugs': ['plugs'],
@ -34,7 +34,7 @@ require.config({
'layui': ['../plugs/layui/layui'],
'jquery': ['../plugs/jquery/jquery.min'],
'base64': ['../plugs/jquery/base64.min'],
'angular':['../plugs/angular/angular.min'],
'angular': ['../plugs/angular/angular.min'],
'ckeditor': ['../plugs/ckeditor/ckeditor'],
'websocket': ['../plugs/socket/websocket'],
'bootstrap': ['../plugs/bootstrap/js/bootstrap.min'],
@ -46,17 +46,17 @@ require.config({
shim: {
'layui': {deps: ['jquery']},
'ckeditor': {deps: ['jquery']},
'websocket': {deps: [baseUrl + '../plugs/socket/swfobject.min.js']},
'websocket': {deps: [_root + '../plugs/socket/swfobject.min.js']},
'pcasunzips': {deps: ['jquery']},
'admin.plugs': {deps: ['jquery', 'layui']},
'admin.listen': {deps: ['jquery', 'jquery.cookies', 'admin.plugs']},
'bootstrap': {deps: ['jquery']},
'bootstrap.typeahead': {deps: ['bootstrap']},
'jquery.ztree': {deps: ['jquery', 'css!' + baseUrl + '../plugs/ztree/zTreeStyle/zTreeStyle.css']},
'jquery.ztree': {deps: ['jquery', 'css!' + _root + '../plugs/ztree/zTreeStyle/zTreeStyle.css']},
'jquery.cookies': {deps: ['jquery']},
'jquery.masonry': {deps: ['jquery']},
},
deps: ['css!' + baseUrl + '../plugs/awesome/css/font-awesome.min.css'],
deps: ['css!' + _root + '../plugs/awesome/css/font-awesome.min.css'],
// 开启debug模式，不缓存资源
// urlArgs: "ver=" + (new Date()).getTime()
});
@ -64,11 +64,11 @@ require.config({
// UI框架初始化
PageLayout.call(this);
function PageLayout(callback, custom, basic) {
window.WEB_SOCKET_SWF_LOCATION = baseUrl + "../plugs/socket/WebSocketMain.swf";
window.WEB_SOCKET_SWF_LOCATION = _root + "../plugs/socket/WebSocketMain.swf";
require(basic || ['pace', 'jquery', 'layui', 'bootstrap'], function () {
layui.config({dir: baseUrl + '../plugs/layui/'});
layui.use(['layer', 'form'], function () {
window.layer = layui.layer, window.form = layui.form;
layui.config({dir: _root + '../plugs/layui/'});
layui.use(['layer', 'form', 'laydate'], function () {
window.layer = layui.layer, window.form = layui.form, window.laydate = layui.laydate;
require(custom || ['admin.listen', 'ckeditor'], callback || false);
});
});

100
static/admin/plugs.js
View File

@ -98,10 +98,9 @@ define(['jquery'], function () {
};
}
// 表单构造函数
$.form = new _form();
function _form() {
$.form = new form();
function form() {
this.errMsg = '{status}服务器繁忙，请稍候再试！';
// 内容区域动态加载后初始化
this.reInit = function ($container) {
@ -120,10 +119,6 @@ define(['jquery'], function () {
$.form.reInit($container);
}
};
// 关闭FORM框
this.close = function () {
return $(this._modal).modal('hide');
};
// 刷新当前页面
this.reload = function () {
window.onhashchange.call(this);
@ -203,8 +198,39 @@ define(['jquery'], function () {
};
}
// 注册对象到JqFn
$.fn.validate = function (callback, options) {
return (new validate()).check(this, callback, options);
};
// 注册对象到Jq
$.validate = function (form, callback, options) {
return (new validate()).check(form, callback, options);
};
// 自动监听规则内表单
$.validate.listen = function () {
$('form[data-auto]').map(function () {
if ($(this).attr('data-listen') !== 'true') {
var callbackname = $(this).attr('data-callback');
$(this).attr('data-listen', 'true').validate(function (data) {
var method = this.getAttribute('method') || 'POST';
var tips = this.getAttribute('data-tips') || undefined;
var url = this.getAttribute('action') || window.location.href;
var callback = window[callbackname || '_default_callback'] || undefined;
var time = this.getAttribute('data-time') || undefined;
$.form.load(url, data, method, callback, true, tips, time);
});
$(this).find('[data-form-loaded]').map(function () {
$(this).html(this.getAttribute('data-form-loaded') || this.innerHTML);
$(this).removeAttr('data-form-loaded').removeClass('layui-disabled');
});
}
});
};
// 表单验证
var validate = function () {
function validate() {
var self = this;
// 表单元素
this.tags = 'input,textarea,select';
@ -264,7 +290,7 @@ define(['jquery'], function () {
};
// 验证标志
this.remind = function (input) {
return this.isVisible(input) ? this.errorPlacement(input, this.getErrMsg(input)) : false;
return this.isVisible(input) ? this.showError(input, input.getAttribute('title') || '') : false;
};
// 检测表单单元
this.checkInput = function (input) {
@ -282,7 +308,7 @@ define(['jquery'], function () {
if (radiopass === false) {
allpass = this.remind(eleRadios.get(0), type, tag);
} else {
this.successPlacement(input);
this.hideError(input);
}
} else if (type === "checkbox" && isRequired && !$(input).is("[checked]")) {
allpass = this.remind(input, type, tag);
@ -292,28 +318,24 @@ define(['jquery'], function () {
allpass ? this.remind(input, type, "empty") : this.remind(input, type, tag);
allpass = false;
} else {
this.successPlacement(input);
this.hideError(input);
}
return allpass;
};
// 获取错误提示的内容
this.getErrMsg = function (ele) {
return ele.getAttribute('title') || '';
};
// 错误消息显示
this.errorPlacement = function (ele, content) {
$(ele).addClass('validate-error'), this.insertErrorEle(ele);
this.showError = function (ele, content) {
$(ele).addClass('validate-error'), this.insertError(ele);
$($(ele).data('input-info')).addClass('fadeInRight animated').css({width: 'auto'}).html(content);
};
// 错误消息消除
this.successPlacement = function (ele) {
$(ele).removeClass('validate-error'), this.insertErrorEle(ele);
this.hideError = function (ele) {
$(ele).removeClass('validate-error'), this.insertError(ele);
$($(ele).data('input-info')).removeClass('fadeInRight').css({width: '30px'}).html('');
};
// 错误消息标签插入
this.insertErrorEle = function (ele) {
this.insertError = function (ele) {
var $html = $('<span style="-webkit-animation-duration:.2s;animation-duration:.2s;padding-right:20px;color:#a94442;position:absolute;right:0;font-size:12px;z-index:2;display:block;width:34px;text-align:center;pointer-events:none"></span>');
$html.css({top: $(ele).position().top + 'px', paddingBottom: $(ele).css('paddingBottom'), lineHeight: $(ele).css('lineHeight')});
$html.css({top: $(ele).position().top + 'px', paddingBottom: $(ele).css('paddingBottom'), lineHeight: $(ele).css('height')});
$(ele).data('input-info') || $(ele).data('input-info', $html.insertAfter(ele));
};
// 表单验证入口
@ -338,41 +360,11 @@ define(['jquery'], function () {
});
return $(form).data('validate', this);
};
};
// 注册对象到JqFn
$.fn.validate = function (callback, options) {
return (new validate()).check(this, callback, options);
};
// 注册对象到Jq
$.validate = function (form, callback, options) {
return (new validate()).check(form, callback, options);
};
// 自动监听规则内表单
$.validate.listen = function () {
$('form[data-auto]').map(function () {
if ($(this).attr('data-listen') !== 'true') {
var callbackname = $(this).attr('data-callback');
$(this).attr('data-listen', 'true').validate(function (data) {
var method = this.getAttribute('method') || 'POST';
var tips = this.getAttribute('data-tips') || undefined;
var url = this.getAttribute('action') || window.location.href;
var callback = window[callbackname || '_default_callback'] || undefined;
$.form.load(url, data, method, callback, true, tips, this.getAttribute('data-time') || undefined);
});
$(this).find('[data-form-loaded]').map(function () {
$(this).html(this.getAttribute('data-form-loaded') || this.innerHTML);
$(this).removeAttr('data-form-loaded').removeClass('layui-disabled');
});
}
});
};
}
// 后台菜单辅助插件
$.menu = new _menu();
function _menu() {
$.menu = new menu();
function menu() {
// 计算URL地址中有效的URI
this.getUri = function (uri) {
uri = uri || window.location.href;

96
static/plugs/layui/css/modules/layim/html/chatlog.html Normal file
View File

@ -0,0 +1,96 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>聊天记录</title>
<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
<style>
body .layim-chat-main{height: auto;}
</style>
</head>
<body>
<div class="layim-chat-main">
<ul id="LAY_view"></ul>
</div>
<div id="LAY_page" style="margin: 0 10px;"></div>
<textarea title="消息模版" id="LAY_tpl" style="display:none;">
{{# layui.each(d.data, function(index, item){
if(item.id == parent.layui.layim.cache().mine.id){ }}
<li class="layim-chat-mine"><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite><i>{{ layui.data.date(item.timestamp) }}</i>{{ item.username }}</cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
{{# } else { }}
<li><div class="layim-chat-user"><img src="{{ item.avatar }}"><cite>{{ item.username }}<i>{{ layui.data.date(item.timestamp) }}</i></cite></div><div class="layim-chat-text">{{ layui.layim.content(item.content) }}</div></li>
{{# }
}); }}
</textarea>
<!--
上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html
-->
<script src="http://local.res.layui.com/layui/src/layui.js"></script>
<script>
layui.use(['layim', 'laypage'], function(){
var layim = layui.layim
,layer = layui.layer
,laytpl = layui.laytpl
,$ = layui.jquery
,laypage = layui.laypage;
//聊天记录的分页此处不做演示，你可以采用laypage，不了解的同学见文档：http://www.layui.com/doc/modules/laypage.html
//开始请求聊天记录
var param = location.search //获得URL参数。该窗口url会携带会话id和type，他们是你请求聊天记录的重要凭据
//实际使用时，下述的res一般是通过Ajax获得，而此处仅仅只是演示数据格式
,res = {
code: 0
,msg: ''
,data: [{
username: '纸飞机'
,id: 100000
,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
,timestamp: 1480897882000
,content: 'face[抱抱] face[心] 你好啊小美女'
}, {
username: 'Z_子晴'
,id: 108101
,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
,timestamp: 1480897892000
,content: '你没发错吧？face[微笑]'
},{
username: 'Z_子晴'
,id: 108101
,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
,timestamp: 1480897898000
,content: '你是谁呀亲。。我爱的是贤心！我爱的是贤心！我爱的是贤心！重要的事情要说三遍~'
},{
username: 'Z_子晴'
,id: 108101
,avatar: 'http://tva3.sinaimg.cn/crop.0.0.512.512.180/8693225ajw8f2rt20ptykj20e80e8weu.jpg'
,timestamp: 1480897908000
,content: '注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。\n该模版文件所在目录（相对于layui.js）：\n/css/modules/layim/html/chatlog.html'
}]
}
//console.log(param)
var html = laytpl(LAY_tpl.value).render({
data: res.data
});
$('#LAY_view').html(html);
});
</script>
</body>
</html>

38
static/plugs/layui/css/modules/layim/html/find.html Normal file
View File

@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>发现</title>
<link rel="stylesheet" href="http://local.res.layui.com/layui/src/css/layui.css">
<style>
</style>
</head>
<body>
<div style="margin: 15px;">
<blockquote class="layui-elem-quote">此为自定义的【查找】页面，因需求不一，所以官方暂不提供该模版结构与样式，实际使用时，可移至该文件到你的项目中，对页面自行把控。
<br>文件所在目录（相对于layui.js）：/css/modules/layim/html/find.html</blockquote>
</div>
<script src="http://local.res.layui.com/layui/src/layui.js"></script>
<script>
layui.use(['layim', 'laypage'], function(){
var layim = layui.layim
,layer = layui.layer
,laytpl = layui.laytpl
,$ = layui.jquery
,laypage = layui.laypage;
//一些添加好友请求之类的交互参见文档
});
</script>
</body>
</html>

87
static/plugs/layui/css/modules/layim/html/getmsg.json Normal file
View File

@ -0,0 +1,87 @@
{
"code": 0,
"pages": 1,
"data": [
{
"id": 76,
"content": "申请添加你为好友",
"uid": 168,
"from": 166488,
"from_group": 0,
"type": 1,
"remark": "有问题要问",
"href": null,
"read": 1,
"time": "刚刚",
"user": {
"id": 166488,
"avatar": "http://q.qlogo.cn/qqapp/101235792/B704597964F9BD0DB648292D1B09F7E8/100",
"username": "李彦宏",
"sign": null
}
},
{
"id": 75,
"content": "申请添加你为好友",
"uid": 168,
"from": 347592,
"from_group": 0,
"type": 1,
"remark": "你好啊！",
"href": null,
"read": 1,
"time": "刚刚",
"user": {
"id": 347592,
"avatar": "http://q.qlogo.cn/qqapp/101235792/B78751375E0531675B1272AD994BA875/100",
"username": "麻花疼",
"sign": null
}
},
{
"id": 62,
"content": "雷军 拒绝了你的好友申请",
"uid": 168,
"from": null,
"from_group": null,
"type": 1,
"remark": null,
"href": null,
"read": 1,
"time": "10天前",
"user": {
"id": null
}
},
{
"id": 60,
"content": "马小云 已经同意你的好友申请",
"uid": 168,
"from": null,
"from_group": null,
"type": 1,
"remark": null,
"href": null,
"read": 1,
"time": "10天前",
"user": {
"id": null
}
},
{
"id": 61,
"content": "贤心 已经同意你的好友申请",
"uid": 168,
"from": null,
"from_group": null,
"type": 1,
"remark": null,
"href": null,
"read": 1,
"time": "10天前",
"user": {
"id": null
}
}
]
}

208
static/plugs/layui/css/modules/layim/html/msgbox.html Normal file
View File

@ -0,0 +1,208 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>消息盒子</title>
<link rel="stylesheet" href="../../../layui.css">
<style>
.layim-msgbox{margin: 15px;}
.layim-msgbox li{position: relative; margin-bottom: 10px; padding: 0 130px 10px 60px; padding-bottom: 10px; line-height: 22px; border-bottom: 1px dotted #e2e2e2;}
.layim-msgbox .layim-msgbox-tips{margin: 0; padding: 10px 0; border: none; text-align: center; color: #999;}
.layim-msgbox .layim-msgbox-system{padding: 0 10px 10px 10px;}
.layim-msgbox li p span{padding-left: 5px; color: #999;}
.layim-msgbox li p em{font-style: normal; color: #FF5722;}
.layim-msgbox-avatar{position: absolute; left: 0; top: 0; width: 50px; height: 50px;}
.layim-msgbox-user{padding-top: 5px;}
.layim-msgbox-content{margin-top: 3px;}
.layim-msgbox .layui-btn-small{padding: 0 15px; margin-left: 5px;}
.layim-msgbox-btn{position: absolute; right: 0; top: 12px; color: #999;}
</style>
</head>
<body>
<ul class="layim-msgbox" id="LAY_view"></ul>
<div style="margin: 0 15px;">
<blockquote class="layui-elem-quote">注意：这些都是模拟数据，实际使用时，需将其中的模拟接口改为你的项目真实接口。
<br>该模版文件所在目录（相对于layui.js）：/css/modules/layim/html/msgbox.html</blockquote>
</div>
<textarea title="消息模版" id="LAY_tpl" style="display:none;">
{{# layui.each(d.data, function(index, item){
if(item.from){ }}
<li data-uid="{{ item.from }}" data-fromGroup="{{ item.from_group }}">
<a href="/u/{{ item.from }}/" target="_blank">
<img src="{{ item.user.avatar }}" class="layui-circle layim-msgbox-avatar">
</a>
<p class="layim-msgbox-user">
<a href="/u/{{ item.from }}/" target="_blank">{{ item.user.username||'' }}</a>
<span>{{ item.time }}</span>
</p>
<p class="layim-msgbox-content">
{{ item.content }}
<span>{{ item.remark ? '附言: '+item.remark : '' }}</span>
</p>
<p class="layim-msgbox-btn">
<button class="layui-btn layui-btn-small" data-type="agree">同意</button>
<button class="layui-btn layui-btn-small layui-btn-primary" data-type="refuse">拒绝</button>
</p>
</li>
{{# } else { }}
<li class="layim-msgbox-system">
<p><em>系统：</em>{{ item.content }}<span>{{ item.time }}</span></p>
</li>
{{# }
}); }}
</textarea>
<!--
上述模版采用了 laytpl 语法，不了解的同学可以去看下文档：http://www.layui.com/doc/modules/laytpl.html
-->
<script src="../../../../layui.js"></script>
<script>
layui.use(['layim', 'flow'], function(){
var layim = layui.layim
,layer = layui.layer
,laytpl = layui.laytpl
,$ = layui.jquery
,flow = layui.flow;
var cache = {}; //用于临时记录请求到的数据
//请求消息
var renderMsg = function(page, callback){
//实际部署时，请将下述 getmsg.json 改为你的接口地址
$.get('getmsg.json', {
page: page || 1
}, function(res){
if(res.code != 0){
return layer.msg(res.msg);
}
//记录来源用户信息
layui.each(res.data, function(index, item){
cache[item.from] = item.user;
});
callback && callback(res.data, res.pages);
});
};
//消息信息流
flow.load({
elem: '#LAY_view' //流加载容器
,isAuto: false
,end: '<li class="layim-msgbox-tips">暂无更多新消息</li>'
,done: function(page, next){ //加载下一页
renderMsg(page, function(data, pages){
var html = laytpl(LAY_tpl.value).render({
data: data
,page: page
});
next(html, page < pages);
});
}
});
//打开页面即把消息标记为已读
/*
$.post('/message/read', {
type: 1
});
*/
//操作
var active = {
//同意
agree: function(othis){
var li = othis.parents('li')
,uid = li.data('uid')
,from_group = li.data('fromGroup')
,user = cache[uid];
//选择分组
parent.layui.layim.setFriendGroup({
type: 'friend'
,username: user.username
,avatar: user.avatar
,group: parent.layui.layim.cache().friend //获取好友分组数据
,submit: function(group, index){
//将好友追加到主面板
parent.layui.layim.addList({
type: 'friend'
,avatar: user.avatar //好友头像
,username: user.username //好友昵称
,groupid: group //所在的分组id
,id: uid //好友ID
,sign: user.sign //好友签名
});
parent.layer.close(index);
othis.parent().html('已同意');
//实际部署时，请开启下述注释，并改成你的接口地址
/*
$.post('/im/agreeFriend', {
uid: uid //对方用户ID
,from_group: from_group //对方设定的好友分组
,group: group //我设定的好友分组
}, function(res){
if(res.code != 0){
return layer.msg(res.msg);
}
//将好友追加到主面板
parent.layui.layim.addList({
type: 'friend'
,avatar: user.avatar //好友头像
,username: user.username //好友昵称
,groupid: group //所在的分组id
,id: uid //好友ID
,sign: user.sign //好友签名
});
parent.layer.close(index);
othis.parent().html('已同意');
});
*/
}
});
}
//拒绝
,refuse: function(othis){
var li = othis.parents('li')
,uid = li.data('uid');
layer.confirm('确定拒绝吗？', function(index){
$.post('/im/refuseFriend', {
uid: uid //对方用户ID
}, function(res){
if(res.code != 0){
return layer.msg(res.msg);
}
layer.close(index);
othis.parent().html('<em>已拒绝</em>');
});
});
}
};
$('body').on('click', '.layui-btn', function(){
var othis = $(this), type = othis.data('type');
active[type] ? active[type].call(this, othis) : '';
});
});
</script>
</body>
</html>

2
static/plugs/layui/css/modules/layim/layim.css Normal file
View File

File diff suppressed because one or more lines are too long

2
static/plugs/layui/css/modules/layim/mobile/layim.css Normal file
View File

File diff suppressed because one or more lines are too long

BIN
static/plugs/layui/css/modules/layim/skin/1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/plugs/layui/css/modules/layim/skin/2.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
static/plugs/layui/css/modules/layim/skin/3.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
static/plugs/layui/css/modules/layim/skin/4.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
static/plugs/layui/css/modules/layim/skin/5.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
static/plugs/layui/css/modules/layim/skin/logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
static/plugs/layui/css/modules/layim/voice/default.mp3 Normal file
View File

Binary file not shown.

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

File diff suppressed because one or more lines are too long

3
static/plugs/layui/lay/modules/layim.js Normal file
View File

File diff suppressed because one or more lines are too long

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/layui.all.js
View File

File diff suppressed because one or more lines are too long

48
static/theme/default/css/console.css
View File

@ -14,41 +14,31 @@
html{overflow:auto;overflow-y:scroll !important}
body{min-width:1024px;font-size:12px;line-height:24px;font-family:'微软雅黑','Microsoft YaHei','Helvetica Neue', 'Luxi Sans', 'DejaVu Sans', 'Hiragino Sans GB',serif}
a:hover{color:#039}a{color:#06C;cursor:pointer}
input::-ms-clear{display:none}
button{border-radius:0!important}
label{font-size:100%;font-weight:500}
a:hover{color:#039}a{color:#06C;cursor:pointer}input::-ms-clear{display:none}button{border-radius:0!important}label{font-size:100%;font-weight:500;margin-bottom:0}
.block{display:block}.pointer{cursor:pointer}.help-block{margin-bottom:0}
.inline-block{display:inline-block}.nowrap{white-space:nowrap !important}
.text-left{text-align:left!important}.text-right{text-align:right!important}.text-center{text-align:center!important}
.full-width{width:100% !important}.full-height{height:100% !important}
/* 设置选择文字及背景颜色 */
::selection{background-color:#ec494e;color:#FFF}
::-moz-selection{background-color:#ec494e;color:#FFF}
.layui-btn {border-radius:0!important}
.form-control.input-sm{line-height:1em}
select.form-control.input-sm{padding:0 0 0 10px}
.input-focus{background:none !important;padding:3px 5px !important}
.layui-box legend{width:auto!important;border-bottom:none!important}
::selection{background-color:#ec494e;color:#fff}::-moz-selection{background-color:#ec494e;color:#fff}
/* 表单样式 */
.form-control.input-sm{line-height:1em}select.form-control.input-sm{padding:0 0 0 10px}.input-focus{background:none !important;padding:3px 5px !important}
.notselect{-webkit-user-select: none;-moz-user-select: none;-ms-user-select: none;user-select: none;}
.transition{-webkit-transition:all .2s linear;-moz-transition:all .2s linear;-o-transition:all .2s linear;transition:all .2s linear}
.uploadimage{display:inline-block;width:80px;height:80px;background-image:url('../img/image.png');background-repeat: no-repeat;background-position:center center;background-size:cover;cursor:pointer}
[data-tips-image]{cursor:pointer !important;cursor:-webkit-zoom-in !important;cursor:-moz-zoom-in !important;cursor:zoom-in !important}
.block{display:block}
.pointer{cursor:pointer}
.help-block{margin-bottom:0}
.text-center{text-align:center}
.gray-bg{background-color:#f3f3f4}
.full-width{width:100% !important}
.full-height{height:100% !important}
.nowrap{white-space:nowrap !important}
.table td .text-explode:first-child{opacity:0;display:none}
.text-explode{color:#CCC !important;font-weight:normal !important;margin:0px 4px !important}
/** 列表搜索区 */
.layui-btn{border-radius:0!important}
.layui-box legend{width:auto!important;border-bottom:none!important}
.form-search.layui-form-pane .layui-input{height:32px}
.form-search.layui-form-pane .layui-form-label{height:32px;line-height:30px;padding:0 8px;border-radius:0}
.form-search.layui-form-pane .layui-btn{height:32px;line-height:30px;padding:0 10px;border-radius:0}
.form-search .row{margin-left:-5px;margin-right:-5px}
.form-search .col-xs-4{width:220px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-3{width:200px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-2{width:180px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-4{width:200px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-3{width:180px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-2{width:160px !important;padding-left:5px;padding-right:5px}
.form-search .col-xs-1{width:65px !important;padding-left:5px;padding-right:5px}
/** 表单Input错误提示 */
@ -56,9 +46,11 @@ select.form-control.input-sm{padding:0 0 0 10px}
.label-required:after{content:'*';color:red;position:absolute;margin-left:4px;font-weight:bold;line-height:1.8em}
/** 表格样式 */
table td .text-explode:first-child{opacity:0;display:none}
table td .text-explode{color:#ccc!important;font-weight:normal!important;margin:0px 4px!important}
.table{background:#FFF;font-size:12px;border-top:1px solid #e1e6eb;border:1px solid #e1e6eb}
.table-center{text-align:center}
.table-center td, .table-center th{text-align:center}
.table-center td, .table-center th{text-align:center!important}
.table-bordered{border:1px solid #EBEBEB}
.table-bordered > thead > tr > td{background-color:#F5F5F6;border-bottom-width:1px}
.table-bordered > thead > tr > th, .table-bordered > tbody > tr > th.table-bordered > thead > tr > td, .table-bordered > tbody > tr > td{border:1px solid #e7e7e7}
@ -67,7 +59,7 @@ select.form-control.input-sm{padding:0 0 0 10px}
/** 列表排序样式 */
.list-table-image{width:22px;cursor:pointer}
.list-table-sort-td{width:60px !important;text-align:center}
.list-table-sort-td{width:60px !important;text-align:center!important}
.list-table-sort-td input{width:50px;text-align:center;font-size:12px;line-height:14px;padding:2px;border:1px solid #e6e6e6}
.list-table-check-td{width:30px !important;text-align:center;padding:0}
.list-table-check-td input{margin:0;vertical-align:middle}

2
thinkphp/base.php
View File

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

2
thinkphp/helper.php
View File

@ -127,7 +127,7 @@ if (!function_exists('input')) {
if ($pos = strpos($key, '.')) {
// 指定参数来源
list($method, $key) = explode('.', $key, 2);
if (!in_array($method, ['get', 'post', 'put', 'patch', 'delete', 'param', 'request', 'session', 'cookie', 'server', 'env', 'path', 'file'])) {
if (!in_array($method, ['get', 'post', 'put', 'patch', 'delete', 'route', 'param', 'request', 'session', 'cookie', 'server', 'env', 'path', 'file'])) {
$key = $method . '.' . $key;
$method = 'param';
}

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

@ -65,4 +65,5 @@ return [
'bind attr has exists' => '模型的属性已经存在',
'relation data not exists' => '关联数据不存在',
'relation not support' => '关联不支持',
'chunk not support order' => 'Chunk不支持调用order方法',
];

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

@ -11,6 +11,7 @@
namespace think;
use think\exception\ClassNotFoundException;
use think\exception\HttpException;
use think\exception\HttpResponseException;
use think\exception\RouteNotFoundException;
@ -383,10 +384,12 @@ class App
// 监听module_init
Hook::listen('module_init', $request);
$instance = Loader::controller($controller, $config['url_controller_layer'], $config['controller_suffix'], $config['empty_controller']);
if (is_null($instance)) {
throw new HttpException(404, 'controller not exists:' . Loader::parseName($controller, 1));
try {
$instance = Loader::controller($controller, $config['url_controller_layer'], $config['controller_suffix'], $config['empty_controller']);
} catch (ClassNotFoundException $e) {
throw new HttpException(404, 'controller not exists:' . $e->getClass());
}
// 获取当前操作名
$action = $actionName . $config['action_suffix'];

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

@ -189,8 +189,11 @@ class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSeria
public function each(callable $callback)
{
foreach ($this->items as $key => $item) {
if ($callback($item, $key) === false) {
$result = $callback($item, $key);
if (false === $result) {
break;
} elseif (!is_object($item)) {
$this->items[$key] = $result;
}
}

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

@ -113,6 +113,15 @@ class Config
// 二维数组设置和获取支持
$name = explode('.', $name, 2);
$name[0] = strtolower($name[0]);
if (!isset(self::$config[$range][$name[0]])) {
// 动态载入额外配置
$module = Request::instance()->module();
$file = CONF_PATH . ($module ? $module . DS : '') . 'extra' . DS . $name[0] . CONF_EXT;
is_file($file) && self::load($file, $name[0]);
}
return isset(self::$config[$range][$name[0]][$name[1]]) ? self::$config[$range][$name[0]][$name[1]] : null;
}
}
@ -143,8 +152,7 @@ class Config
// 批量设置
if (!empty($value)) {
self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
array_merge(self::$config[$range][$value], $name) :
self::$config[$range][$value] = $name;
array_merge(self::$config[$range][$value], $name) : $name;
return self::$config[$range][$value];
} else {
return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));

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

@ -11,13 +11,14 @@
namespace think;
\think\Loader::import('controller/Jump', TRAIT_PATH, EXT);
use think\exception\ValidateException;
use traits\controller\Jump;
Loader::import('controller/Jump', TRAIT_PATH, EXT);
class Controller
{
use \traits\controller\Jump;
use Jump;
/**
* @var \think\View 视图类实例

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

@ -82,13 +82,16 @@ class Db
Log::record('[ DB ] INIT ' . $options['type'], 'info');
}
if (true === $name) {
return new $class($options);
} else {
self::$instance[$name] = new $class($options);
$name = md5(serialize($config));
}
self::$instance[$name] = new $class($options);
}
return self::$instance[$name];
}
public static function clear() {
self::$instance = null;
}
/**
* 数据库连接参数解析

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

@ -110,6 +110,9 @@ class Error
$handle = new $class;
} else {
$handle = new Handle;
if ($class instanceof \Closure) {
$handle->setRender($class);
}
}
}
return $handle;

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

@ -95,7 +95,8 @@ class File extends SplFileObject
/**
* 获取文件的哈希散列值
* @return $string
* @param string $type
* @return mixed $string
*/
public function hash($type = 'sha1')
{
@ -229,7 +230,7 @@ class File extends SplFileObject
{
$extension = strtolower(pathinfo($this->getInfo('name'), PATHINFO_EXTENSION));
/* 对图像文件进行严格检测 */
if (in_array($extension, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'swf']) && !in_array($this->getImageType($this->filename), [1, 2, 3, 4, 6])) {
if (in_array($extension, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'swf']) && !in_array($this->getImageType($this->filename), [1, 2, 3, 4, 6, 13])) {
return false;
}
return true;

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

@ -64,7 +64,7 @@ class Lang
/**
* 加载语言定义(不区分大小写)
* @param string $file 语言文件
* @param array|string $file 语言文件
* @param string $range 语言作用域
* @return mixed
*/
@ -160,6 +160,9 @@ class Lang
if (isset($_GET[self::$langDetectVar])) {
// url中设置了语言变量
$langSet = strtolower($_GET[self::$langDetectVar]);
} elseif (isset($_COOKIE[self::$langCookieVar])) {
// Cookie中设置了语言变量
$langSet = strtolower($_COOKIE[self::$langCookieVar]);
} elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
// 自动侦测浏览器语言
preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);

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

@ -360,7 +360,7 @@ class Loader
* @param string $layer 业务层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object
* @return object
* @throws ClassNotFoundException
*/
public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
@ -400,7 +400,7 @@ class Loader
* @param string $layer 控制层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $empty 空控制器名称
* @return Object|false
* @return object
* @throws ClassNotFoundException
*/
public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
@ -420,6 +420,8 @@ class Loader
return App::invokeClass($class);
} elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
return new $emptyClass(Request::instance());
} else {
throw new ClassNotFoundException('class not exists:' . $class, $class);
}
}
@ -429,7 +431,7 @@ class Loader
* @param string $layer 验证层名称
* @param bool $appendSuffix 是否添加类名后缀
* @param string $common 公共模块名
* @return Object|false
* @return object|false
* @throws ClassNotFoundException
*/
public static function validate($name = '', $layer = 'validate', $appendSuffix = false, $common = 'common')

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

@ -11,6 +11,7 @@
namespace think;
use BadMethodCallException;
use InvalidArgumentException;
use think\db\Query;
use think\exception\ValidateException;
@ -567,6 +568,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public
* @param Relation $modelRelation 模型关联对象
* @return mixed
* @throws BadMethodCallException
*/
protected function getRelationData(Relation $modelRelation)
{
@ -574,7 +576,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = $this->parent;
} else {
// 首先获取关联数据
$value = $modelRelation->getRelation();
if (method_exists($modelRelation, 'getRelation')) {
$value = $modelRelation->getRelation();
} else {
throw new BadMethodCallException('method not exists:' . get_class($modelRelation) . '-> getRelation');
}
}
return $value;
}
@ -927,6 +933,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public function save($data = [], $where = [], $sequence = null)
{
if (is_string($data)) {
$sequence = $data;
$data = [];
}
if (!empty($data)) {
// 数据自动验证
if (!$this->validateData($data)) {
@ -937,7 +948,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->setAttr($key, $value, $data);
}
if (!empty($where)) {
$this->isUpdate = true;
$this->isUpdate = true;
$this->updateWhere = $where;
}
}
@ -1099,9 +1111,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$field = $this->field;
} elseif (!empty($this->field)) {
$field = array_merge($this->field, $auto);
if ($this->autoWriteTimestamp) {
array_push($field, $this->createTime, $this->updateTime);
}
} else {
$field = [];
}
return $field;
@ -1130,7 +1144,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function getChangedData()
{
$data = array_udiff_assoc($this->data, $this->origin, function ($a, $b) {
if ((empty($b) || empty($b)) && $a !== $b) {
if ((empty($a) || empty($b)) && $a !== $b) {
return 1;
}
return is_object($a) || $a != $b ? 1 : 0;
@ -1159,16 +1173,8 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/
public function setInc($field, $step = 1, $lazyTime = 0)
{
// 删除条件
$pk = $this->getPk();
if (is_string($pk) && isset($this->data[$pk])) {
$where = [$pk => $this->data[$pk]];
} elseif (!empty($this->updateWhere)) {
$where = $this->updateWhere;
} else {
$where = null;
}
// 更新条件
$where = $this->getWhere();
$result = $this->getQuery()->where($where)->setInc($field, $step, $lazyTime);
if (true !== $result) {
@ -1188,6 +1194,23 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @throws Exception
*/
public function setDec($field, $step = 1, $lazyTime = 0)
{
// 更新条件
$where = $this->getWhere();
$result = $this->getQuery()->where($where)->setDec($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] -= $step;
}
return $result;
}
/**
* 获取更新条件
* @access protected
* @return mixed
*/
protected function getWhere()
{
// 删除条件
$pk = $this->getPk();
@ -1199,13 +1222,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} else {
$where = null;
}
$result = $this->getQuery()->where($where)->setDec($field, $step, $lazyTime);
if (true !== $result) {
$this->data[$field] -= $step;
}
return $result;
return $where;
}
/**
@ -1333,14 +1350,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
}
// 删除条件
$pk = $this->getPk();
if (is_string($pk) && isset($this->data[$pk])) {
$where = [$pk => $this->data[$pk]];
} elseif (!empty($this->updateWhere)) {
$where = $this->updateWhere;
} else {
$where = null;
}
$where = $this->getWhere();
// 删除当前模型数据
$result = $this->getQuery()->where($where)->delete();
@ -1665,7 +1675,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* 设置是否使用全局查询范围
* @param bool $use 是否启用全局查询范围
* @access public
* @return Model
* @return Query
*/
public static function useGlobalScope($use)
{
@ -1857,7 +1867,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public
* @param string $model 模型名
* @param string $foreignKey 关联外键
* @param string $localKey 关联主键
* @param string $localKey 当前模型主键
* @param array $alias 别名定义（已经废弃）
* @param string $joinType JOIN类型
* @return HasOne
@ -1897,7 +1907,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public
* @param string $model 模型名
* @param string $foreignKey 关联外键
* @param string $localKey 关联主键
* @param string $localKey 当前模型主键
* @return HasMany
*/
public function hasMany($model, $foreignKey = '', $localKey = '')
@ -1916,7 +1926,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param string $through 中间模型名
* @param string $foreignKey 关联外键
* @param string $throughKey 关联外键
* @param string $localKey 关联主键
* @param string $localKey 当前模型主键
* @return HasManyThrough
*/
public function hasManyThrough($model, $through, $foreignKey = '', $throughKey = '', $localKey = '')

44
thinkphp/library/think/Paginator.php
View File

@ -49,6 +49,9 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
'fragment' => '',
];
/** @var mixed simple模式下的下个元素 */
protected $nextItem;
public function __construct($items, $listRows, $currentPage = null, $total = null, $simple = false, $options = [])
{
$this->options = array_merge($this->options, $options);
@ -65,7 +68,10 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
if ($simple) {
$this->currentPage = $this->setCurrentPage($currentPage);
$this->hasMore = count($items) > ($this->listRows);
$items = $items->slice(0, $this->listRows);
if ($this->hasMore) {
$this->nextItem = $items->slice($this->listRows, 1);
}
$items = $items->slice(0, $this->listRows);
} else {
$this->total = $total;
$this->lastPage = (int) ceil($total / $listRows);
@ -135,9 +141,9 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
*/
public static function getCurrentPage($varPage = 'page', $default = 1)
{
$page = Request::instance()->request($varPage);
$page = (int) Request::instance()->request($varPage);
if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) {
if (filter_var($page, FILTER_VALIDATE_INT) !== false && $page >= 1) {
return $page;
}
@ -282,8 +288,11 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
public function each(callable $callback)
{
foreach ($this->items as $key => $item) {
if ($callback($item, $key) === false) {
$result = $callback($item, $key);
if (false === $result) {
break;
} elseif (!is_object($item)) {
$this->items[$key] = $result;
}
}
@ -356,19 +365,24 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
public function toArray()
{
try {
$total = $this->total();
} catch (\DomainException $e) {
$total = null;
if ($this->simple) {
return [
'per_page' => $this->listRows,
'current_page' => $this->currentPage,
'has_more' => $this->hasMore,
'next_item' => $this->nextItem,
'data' => $this->items->toArray(),
];
} else {
return [
'total' => $this->total,
'per_page' => $this->listRows,
'current_page' => $this->currentPage,
'last_page' => $this->lastPage,
'data' => $this->items->toArray(),
];
}
return [
'total' => $total,
'per_page' => $this->listRows(),
'current_page' => $this->currentPage(),
'last_page' => $this->lastPage,
'data' => $this->items->toArray(),
];
}
/**

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

@ -59,6 +59,11 @@ class Request
*/
protected $routeInfo = [];
/**
* @var array 环境变量
*/
protected $env;
/**
* @var array 当前调度信息
*/
@ -1088,7 +1093,7 @@ class Request
public function filterExp(&$value)
{
// 过滤查询特殊字符
if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
if (is_string($value) && preg_match('/^(EXP|NEQ|GT|EGT|LT|ELT|OR|XOR|LIKE|NOTLIKE|NOT LIKE|NOT BETWEEN|NOTBETWEEN|BETWEEN|NOTIN|NOT IN|IN)$/i', $value)) {
$value .= ' ';
}
// TODO 其他安全过滤
@ -1529,10 +1534,16 @@ class Request
* @param string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
* @param mixed $expire 缓存有效期
* @param array $except 缓存排除
* @param string $tag 缓存标签
* @return void
*/
public function cache($key, $expire = null, $except = [])
public function cache($key, $expire = null, $except = [], $tag = null)
{
if (!is_array($except)) {
$tag = $except;
$except = [];
}
if (false !== $key && $this->isGet() && !$this->isCheckCache) {
// 标记请求缓存检查
$this->isCheckCache = true;
@ -1586,7 +1597,7 @@ class Request
$response = Response::create($content)->header($header);
throw new \think\exception\HttpResponseException($response);
} else {
$this->cache = [$key, $expire];
$this->cache = [$key, $expire, $tag];
}
}
}
@ -1604,7 +1615,7 @@ class Request
/**
* 设置当前请求绑定的对象实例
* @access public
* @param string $name 绑定的对象标识
* @param string|array $name 绑定的对象标识
* @param mixed $obj 绑定的对象实例
* @return mixed
*/

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

@ -106,7 +106,7 @@ class Response
$this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate';
$this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
$this->header['Expires'] = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT';
Cache::set($cache[0], [$data, $this->header], $cache[1]);
Cache::tag($cache[2])->set($cache[0], [$data, $this->header], $cache[1]);
}
}

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

@ -255,9 +255,11 @@ class Route
$option1 = array_merge($option, $val[1]);
$pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
} else {
$route = $val;
$option1 = null;
$pattern1 = null;
$route = $val;
}
self::setRule($key, $route, $type, isset($option1) ? $option1 : $option, isset($pattern1) ? $pattern1 : $pattern, $group);
self::setRule($key, $route, $type, !is_null($option1) ? $option1 : $option, !is_null($pattern1) ? $pattern1 : $pattern, $group);
}
} else {
self::setRule($rule, $route, $type, $option, $pattern, $group);
@ -428,7 +430,8 @@ class Route
self::$rules['*'][$name]['pattern'] = $pattern;
}
} else {
$item = [];
$item = [];
$completeMatch = Config::get('route_complete_match');
foreach ($routes as $key => $val) {
if (is_numeric($key)) {
$key = array_shift($val);
@ -447,6 +450,8 @@ class Route
// 是否完整匹配
$options['complete_match'] = true;
$key = substr($key, 0, -1);
} elseif ($completeMatch) {
$options['complete_match'] = true;
}
$key = trim($key, '/');
$vars = self::parseVar($key);
@ -1507,12 +1512,13 @@ class Route
if ($request->isGet() && isset($option['cache'])) {
$cache = $option['cache'];
if (is_array($cache)) {
list($key, $expire) = $cache;
list($key, $expire, $tag) = array_pad($cache, 3, null);
} else {
$key = str_replace('|', '/', $pathinfo);
$expire = $cache;
$tag = null;
}
$request->cache($key, $expire);
$request->cache($key, $expire, $tag);
}
return $result;
}
@ -1543,7 +1549,7 @@ class Route
/**
* 解析URL地址中的参数Request对象
* @access private
* @param string $rule 路由规则
* @param string $url 路由规则
* @param array $var 变量
* @return void
*/

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

@ -25,6 +25,7 @@ class Session
*/
public static function prefix($prefix = '')
{
empty(self::$init) && self::boot();
if (empty($prefix) && null !== $prefix) {
return self::$prefix;
} else {
@ -56,7 +57,7 @@ class Session
$isDoStart = true;
}
if (isset($config['prefix']) && (self::$prefix === '' || self::$prefix === null)) {
if (isset($config['prefix']) && ('' === self::$prefix || null === self::$prefix)) {
self::$prefix = $config['prefix'];
}
if (isset($config['var_session_id']) && isset($_REQUEST[$config['var_session_id']])) {
@ -347,7 +348,7 @@ class Session
* @param bool $delete 是否删除关联会话文件
* @return void
*/
private static function regenerate($delete = false)
public static function regenerate($delete = false)
{
session_regenerate_id($delete);
}

18
thinkphp/library/think/Template.php
View File

@ -59,6 +59,7 @@ class Template
/**
* 构造函数
* @access public
* @param array $config
*/
public function __construct(array $config = [])
{
@ -763,31 +764,26 @@ class Template
} else {
if (isset($array[1])) {
$this->parseVar($array[2]);
$_name = ' && ' . $name . $array[1] . $array[2];
$express = $name . $array[1] . $array[2];
} else {
$_name = '';
$express = false;
}
// $name为数组
switch ($first) {
case '?':
// {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
$str = '<?php echo isset(' . $name . ')' . $_name . ' ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
$str = '<?php echo ' . ($express ?: 'isset(' . $name . ')') . '?' . $name . ':' . substr($str, 1) . '; ?>';
break;
case '=':
// {$varname?='xxx'} $varname为真时才输出xxx
$str = '<?php if(!empty(' . $name . ')' . $_name . ') echo ' . substr($str, 1) . '; ?>';
$str = '<?php if(' . ($express ?: '!empty(' . $name . ')') . ') echo ' . substr($str, 1) . '; ?>';
break;
case ':':
// {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
$str = '<?php echo !empty(' . $name . ')' . $_name . '?' . $name . $str . '; ?>';
$str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . '?' . $name . $str . '; ?>';
break;
default:
if (strpos($str, ':')) {
// {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b
$str = '<?php echo !empty(' . $name . ')' . $_name . '?' . $str . '; ?>';
} else {
$str = '<?php echo ' . $_name . '?' . $str . '; ?>';
}
$str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . '?' . $str . '; ?>';
}
}
} else {

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

@ -272,7 +272,7 @@ class Url
$domain .= '.' . $rootDomain;
}
}
if (false !== strpos($domain, ':')) {
if (false !== strpos($domain, '://')) {
$scheme = '';
} else {
$scheme = $request->isSsl() || Config::get('is_https') ? 'https://' : 'http://';

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

@ -38,6 +38,7 @@ class Validate
protected static $typeMsg = [
'require' => ':attribute不能为空',
'number' => ':attribute必须是数字',
'integer' => ':attribute必须是整数',
'float' => ':attribute必须是浮点数',
'boolean' => ':attribute必须是布尔值',
'email' => ':attribute格式不符',
@ -899,7 +900,7 @@ class Validate
{
list($field, $val) = explode(',', $rule);
if ($this->getDataValue($data, $field) == $val) {
return !empty($value);
return !empty($value) || '0' == $value;
} else {
return true;
}
@ -917,7 +918,7 @@ class Validate
{
$result = call_user_func_array($rule, [$value, $data]);
if ($result) {
return !empty($value);
return !empty($value) || '0' == $value;
} else {
return true;
}
@ -935,7 +936,7 @@ class Validate
{
$val = $this->getDataValue($data, $rule);
if (!empty($val)) {
return !empty($value);
return !empty($value) || '0' == $value;
} else {
return true;
}
@ -1225,6 +1226,8 @@ class Validate
$msg = $this->message[$attribute];
} elseif (isset(self::$typeMsg[$type])) {
$msg = self::$typeMsg[$type];
} elseif (0 === strpos($type, 'require')) {
$msg = self::$typeMsg['require'];
} else {
$msg = $title . '规则错误';
}

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

@ -127,7 +127,7 @@ class View
* @access private
* @param string|array $name 参数名
* @param mixed $value 参数值
* @return void
* @return $this
*/
public function config($name, $value = null)
{

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

@ -120,10 +120,23 @@ abstract class Driver
public function remember($name, $value, $expire = null)
{
if (!$this->has($name)) {
if ($value instanceof \Closure) {
$value = call_user_func($value);
while ($this->has($name . '_lock')) {
// 存在锁定则等待
}
try {
// 锁定
$this->set($name . '_lock', true);
if ($value instanceof \Closure) {
$value = call_user_func($value);
}
$this->set($name, $value, $expire);
// 解锁
$this->rm($name . '_lock');
} catch (\Exception $e) {
// 解锁
$this->rm($name . '_lock');
}
$this->set($name, $value, $expire);
} else {
$value = $this->get($name);
}
@ -140,7 +153,9 @@ abstract class Driver
*/
public function tag($name, $keys = null, $overlay = false)
{
if (is_null($keys)) {
if (is_null($name)) {
} elseif (is_null($keys)) {
$this->tag = $name;
} else {
$key = 'tag_' . md5($name);
@ -153,7 +168,7 @@ abstract class Driver
} else {
$value = array_unique(array_merge($this->getTagItem($name), $keys));
}
$this->set($key, implode(',', $value));
$this->set($key, implode(',', $value), 0);
}
return $this;
}
@ -176,7 +191,7 @@ abstract class Driver
} else {
$value = $name;
}
$this->set($key, $value);
$this->set($key, $value, 0);
}
}
@ -191,7 +206,7 @@ abstract class Driver
$key = 'tag_' . md5($tag);
$value = $this->get($key);
if ($value) {
return explode(',', $value);
return array_filter(explode(',', $value));
} else {
return [];
}

18
thinkphp/library/think/cache/driver/File.php vendored
View File

@ -110,11 +110,9 @@ class File extends Driver
if (false !== $content) {
$expire = (int) substr($content, 8, 12);
if (0 != $expire && $_SERVER['REQUEST_TIME'] > filemtime($filename) + $expire) {
//缓存过期删除缓存文件
$this->unlink($filename);
return $default;
}
$content = substr($content, 20, -3);
$content = substr($content, 32);
if ($this->options['data_compress'] && function_exists('gzcompress')) {
//启用数据压缩
$content = gzuncompress($content);
@ -129,9 +127,9 @@ class File extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param int $expire 有效时间 0为永久
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return boolean
*/
public function set($name, $value, $expire = null)
@ -139,6 +137,9 @@ class File extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
$filename = $this->getCacheKey($name);
if ($this->tag && !is_file($filename)) {
$first = true;
@ -148,7 +149,7 @@ class File extends Driver
//数据压缩
$data = gzcompress($data, 3);
}
$data = "<?php\n//" . sprintf('%012d', $expire) . $data . "\n?>";
$data = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
$result = file_put_contents($filename, $data);
if ($result) {
isset($first) && $this->setTagItem($filename);
@ -201,7 +202,8 @@ class File extends Driver
*/
public function rm($name)
{
return $this->unlink($this->getCacheKey($name));
$filename = $this->getCacheKey($name);
return $this->unlink($filename);
}
/**

18
thinkphp/library/think/cache/driver/Lite.php vendored
View File

@ -77,7 +77,7 @@ class Lite extends Driver
if (is_file($filename)) {
// 判断是否过期
$mtime = filemtime($filename);
if ($mtime < $_SERVER['REQUEST_TIME']) {
if ($mtime < time()) {
// 清除已经过期的文件
unlink($filename);
return $default;
@ -91,9 +91,9 @@ class Lite extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param int $expire 有效时间 0为永久
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return bool
*/
public function set($name, $value, $expire = null)
@ -101,9 +101,11 @@ class Lite extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
// 模拟永久
if (0 === $expire) {
$expire = 10 * 365 * 24 * 3600;
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp();
} else {
$expire = 0 === $expire ? 10 * 365 * 24 * 3600 : $expire;
$expire = time() + $expire;
}
$filename = $this->getCacheKey($name);
if ($this->tag && !is_file($filename)) {
@ -113,7 +115,7 @@ class Lite extends Driver
// 通过设置修改时间实现有效期
if ($ret) {
isset($first) && $this->setTagItem($filename);
touch($filename, $_SERVER['REQUEST_TIME'] + $expire);
touch($filename, $expire);
}
return $ret;
}

9
thinkphp/library/think/cache/driver/Memcache.php vendored
View File

@ -82,9 +82,9 @@ class Memcache extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return bool
*/
public function set($name, $value, $expire = null)
@ -92,6 +92,9 @@ class Memcache extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
if ($this->tag && !$this->has($name)) {
$first = true;
}

9
thinkphp/library/think/cache/driver/Memcached.php vendored
View File

@ -93,9 +93,9 @@ class Memcached extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return bool
*/
public function set($name, $value, $expire = null)
@ -103,6 +103,9 @@ class Memcached extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
if ($this->tag && !$this->has($name)) {
$first = true;
}

9
thinkphp/library/think/cache/driver/Redis.php vendored
View File

@ -91,9 +91,9 @@ class Redis extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return boolean
*/
public function set($name, $value, $expire = null)
@ -101,6 +101,9 @@ class Redis extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
if ($this->tag && !$this->has($name)) {
$first = true;
}

12
thinkphp/library/think/cache/driver/Sqlite.php vendored
View File

@ -96,9 +96,9 @@ class Sqlite extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return boolean
*/
public function set($name, $value, $expire = null)
@ -108,7 +108,11 @@ class Sqlite extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
$expire = (0 == $expire) ? 0 : ($_SERVER['REQUEST_TIME'] + $expire); //缓存有效期为0表示永久缓存
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp();
} else {
$expire = (0 == $expire) ? 0 : (time() + $expire); //缓存有效期为0表示永久缓存
}
if (function_exists('gzcompress')) {
//数据压缩
$value = gzcompress($value, 3);

9
thinkphp/library/think/cache/driver/Wincache.php vendored
View File

@ -68,9 +68,9 @@ class Wincache extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return boolean
*/
public function set($name, $value, $expire = null)
@ -78,6 +78,9 @@ class Wincache extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
$key = $this->getCacheKey($name);
if ($this->tag && !$this->has($name)) {
$first = true;

9
thinkphp/library/think/cache/driver/Xcache.php vendored
View File

@ -68,9 +68,9 @@ class Xcache extends Driver
/**
* 写入缓存
* @access public
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer $expire 有效时间（秒）
* @param string $name 缓存变量名
* @param mixed $value 存储数据
* @param integer|\DateTime $expire 有效时间（秒）
* @return boolean
*/
public function set($name, $value, $expire = null)
@ -78,6 +78,9 @@ class Xcache extends Driver
if (is_null($expire)) {
$expire = $this->options['expire'];
}
if ($expire instanceof \DateTime) {
$expire = $expire->getTimestamp() - time();
}
if ($this->tag && !$this->has($name)) {
$first = true;
}

10
thinkphp/library/think/console/output/Descriptor.php
View File

@ -69,7 +69,7 @@ class Descriptor
* 描述参数
* @param InputArgument $argument
* @param array $options
* @return string|mixed
* @return void
*/
protected function describeInputArgument(InputArgument $argument, array $options = [])
{
@ -93,7 +93,7 @@ class Descriptor
* 描述选项
* @param InputOption $option
* @param array $options
* @return string|mixed
* @return void
*/
protected function describeInputOption(InputOption $option, array $options = [])
{
@ -128,7 +128,7 @@ class Descriptor
* 描述输入
* @param InputDefinition $definition
* @param array $options
* @return string|mixed
* @return void
*/
protected function describeInputDefinition(InputDefinition $definition, array $options = [])
{
@ -173,7 +173,7 @@ class Descriptor
* 描述指令
* @param Command $command
* @param array $options
* @return string|mixed
* @return void
*/
protected function describeCommand(Command $command, array $options = [])
{
@ -208,7 +208,7 @@ class Descriptor
* 描述控制台
* @param Console $console
* @param array $options
* @return string|mixed
* @return void
*/
protected function describeConsole(Console $console, array $options = [])
{

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

@ -11,6 +11,7 @@
namespace think\db;
use BadMethodCallException;
use PDO;
use think\Exception;
@ -46,7 +47,7 @@ abstract class Builder
/**
* 获取当前的连接对象实例
* @access public
* @return void
* @return Connection
*/
public function getConnection()
{
@ -56,7 +57,7 @@ abstract class Builder
/**
* 获取当前的Query对象实例
* @access public
* @return void
* @return Query
*/
public function getQuery()
{
@ -80,6 +81,7 @@ abstract class Builder
* @param array $data 数据
* @param array $options 查询参数
* @return array
* @throws Exception
*/
protected function parseData($data, $options)
{
@ -116,8 +118,8 @@ abstract class Builder
$result[$item] = $val;
} else {
$key = str_replace('.', '_', $key);
$this->query->bind('__data__' . $key, $val, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR);
$result[$item] = ':__data__' . $key;
$this->query->bind('data__' . $key, $val, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR);
$result[$item] = ':data__' . $key;
}
}
}
@ -300,7 +302,7 @@ abstract class Builder
// 查询规则和条件
if (!is_array($val)) {
$val = ['=', $val];
$val = is_null($val) ? ['null', ''] : ['=', $val];
}
list($exp, $value) = $val;
@ -335,6 +337,11 @@ abstract class Builder
$bindName = md5($bindName);
}
if (is_object($value) && method_exists($value, '__toString')) {
// 对象数据写入
$value = $value->__toString();
}
$bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
if (is_scalar($value) && array_key_exists($field, $binds) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
if (strpos($value, ':') !== 0 || !$this->query->isBind(substr($value, 1))) {
@ -492,7 +499,7 @@ abstract class Builder
/**
* limit分析
* @access protected
* @param mixed $lmit
* @param mixed $limit
* @return string
*/
protected function parseLimit($limit)
@ -544,7 +551,11 @@ abstract class Builder
foreach ($order as $key => $val) {
if (is_numeric($key)) {
if ('[rand]' == $val) {
$array[] = $this->parseRand();
if (method_exists($this, 'parseRand')) {
$array[] = $this->parseRand();
} else {
throw new BadMethodCallException('method not exists:' . get_class($this) . '-> parseRand');
}
} elseif (false === strpos($val, '(')) {
$array[] = $this->parseKey($val, $options);
} else {
@ -568,7 +579,7 @@ abstract class Builder
*/
protected function parseGroup($group)
{
return !empty($group) ? ' GROUP BY ' . $group : '';
return !empty($group) ? ' GROUP BY ' . $this->parseKey($group) : '';
}
/**
@ -649,12 +660,16 @@ abstract class Builder
/**
* 设置锁机制
* @access protected
* @param bool $locl
* @param bool|string $lock
* @return string
*/
protected function parseLock($lock = false)
{
return $lock ? ' FOR UPDATE ' : '';
if (is_bool($lock)) {
return $lock ? ' FOR UPDATE ' : '';
} elseif (is_string($lock)) {
return ' ' . trim($lock) . ' ';
}
}
/**
@ -723,8 +738,9 @@ abstract class Builder
* @param array $options 表达式
* @param bool $replace 是否replace
* @return string
* @throws Exception
*/
public function insertAll($dataSet, $options, $replace = false)
public function insertAll($dataSet, $options = [], $replace = false)
{
// 获取合法的字段
if ('*' == $options['field']) {
@ -770,7 +786,7 @@ abstract class Builder
}
/**
* 生成slectinsert SQL
* 生成select insert SQL
* @access public
* @param array $fields 数据
* @param string $table 数据表
@ -791,7 +807,7 @@ abstract class Builder
/**
* 生成update SQL
* @access public
* @param array $fields 数据
* @param array $data 数据
* @param array $options 表达式
* @return string
*/

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

@ -338,8 +338,8 @@ abstract class Connection
* @param bool $master 是否在主服务器读操作
* @param bool $pdo 是否返回PDO对象
* @return mixed
* @throws BindParamException
* @throws PDOException
* @throws \Exception
*/
public function query($sql, $bind = [], $master = false, $pdo = false)
{
@ -400,8 +400,8 @@ abstract class Connection
* @param string $sql sql指令
* @param array $bind 参数绑定
* @return int
* @throws BindParamException
* @throws PDOException
* @throws \Exception
*/
public function execute($sql, $bind = [])
{
@ -552,7 +552,7 @@ abstract class Connection
* @access protected
* @param bool $pdo 是否返回PDOStatement
* @param bool $procedure 是否存储过程
* @return array
* @return PDOStatement|array
*/
protected function getResult($pdo = false, $procedure = false)
{
@ -618,7 +618,8 @@ abstract class Connection
/**
* 启动事务
* @access public
* @return void
* @return bool|mixed
* @throws \Exception
*/
public function startTrans()
{
@ -642,7 +643,7 @@ abstract class Connection
return $this->close()->startTrans();
}
throw $e;
} catch (\ErrorException $e) {
} catch (\Exception $e) {
if ($this->isBreak($e)) {
return $this->close()->startTrans();
}
@ -782,7 +783,7 @@ abstract class Connection
/**
* 是否断线
* @access protected
* @param \PDOException $e 异常对象
* @param \PDOException|\Exception $e 异常对象
* @return bool
*/
protected function isBreak($e)

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

@ -12,6 +12,7 @@
namespace think\db;
use PDO;
use think\App;
use think\Cache;
use think\Collection;
use think\Config;
@ -114,6 +115,7 @@ class Query
{
$this->connection = Db::connect($config);
$this->setBuilder();
$this->prefix = $this->connection->getConfig('prefix');
return $this;
}
@ -415,8 +417,9 @@ class Query
}
$result = $pdo->fetchColumn();
if ($force) {
$result = is_numeric($result) ? $result + 0 : $result;
$result += 0;
}
if (isset($cache)) {
// 缓存数据
$this->cacheData($key, $result, $cache);
@ -1184,10 +1187,8 @@ class Query
$this->options['multi'][$logic][$field][] = $where[$field];
} elseif (is_null($condition)) {
// 字段相等查询
$where[$field] = ['eq', $op];
if ('AND' != $logic) {
$this->options['multi'][$logic][$field][] = $where[$field];
}
$where[$field] = ['eq', $op];
$this->options['multi'][$logic][$field][] = $where[$field];
} else {
$where[$field] = [$op, $condition, isset($param[2]) ? $param[2] : null];
if ('exp' == strtolower($op) && isset($param[2]) && is_array($param[2])) {
@ -1444,18 +1445,19 @@ class Query
/**
* 查询缓存
* @access public
* @param mixed $key 缓存key
* @param integer $expire 缓存有效期
* @param string $tag 缓存标签
* @param mixed $key 缓存key
* @param integer|\DateTime $expire 缓存有效期
* @param string $tag 缓存标签
* @return $this
*/
public function cache($key = true, $expire = null, $tag = null)
{
// 增加快捷调用方式 cache(10) 等同于 cache(true, 10)
if (is_numeric($key) && is_null($expire)) {
if ($key instanceof \DateTime || (is_numeric($key) && is_null($expire))) {
$expire = $key;
$key = true;
}
if (false !== $key) {
$this->options['cache'] = ['key' => $key, 'expire' => $expire, 'tag' => $tag];
}
@ -1489,7 +1491,7 @@ class Query
/**
* 指定查询lock
* @access public
* @param boolean $lock 是否lock
* @param bool|string $lock 是否lock
* @return $this
*/
public function lock($lock = false)
@ -2080,7 +2082,7 @@ class Query
}
// 执行操作
$result = $this->execute($sql, $bind);
$result = 0 === $sql ? 0 : $this->execute($sql, $bind);
if ($result) {
$sequence = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null);
$lastInsId = $this->getLastInsID($sequence);
@ -2335,7 +2337,7 @@ class Query
$modelName = $this->model;
if (count($resultSet) > 0) {
foreach ($resultSet as $key => $result) {
/** @var Model $result */
/** @var Model $model */
$model = new $modelName($result);
$model->isUpdate(true);
@ -2391,6 +2393,7 @@ class Query
* @param mixed $value 缓存数据
* @param array $options 缓存参数
* @param array $bind 绑定参数
* @return string
*/
protected function getCacheKey($value, $options, $bind = [])
{
@ -2564,9 +2567,11 @@ class Query
* @param integer $count 每次处理的数据数量
* @param callable $callback 处理回调方法
* @param string $column 分批处理的字段名
* @param string $order 排序规则
* @return boolean
* @throws \LogicException
*/
public function chunk($count, $callback, $column = null)
public function chunk($count, $callback, $column = null, $order = 'asc')
{
$options = $this->getOptions();
if (isset($options['table'])) {
@ -2574,9 +2579,18 @@ class Query
} else {
$table = '';
}
$column = $column ?: $this->getPk($table);
$column = $column ?: $this->getPk($table);
if (is_array($column)) {
$column = $column[0];
}
if (isset($options['order'])) {
if (App::$debug) {
throw new \LogicException('chunk not support call order');
}
unset($options['order']);
}
$bind = $this->bind;
$resultSet = $this->limit($count)->order($column, 'asc')->select();
$resultSet = $this->options($options)->limit($count)->order($column, $order)->select();
if (strpos($column, '.')) {
list($alias, $key) = explode('.', $column);
} else {
@ -2595,8 +2609,8 @@ class Query
$resultSet = $this->options($options)
->limit($count)
->bind($bind)
->where($column, '>', $lastId)
->order($column, 'asc')
->where($column, 'asc' == strtolower($order) ? '>' : '<', $lastId)
->order($column, $order)
->select();
if ($resultSet instanceof Collection) {
$resultSet = $resultSet->all();

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

@ -18,6 +18,8 @@ use think\db\Builder;
*/
class Pgsql extends Builder
{
protected $insertSql = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
/**
* limit分析

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

@ -22,6 +22,7 @@ class Sqlite extends Builder
/**
* limit
* @access public
* @param string $limit
* @return string
*/
public function parseLimit($limit)

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

@ -22,6 +22,8 @@ class Sqlsrv extends Builder
protected $selectInsertSql = 'SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%';
protected $updateSql = 'UPDATE %TABLE% SET %SET% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
protected $deleteSql = 'DELETE FROM %TABLE% %USING% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
protected $insertSql = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
/**
* order分析
@ -40,6 +42,8 @@ class Sqlsrv extends Builder
$array[] = $this->parseKey($val, $options);
} elseif ('[rand]' == $val) {
$array[] = $this->parseRand();
} else {
$array[] = $val;
}
} else {
$sort = in_array(strtolower(trim($val)), ['asc', 'desc']) ? ' ' . $val : '';

14
thinkphp/library/think/exception/Handle.php
View File

@ -21,11 +21,16 @@ use think\Response;
class Handle
{
protected $render;
protected $ignoreReport = [
'\\think\\exception\\HttpException',
];
public function setRender($render)
{
$this->render = $render;
}
/**
* Report or log an exception.
*
@ -78,6 +83,13 @@ class Handle
*/
public function render(Exception $e)
{
if ($this->render && $this->render instanceof \Closure) {
$result = call_user_func_array($this->render, [$e]);
if ($result) {
return $result;
}
}
if ($e instanceof HttpException) {
return $this->renderHttpException($e);
} else {

2
thinkphp/library/think/exception/RouteNotFoundException.php
View File

@ -16,7 +16,7 @@ class RouteNotFoundException extends HttpException
public function __construct()
{
parent::__construct(404);
parent::__construct(404, 'Route Not Found');
}
}

2
thinkphp/library/think/model/Collection.php
View File

@ -85,7 +85,7 @@ class Collection extends BaseCollection
{
$this->each(function ($model) use ($append, $override) {
/** @var Model $model */
$model->append($append, $override);
$model && $model->append($append, $override);
});
return $this;
}

2
thinkphp/library/think/model/Pivot.php
View File

@ -28,7 +28,7 @@ class Pivot extends Model
* @param array|object $data 数据
* @param string $table 中间数据表名
*/
public function __construct(Model $parent, $data = [], $table = '')
public function __construct(Model $parent = null, $data = [], $table = '')
{
$this->parent = $parent;

7
thinkphp/library/think/model/relation/BelongsTo.php
View File

@ -11,6 +11,7 @@
namespace think\model\relation;
use think\db\Query;
use think\Loader;
use think\Model;
@ -68,7 +69,6 @@ class BelongsTo extends OneToOne
* @param string $operator 比较操作符
* @param integer $count 个数
* @param string $id 关联表的统计字段
* @param string $joinType JOIN类型
* @return Query
*/
public function has($operator = '>=', $count = 1, $id = '*')
@ -143,10 +143,11 @@ class BelongsTo extends OneToOne
$relationModel->isUpdate(true);
}
if ($relationModel && !empty($this->bindAttr)) {
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
// 设置关联属性
$result->setRelation($attr, $relationModel);
}
@ -175,7 +176,7 @@ class BelongsTo extends OneToOne
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
}
if ($relationModel && !empty($this->bindAttr)) {
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}

19
thinkphp/library/think/model/relation/HasMany.php
View File

@ -24,7 +24,7 @@ class HasMany extends Relation
* @param Model $parent 上级模型对象
* @param string $model 模型名
* @param string $foreignKey 关联外键
* @param string $localKey 关联主键
* @param string $localKey 当前模型主键
*/
public function __construct(Model $parent, $model, $foreignKey, $localKey)
{
@ -159,11 +159,11 @@ class HasMany extends Relation
if ($closure) {
call_user_func_array($closure, [ & $this->query]);
}
$localKey = $this->localKey ?: $this->parent->getPk();
return $this->query->where([
$this->foreignKey => [
'exp',
'=' . $this->parent->getTable() . '.' . $this->parent->getPk(),
'=' . $this->parent->getTable() . '.' . $localKey,
],
])->fetchSql()->count();
}
@ -238,10 +238,15 @@ class HasMany extends Relation
*/
public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
{
$table = $this->query->getTable();
return $this->parent->db()->alias('a')
->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $joinType)
->group('b.' . $this->foreignKey)
$table = $this->query->getTable();
$model = basename(str_replace('\\', '/', get_class($this->parent)));
$relation = basename(str_replace('\\', '/', $this->model));
return $this->parent->db()
->alias($model)
->field($model . '.*')
->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
->group($relation . '.' . $this->foreignKey)
->having('count(' . $id . ')' . $operator . $count);
}

27
thinkphp/library/think/model/relation/HasOne.php
View File

@ -23,7 +23,7 @@ class HasOne extends OneToOne
* @param Model $parent 上级模型对象
* @param string $model 模型名
* @param string $foreignKey 关联外键
* @param string $localKey 关联主键
* @param string $localKey 当前模型主键
* @param string $joinType JOIN类型
*/
public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER')
@ -67,11 +67,14 @@ class HasOne extends OneToOne
public function has()
{
$table = $this->query->getTable();
$model = basename(str_replace('\\', '/', get_class($this->parent)));
$relation = basename(str_replace('\\', '/', $this->model));
$localKey = $this->localKey;
$foreignKey = $this->foreignKey;
return $this->parent->db()->alias('a')
->whereExists(function ($query) use ($table, $localKey, $foreignKey) {
$query->table([$table => 'b'])->field('b.' . $foreignKey)->whereExp('a.' . $localKey, '=b.' . $foreignKey);
return $this->parent->db()
->alias($model)
->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
$query->table([$table => $relation])->field($relation . '.' . $foreignKey)->whereExp($model . '.' . $localKey, '=' . $relatoin . '.' . $foreignKey);
});
}
@ -140,10 +143,10 @@ class HasOne extends OneToOne
$relationModel = $data[$result->$localKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
}
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
// 设置关联属性
$result->setRelation($attr, $relationModel);
@ -173,10 +176,10 @@ class HasOne extends OneToOne
$relationModel = $data[$result->$localKey];
$relationModel->setParent(clone $result);
$relationModel->isUpdate(true);
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
}
if (!empty($this->bindAttr)) {
// 绑定关联属性
$this->bindAttr($relationModel, $result, $this->bindAttr);
}
$result->setRelation(Loader::parseName($relation), $relationModel);

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

@ -276,7 +276,7 @@ abstract class OneToOne extends Relation
if (isset($result->$key)) {
throw new Exception('bind attr has exists:' . $key);
} else {
$result->setAttr($key, $model->$attr);
$result->setAttr($key, $model ? $model->$attr : null);
}
}
}

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

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

7
thinkphp/library/think/response/Xml.php
View File

@ -11,6 +11,8 @@
namespace think\response;
use think\Collection;
use think\Model;
use think\Response;
class Xml extends Response
@ -81,6 +83,11 @@ class Xml extends Response
protected function dataToXml($data, $item, $id)
{
$xml = $attr = '';
if ($data instanceof Collection || $data instanceof Model) {
$data = $data->toArray();
}
foreach ($data as $key => $val) {
if (is_numeric($key)) {
$id && $attr = " {$id}=\"{$key}\"";

14
thinkphp/library/traits/controller/Jump.php
View File

@ -36,18 +36,13 @@ trait Jump
*/
protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
{
$code = 1;
if (is_numeric($msg)) {
$code = $msg;
$msg = '';
}
if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
$url = $_SERVER["HTTP_REFERER"];
} elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
}
$result = [
'code' => $code,
'code' => 1,
'msg' => $msg,
'data' => $data,
'url' => $url,
@ -75,18 +70,13 @@ trait Jump
*/
protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
{
$code = 0;
if (is_numeric($msg)) {
$code = $msg;
$msg = '';
}
if (is_null($url)) {
$url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);';
} elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
}
$result = [
'code' => $code,
'code' => 0,
'msg' => $msg,
'data' => $data,
'url' => $url,

18
thinkphp/library/traits/model/SoftDelete.php
View File

@ -63,10 +63,26 @@ trait SoftDelete
$this->data[$name] = $this->autoWriteTimestamp($name);
$result = $this->isUpdate()->save();
} else {
$result = $this->getQuery()->delete($this->data);
// 删除条件
$where = $this->getWhere();
// 删除当前模型数据
$result = $this->getQuery()->where($where)->delete();
}
// 关联删除
if (!empty($this->relationWrite)) {
foreach ($this->relationWrite as $key => $name) {
$name = is_numeric($key) ? $name : $key;
$model = $this->getAttr($name);
if ($model instanceof Model) {
$model->delete($force);
}
}
}
$this->trigger('after_delete', $this);
// 清空原始数据
$this->origin = [];
return $result;
}

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

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

12
vendor/composer/installed.json vendored
View File

@ -169,17 +169,17 @@
},
{
"name": "topthink/framework",
"version": "v5.0.10",
"version_normalized": "5.0.10.0",
"version": "v5.0.11",
"version_normalized": "5.0.11.0",
"source": {
"type": "git",
"url": "https://github.com/top-think/framework.git",
"reference": "e428c43ec5138c989cfdb38ac300a964ad77f9cb"
"reference": "45268eeba3da7eedaead09a524e2bc20a0132e29"
},
"dist": {
"type": "zip",
"url": "https://files.phpcomposer.com/files/top-think/framework/e428c43ec5138c989cfdb38ac300a964ad77f9cb.zip",
"reference": "e428c43ec5138c989cfdb38ac300a964ad77f9cb",
"url": "https://files.phpcomposer.com/files/top-think/framework/45268eeba3da7eedaead09a524e2bc20a0132e29.zip",
"reference": "45268eeba3da7eedaead09a524e2bc20a0132e29",
"shasum": ""
},
"require": {
@ -194,7 +194,7 @@
"phpunit/phpunit": "4.8.*",
"sebastian/phpcpd": "2.*"
},
"time": "2017-07-05T03:35:06+00:00",
"time": "2017-09-07T10:37:47+00:00",
"type": "think-framework",
"installation-source": "dist",
"autoload": {