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

[更新]同步framework代码

Browse Source
This commit is contained in:
Anyon 2019-06-06 15:07:21 +08:00
parent 8d221b531b
commit 0147f95194
93 changed files with 7738 additions and 1235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,8 @@ class Auth extends Controller
public function index() public function index()
{ {
$this->title = '系统权限管理'; $this->title = '系统权限管理';
$this->_query($this->table)->dateBetween('create_at')->like('title,desc')->equal('status')->order('sort asc,id desc')->page(); $query = $this->_query($this->table)->dateBetween('create_at');
$query->like('title,desc')->equal('status')->order('sort asc,id desc')->page();
} }
/** /**
@ -61,13 +62,15 @@ class Auth extends Controller
$checked = Db::name('SystemAuthNode')->where(['auth' => $auth])->column('node'); $checked = Db::name('SystemAuthNode')->where(['auth' => $auth])->column('node');
foreach ($nodes as &$node) $node['checked'] = in_array($node['node'], $checked); foreach ($nodes as &$node) $node['checked'] = in_array($node['node'], $checked);
$data = $this->_apply_filter(\library\tools\Data::arr2tree($nodes, 'node', 'pnode', '_sub_')); $data = $this->_apply_filter(\library\tools\Data::arr2tree($nodes, 'node', 'pnode', '_sub_'));
return $this->success('获取权限配置成功！', $data); return $this->success('获取权限节点成功！', $data);
case 'save': // 保存权限配置 case 'save': // 保存权限配置
list($post, $data) = [$this->request->post(), []]; list($post, $data) = [$this->request->post(), []];
foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) $data[] = ['auth' => $auth, 'node' => $node]; foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) {
$data[] = ['auth' => $auth, 'node' => $node];
}
Db::name('SystemAuthNode')->where(['auth' => $auth])->delete(); Db::name('SystemAuthNode')->where(['auth' => $auth])->delete();
Db::name('SystemAuthNode')->insertAll($data); Db::name('SystemAuthNode')->insertAll($data);
return $this->success('权限授权配置更新成功！'); return $this->success('权限授权更新成功！');
default: default:
return $this->_form($this->table, 'apply'); return $this->_form($this->table, 'apply');
} }

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

@ -159,7 +159,7 @@ class Index extends Controller
{ {
$this->applyCsrfToken(); $this->applyCsrfToken();
if (intval($id) === intval(session('user.id'))) { if (intval($id) === intval(session('user.id'))) {
$this->_form('SystemUser', 'user/form', 'id', [], ['id' => $id]); $this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]);
} else { } else {
$this->error('只能修改登录用户的资料！'); $this->error('只能修改登录用户的资料！');
} }

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

@ -15,6 +15,7 @@
namespace app\admin\controller; namespace app\admin\controller;
use library\Controller; use library\Controller;
use think\Db;
/** /**
* 系统日志管理 * 系统日志管理
@ -40,7 +41,8 @@ class Log extends Controller
public function index() public function index()
{ {
$this->title = '系统操作日志'; $this->title = '系统操作日志';
$this->_query($this->table)->like('action,node,content,username,geoip')->dateBetween('create_at')->order('id desc')->page(); $query = $this->_query($this->table)->like('action,node,content,username,geoip');
$query->dateBetween('create_at')->order('id desc')->page();
} }
/** /**
@ -58,6 +60,20 @@ class Log extends Controller
} }
} }
/**
* 清理系统日志
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
public function clear()
{
if (Db::name($this->table)->whereRaw('1=1')->delete() !== false) {
$this->success('日志清理成功！');
} else {
$this->error('日志清理失败，请稍候再试！');
}
}
/** /**
* 删除系统日志 * 删除系统日志
*/ */

5
application/admin/controller/Message.php
View File

@ -30,7 +30,7 @@ class Message extends Controller
*/ */
protected $table = 'SystemMessage'; protected $table = 'SystemMessage';
/*** /**
* 系统消息管理 * 系统消息管理
* @throws \think\Exception * @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
@ -41,7 +41,8 @@ class Message extends Controller
public function index() public function index()
{ {
$this->title = '系统消息管理'; $this->title = '系统消息管理';
$this->_query($this->table)->like('title,desc')->equal('read_state')->dateBetween('create_at,read_at')->order('id desc')->page(); $query = $this->_query($this->table)->like('title,desc')->equal('read_state');
$query->dateBetween('create_at,read_at')->order('id desc')->page();
} }
/** /**

6
application/admin/controller/Node.php
View File

@ -60,8 +60,9 @@ class Node extends Controller
$nodes = array_unique(array_column(\app\admin\service\Auth::get(), 'node')); $nodes = array_unique(array_column(\app\admin\service\Auth::get(), 'node'));
if (false !== Db::name($this->table)->whereNotIn('node', $nodes)->delete()) { if (false !== Db::name($this->table)->whereNotIn('node', $nodes)->delete()) {
$this->success('清理无效的节点配置成功！', ''); $this->success('清理无效的节点配置成功！', '');
} else {
$this->error('清理无效的节点配置，请稍候再试！');
} }
$this->error('清理无效的节点配置，请稍候再试！');
} }
/** /**
@ -79,8 +80,9 @@ class Node extends Controller
} }
empty($data) || data_save($this->table, $data, 'node'); empty($data) || data_save($this->table, $data, 'node');
$this->success('节点配置保存成功！', ''); $this->success('节点配置保存成功！', '');
} else {
$this->error('访问异常，请重新进入...');
} }
$this->error('访问异常，请重新进入...');
} }
} }

28
application/admin/controller/User.php
View File

@ -45,8 +45,8 @@ class User extends Controller
public function index() public function index()
{ {
$this->title = '系统用户管理'; $this->title = '系统用户管理';
$query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status'); $query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at');
$query->where(['is_deleted' => '0'])->order('id desc')->page(); $query->equal('status')->where(['is_deleted' => '0'])->order('id desc')->page();
} }
/** /**
@ -128,18 +128,6 @@ class User extends Controller
} }
} }
/**
* 删除系统用户
*/
public function del()
{
if (in_array('10000', explode(',', $this->request->post('id')))) {
$this->error('系统超级账号禁止删除！');
}
$this->applyCsrfToken();
$this->_delete($this->table);
}
/** /**
* 禁用系统用户 * 禁用系统用户
*/ */
@ -161,4 +149,16 @@ class User extends Controller
$this->_save($this->table, ['status' => '1']); $this->_save($this->table, ['status' => '1']);
} }
/**
* 删除系统用户
*/
public function del()
{
if (in_array('10000', explode(',', $this->request->post('id')))) {
$this->error('系统超级账号禁止删除！');
}
$this->applyCsrfToken();
$this->_delete($this->table);
}
} }

1
application/admin/controller/api/Message.php
View File

@ -24,6 +24,7 @@ class Message extends Controller
{ {
/** /**
* Message constructor. * Message constructor.
* @throws \think\Exception
*/ */
public function __construct() public function __construct()
{ {

1
application/admin/controller/api/Plugs.php
View File

@ -27,6 +27,7 @@ class Plugs extends Controller
/** /**
* Plugs constructor. * Plugs constructor.
* @throws \think\Exception
*/ */
public function __construct() public function __construct()
{ {

5
application/admin/sys.php
View File

@ -20,6 +20,9 @@ if (!function_exists('auth')) {
*/ */
function auth($node) function auth($node)
{ {
list($req, $num) = [request(), count(explode('/', $node))];
if ($num === 1) $node = "{$req->module()}/{$req->controller()}/{$node}";
if ($num === 2) $node = "{$req->module()}/{$node}";
return \app\admin\service\Auth::checkAuthNode($node); return \app\admin\service\Auth::checkAuthNode($node);
} }
} }
@ -39,7 +42,7 @@ if (!function_exists('sysdata')) {
$data = json_decode(\think\Db::name('SystemData')->where('name', $name)->value('value'), true); $data = json_decode(\think\Db::name('SystemData')->where('name', $name)->value('value'), true);
return empty($data) ? [] : $data; return empty($data) ? [] : $data;
} }
return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, 256)], 'name'); return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, JSON_UNESCAPED_UNICODE)], 'name');
} }
} }

54
application/admin/view/auth/apply.html
View File

@ -1,11 +1,13 @@
{extend name='main'} {extend name='main'}
{block name="content"} {block name="content"}
<ul id="zTree" class="ztree notselect"></ul> <div class="think-box-shadow">
<div class="hr-line-dashed"></div> <ul id="zTree" class="ztree notselect"></ul>
<div class="layui-form-item text-center"> <div class="hr-line-dashed"></div>
<button class="layui-btn" data-submit-role type='button'>保存数据</button> <div class="layui-form-item text-center">
<button class="layui-btn layui-btn-danger" type='button' onclick="window.history.back()">取消编辑</button> <button class="layui-btn" data-submit-role type='button'>保存数据</button>
<button class="layui-btn layui-btn-danger" type='button' onclick="window.history.back()">取消编辑</button>
</div>
</div> </div>
{/block} {/block}
@ -68,13 +70,39 @@
<link href="__ROOT__/static/plugs/ztree/zTreeStyle/zTreeStyle.css" rel="stylesheet"> <link href="__ROOT__/static/plugs/ztree/zTreeStyle/zTreeStyle.css" rel="stylesheet">
<script src="__ROOT__/static/plugs/ztree/ztree.all.min.js"></script> <script src="__ROOT__/static/plugs/ztree/ztree.all.min.js"></script>
<style> <style>
ul.ztree li{white-space:normal!important;} ul.ztree li {
ul.ztree li span.button.switch{margin-right:5px;} white-space: normal !important;
ul.ztree ul ul li{display:inline-block;white-space:normal;} }
ul.ztree>li{padding:15px 25px 15px 15px;}
ul.ztree>li>ul{margin-top:12px;border-top:1px solid rgba(0,0,0,.1);} ul.ztree li span.button.switch {
ul.ztree>li>ul>li{padding:5px;} margin-right: 5px;
ul.ztree>li>a>span{font-weight:700;font-size:15px;} }
ul.ztree .level2 .button.level2{background:0 0;}
ul.ztree ul ul li {
display: inline-block;
white-space: normal;
}
ul.ztree > li {
padding: 15px 25px 15px 15px;
}
ul.ztree > li > ul {
margin-top: 12px;
border-top: 1px solid rgba(0, 0, 0, .1);
}
ul.ztree > li > ul > li {
padding: 5px;
}
ul.ztree > li > a > span {
font-weight: 700;
font-size: 15px;
}
ul.ztree .level2 .button.level2 {
background: 0 0;
}
</style> </style>
{/block} {/block}

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

@ -12,57 +12,66 @@
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line"> <div class="think-box-shadow">
<caption class="margin-bottom-10 text-left">{include file='auth/index_search'}</caption>
<!--{notempty name='list'}-->
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>名称</th>
<th class='text-left nowrap'>描述</th>
<th class='text-center nowrap'>创建时间</th>
<th class="text-center">状态</th>
<th></th>
</tr>
</thead>
<!--{/notempty}-->
<tbody>
<!--{foreach $list as $key=>$vo}-->
<tr data-dbclick>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left'>{$vo.title}</td>
<td class='text-left'>{$vo.desc|default="<span class='color-desc'>没有写描述哦！</span>"}</td>
<td class="text-center nowrap">{$vo.create_at|format_datetime}</td>
<td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}</td>
<td class='text-center nowrap'>
{if auth("admin/auth/edit")} <table class="layui-table" lay-skin="line">
<span class="text-explode">|</span> <caption class="margin-bottom-10 text-left">{include file='auth/index_search'}</caption>
<a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑权限" data-modal='{:url("admin/auth/edit")}?id={$vo.id}'>编 辑</a> <!--{notempty name='list'}-->
{/if} <thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>权限信息</th>
<th class='text-left nowrap'>创建时间</th>
<th class="text-center">状态</th>
<th></th>
</tr>
</thead>
<!--{/notempty}-->
<tbody>
<!--{foreach $list as $key=>$vo}-->
<tr data-dbclick>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left'>
权限名称：{$vo.title|default='-'}<br>
权限描述：{$vo.desc|default="<span class='color-desc'>没有写描述哦！</span>"}
</td>
<td class="text-left nowrap">
日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
</td>
<td class='text-center nowrap'>
{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}
</td>
<td class='text-center nowrap'>
{if auth("admin/auth/apply")} {if auth("admin/auth/edit")}
<a class="layui-btn layui-btn-normal layui-btn-xs" data-open='{:url("admin/auth/apply")}?id={$vo.id}'>授 权</a> <span class="text-explode">|</span>
{/if} <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑权限" data-modal='{:url("admin/auth/edit")}?id={$vo.id}'>编 辑</a>
{/if}
{if $vo.status eq 1 and auth("admin/auth/forbid")} {if auth("admin/auth/apply")}
<a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('admin/auth/forbid')}">禁 用</a> <a class="layui-btn layui-btn-normal layui-btn-sm" data-open='{:url("admin/auth/apply")}?id={$vo.id}'>授 权</a>
{elseif auth("admin/auth/resume")} {/if}
<a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('admin/auth/resume')}">启 用</a>
{/if}
{if auth("admin/auth/del")} {if $vo.status eq 1 and auth("admin/auth/forbid")}
<a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/auth/del')}">删 除</a> <a class="layui-btn layui-btn-warm layui-btn-sm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('admin/auth/forbid')}">禁 用</a>
{/if} {elseif auth("admin/auth/resume")}
<a class="layui-btn layui-btn-warm layui-btn-sm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('admin/auth/resume')}">启 用</a>
{/if}
</td> {if auth("admin/auth/del")}
</tr> <a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/auth/del')}">删 除</a>
<!--{/foreach}--> {/if}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} </td>
</tr>
<!--{/foreach}-->
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block} {/block}

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

@ -2,23 +2,26 @@
{block name="content"} {block name="content"}
<form class="layui-card layui-form"> <div style="max-width:1000px">
<div class="layui-card-body"> <form class="layui-card layui-form">
<div class="layui-form-item"> <div class="layui-card-body padding-bottom-5 think-box-shadow">
<label class="layui-form-label">Storage<br><span class="nowrap color-desc">存储类型</span></label> <div class="layui-form-item">
<div class="layui-input-block"> <label class="layui-form-label">Storage<br><span class="nowrap color-desc">存储类型</span></label>
{foreach ['local'=>'本地服务器存储','oss'=>'阿里云OSS存储','qiniu'=>'七牛云存储'] as $k=>$v} <div class="layui-input-block">
<input type="radio" data-storagetype="{$k}" name="storage_type" value="{$k}" title="{$v}" lay-filter="storage_type"> {foreach ['local'=>'本地服务器存储','oss'=>'阿里云OSS存储','qiniu'=>'七牛云存储'] as $k=>$v}
{/foreach} <input type="radio" data-storagetype="{$k}" name="storage_type" value="{$k}" title="{$v}" lay-filter="storage_type">
<p class="help-block">请选择文件存储类型，其它云储存需要配置正确的参数才可以上传文件哦！</p> {/foreach}
<p class="help-block">请选择文件存储类型，其它云储存需要配置正确的参数才可以上传文件哦！</p>
</div>
</div> </div>
</div> </div>
</form>
<div class="padding-top-15 padding-bottom-10 think-box-shadow">
<div data-type="oss">{include file='config/file_oss'}</div>
<div data-type="local">{include file='config/file_local'}</div>
<div data-type="qiniu">{include file='config/file_qiniu'}</div>
</div> </div>
</form> </div>
<div data-type="oss">{include file='config/file_oss'}</div>
<div data-type="local">{include file='config/file_local'}</div>
<div data-type="qiniu">{include file='config/file_qiniu'}</div>
{/block} {/block}

12
application/admin/view/config/file_local.html
View File

@ -1,5 +1,5 @@
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card padding-0' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body padding-0"> <div class="layui-card-body">
<div class="color-blue padding-left-40 padding-bottom-20"> <div class="color-blue padding-left-40 padding-bottom-20">
文件将存储在本地服务器，需确保服务器的 public/upload 目录有写入权限，还需要有足够的存储空间。 文件将存储在本地服务器，需确保服务器的 public/upload 目录有写入权限，还需要有足够的存储空间。
</div> </div>
@ -12,12 +12,8 @@
</div> </div>
<div class="hr-line-dashed margin-left-40"></div> <div class="hr-line-dashed margin-left-40"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center">
<div class="layui-row"> <input type="hidden" name="storage_type" value="local">
<div class="layui-col-sm8 layui-col-md6"> <button class="layui-btn" type="submit">保存配置</button>
<input type="hidden" name="storage_type" value="local">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>

10
application/admin/view/config/file_oss.html
View File

@ -1,5 +1,5 @@
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body padding-0"> <div class="layui-card-body">
<div class="color-blue padding-left-40 padding-bottom-20"> <div class="color-blue padding-left-40 padding-bottom-20">
文件将上传到阿里云OSS空间，需要配置OSS公开访问及跨域策略（目前已实现自动创建空间及配置访问策略）。 文件将上传到阿里云OSS空间，需要配置OSS公开访问及跨域策略（目前已实现自动创建空间及配置访问策略）。
</div> </div>
@ -70,12 +70,8 @@
</div> </div>
<div class="hr-line-dashed margin-left-40"></div> <div class="hr-line-dashed margin-left-40"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center">
<div class="layui-row"> <input type="hidden" name="storage_type" value="oss">
<div class="layui-col-sm8 layui-col-md6"> <button class="layui-btn" type="submit">保存配置</button>
<input type="hidden" name="storage_type" value="oss">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>

10
application/admin/view/config/file_qiniu.html
View File

@ -1,5 +1,5 @@
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body padding-0"> <div class="layui-card-body">
<div class="color-blue padding-left-40 padding-bottom-20"> <div class="color-blue padding-left-40 padding-bottom-20">
文件将上传到七牛云空间（<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">点击这里免费申请10G存储</a>），申请成功后添加公开bucket并配置接口密钥。 文件将上传到七牛云空间（<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">点击这里免费申请10G存储</a>），申请成功后添加公开bucket并配置接口密钥。
</div> </div>
@ -71,12 +71,8 @@
</div> </div>
<div class="hr-line-dashed margin-left-40"></div> <div class="hr-line-dashed margin-left-40"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center">
<div class="layui-row"> <input type="hidden" name="storage_type" value="qiniu">
<div class="layui-col-sm8 layui-col-md6"> <button class="layui-btn" type="submit">保存配置</button>
<input type="hidden" name="storage_type" value="qiniu">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>

28
application/admin/view/config/info.html
View File

@ -2,9 +2,9 @@
{block name="content"} {block name="content"}
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off" style="max-width:1000px">
<div class="layui-card-body"> <div class="layui-card-body padding-bottom-10 think-box-shadow" style="padding-right:80px!important">
<div class="layui-form-item"> <div class="layui-form-item margin-top-20">
<label class="layui-form-label">Name<br><span class="nowrap color-desc">程序名称</span></label> <label class="layui-form-label">Name<br><span class="nowrap color-desc">程序名称</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input"> <input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
@ -25,13 +25,6 @@
<p class="help-block">网站名称，显示在浏览器标签上</p> <p class="help-block">网站名称，显示在浏览器标签上</p>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">Copyright<br><span class="nowrap color-desc">版权信息</span></label>
<div class="layui-input-block">
<input name="site_copy" required placeholder="请输入版权信息" value="{:sysconf('site_copy')}" class="layui-input">
<p class="help-block">程序的版权信息设置，在后台登录页面显示</p>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">Browser<br><span class="nowrap color-desc">浏览器图标</span></label> <label class="layui-form-label">Browser<br><span class="nowrap color-desc">浏览器图标</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -41,6 +34,13 @@
<p class="help-block">建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，<a href="http://www.favicon-icon-generator.com/" target="_blank">ICON在线制作</a></p> <p class="help-block">建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，<a href="http://www.favicon-icon-generator.com/" target="_blank">ICON在线制作</a></p>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">Copyright<br><span class="nowrap color-desc">版权信息</span></label>
<div class="layui-input-block">
<input name="site_copy" required placeholder="请输入版权信息" value="{:sysconf('site_copy')}" class="layui-input">
<p class="help-block">程序的版权信息设置，在后台登录页面显示</p>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">Miitbeian<br><span class="nowrap color-desc">网站备案</span></label> <label class="layui-form-label">Miitbeian<br><span class="nowrap color-desc">网站备案</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
@ -49,12 +49,8 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed margin-left-40"></div> <div class="hr-line-dashed margin-left-40"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center padding-bottom-10">
<div class="layui-row"> <button class="layui-btn" type="submit">保存配置</button>
<div class="layui-col-sm8 layui-col-md6">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>

3
application/admin/view/index/index.html
View File

@ -17,7 +17,6 @@
{block name="style"}{/block} {block name="style"}{/block}
<script>window.ROOT_URL = '__ROOT__';</script> <script>window.ROOT_URL = '__ROOT__';</script>
<script src="__ROOT__/static/plugs/jquery/pace.min.js"></script> <script src="__ROOT__/static/plugs/jquery/pace.min.js"></script>
</head> </head>
<body class="layui-layout-body"> <body class="layui-layout-body">
@ -103,7 +102,7 @@
<!-- 左则菜单 结束 --> <!-- 左则菜单 结束 -->
<!-- 主体内容 开始 --> <!-- 主体内容 开始 -->
<div class="layui-body">{block name='content'}{/block}</div> <div class="layui-body layui-bg-gray">{block name='content'}{/block}</div>
<!-- 主体内容 结束 --> <!-- 主体内容 结束 -->
</div> </div>

164
application/admin/view/index/main.html
View File

@ -1,72 +1,98 @@
{extend name='main'} {extend name='main'}
{block name='content'} {block name='content'}
<table class="layui-table" lay-even lay-skin="line"> <div class="layui-row layui-col-space10">
<colgroup> <div class="layui-col-md6">
<col width="20%"> <fieldset class="think-box-shadow">
<col width="30%"> <legend class="layui-bg-cyan">系统信息</legend>
<col width="20%"> <table class="layui-table" lay-skin="line" lay-even>
<col width="30%"> <colgroup>
</colgroup> <col width="30%">
<thead> </colgroup>
<tr> <tbody>
<th class="text-left" colspan="2">系统信息</th> <tr>
<th class="text-left" colspan="2">产品团队</th> <td>当前程序版本</td>
</tr> <td>{:sysconf('app_version')}</td>
</thead> </tr>
<tbody> <tr>
<tr> <td>运行PHP版本</td>
<td style="max-width:200px">应用组件版本</td> <td>{$Think.PHP_VERSION}</td>
<td>{:sysconf('app_version')}</td> </tr>
<td style="max-width:200px">产品名称</td> <tr>
<td>framework</td> <td>ThinkPHP版本</td>
</tr> <td>{$think_ver}</td>
<tr> </tr>
<td>ThinkPHP版本</td> <tr>
<td>{$think_ver}</td> <td>MySQL数据库版本</td>
<td>在线体验</td> <td>{$mysql_ver}</td>
<td><a target="_blank" href="http://framework.thinkadmin.top">http://framework.thinkadmin.top</a></td> </tr>
</tr> <tr>
<tr> <td>服务器操作系统</td>
<td>服务器操作系统</td> <td>{:php_uname('s')}</td>
<td>{:php_uname('s')}</td> </tr>
<td>官方QQ群</td> <tr>
<td> <td>WEB运行环境</td>
<a href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a"> <td>{:php_sapi_name()}</td>
<img src="//pub.idqqimg.com/wpa/images/group.png" style="height:18px;width:auto" target="_blank"> </tr>
</a> <tr>
</td> <td>上传大小限制</td>
</tr> <td>{:ini_get('upload_max_filesize')}</td>
<tr> </tr>
<td>WEB运行环境</td> <tr>
<td>{:php_sapi_name()}</td> <td>POST大小限制</td>
<td>项目地址</td> <td>{:ini_get('post_max_size')}</td>
<td><a target="_blank" href="https://github.com/zoujingli/framework">https://github.com/zoujingli/framework</a></td> </tr>
</tr> </tbody>
<tr> </table>
<td>MySQL数据库版本</td> </fieldset>
<td>{$mysql_ver}</td> </div>
<td>BUG反馈</td> <div class="layui-col-md6">
<td><a target="_blank" href="https://github.com/zoujingli/framework/issues">https://github.com/zoujingli/framework/issues</a></td> <fieldset class="think-box-shadow">
</tr> <legend class="layui-bg-cyan">产品团队</legend>
<tr> <table class="layui-table" lay-skin="line" lay-even>
<td>运行PHP版本</td> <colgroup>
<td>{$Think.PHP_VERSION}</td> <col width="30%">
<td>开发团队</td> </colgroup>
<td><a href="http://www.cuci.cc" target="_blank">广州楚才信息科技有限公司</a></td> <tbody>
</tr> <tr>
<tr> <td>产品名称</td>
<td>上传大小限制</td> <td>framework</td>
<td>{:ini_get('upload_max_filesize')}</td> </tr>
<td>团队官网</td> <tr>
<td><a target="_blank" href="http://www.cuci.cc">http://www.cuci.cc</a></td> <td>在线体验</td>
</tr> <td><a target="_blank" href="http://framework.thinkadmin.top">http://framework.thinkadmin.top</a></td>
<tr> </tr>
<td>POST大小限制</td> <tr>
<td>{:ini_get('post_max_size')}</td> <td>官方QQ群</td>
<td>办公地址</td> <td>
<td>广州市天河区东圃一横路东泷商贸中心G02</td> <a href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a">
</tr> <img src="//pub.idqqimg.com/wpa/images/group.png" style="height:18px;width:auto" target="_blank">
</tbody> </a>
</table> </td>
{/block} </tr>
<tr>
<td>项目地址</td>
<td><a target="_blank" href="https://github.com/zoujingli/framework">https://github.com/zoujingli/framework</a></td>
</tr>
<tr>
<td>BUG反馈</td>
<td><a target="_blank" href="https://github.com/zoujingli/framework/issues">https://github.com/zoujingli/framework/issues</a></td>
</tr>
<tr>
<td>开发团队</td>
<td><a href="http://www.cuci.cc" target="_blank">广州楚才信息科技有限公司</a></td>
</tr>
<tr>
<td>团队官网</td>
<td><a target="_blank" href="http://www.cuci.cc">http://www.cuci.cc</a></td>
</tr>
<tr>
<td>办公地址</td>
<td>广州市天河区东圃一横路东泷商贸中心G02</td>
</tr>
</tbody>
</table>
</fieldset>
</div>
</div>
{/block}

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

@ -2,6 +2,10 @@
{block name="button"} {block name="button"}
{if auth("admin/log/clear")}
<button data-load='{:url("clear")}' data-confirm="确定要消除所有日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>清理日志</button>
{/if}
{if auth("admin/log/del")} {if auth("admin/log/del")}
<button data-action='{:url("del")}' data-rule="id#{key}" data-csrf="{:systoken('admin/log/del')}" data-confirm="确定要删除日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除日志</button> <button data-action='{:url("del")}' data-rule="id#{key}" data-csrf="{:systoken('admin/log/del')}" data-confirm="确定要删除日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除日志</button>
{/if} {/if}
@ -9,53 +13,56 @@
{/block} {/block}
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line"> <div class="think-box-shadow">
<caption class="margin-bottom-10 text-left">{include file='log/index_search'}</caption> <table class="layui-table" lay-skin="line">
{notempty name='list'} <caption class="margin-bottom-10 text-left">{include file='log/index_search'}</caption>
<thead> {notempty name='list'}
<tr> <thead>
<th class='list-table-check-td think-checkbox'> <tr>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'> <th class='list-table-check-td think-checkbox'>
</th> <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
<th class='text-left nowrap' width="20%">操作</th> </th>
<th class='text-left nowrap' width="20%">权限</th> <th class='text-left nowrap' width="20%">操作</th>
<th class='text-left nowrap' width="20%">位置</th> <th class='text-left nowrap' width="20%">权限</th>
<th class='text-left nowrap' width="20%">操作时间</th> <th class='text-left nowrap' width="20%">位置</th>
<th></th> <th class='text-left nowrap' width="20%">操作时间</th>
</tr> <th></th>
</thead> </tr>
<tbody> </thead>
<!--{foreach $list as $key=>$vo}--> <tbody>
<tr data-dbclick> <!--{foreach $list as $key=>$vo}-->
<td class='list-table-check-td think-checkbox'> <tr data-dbclick>
<input class="list-check-box" value='{$vo.id}' type='checkbox'> <td class='list-table-check-td think-checkbox'>
</td> <input class="list-check-box" value='{$vo.id}' type='checkbox'>
<td class='text-left nowrap'> </td>
行为：<strong>{$vo.action|default='--'}</strong><br> <td class='text-left nowrap'>
描述：{$vo.content|default='--'} 行为：<strong>{$vo.action|default='--'}</strong><br>
</td> 描述：{$vo.content|default='--'}
<td class='text-left nowrap'> </td>
账号：{$vo.username|default='--'}<br> <td class='text-left nowrap'>
节点：{$vo.node|default='--'} 账号：{$vo.username|default='--'}<br>
</td> 节点：{$vo.node|default='--'}
<td class='text-left nowrap'> </td>
地址：{$vo.geoip|default='--'}<br> <td class='text-left nowrap'>
位置：{$vo.isp|default='--'} 地址：{$vo.geoip|default='--'}<br>
</td> 位置：{$vo.isp|default='--'}
<td class='text-left nowrap'> </td>
日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw} <td class='text-left nowrap'>
</td> 日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
<td class='text-left nowrap'> </td>
{if auth("admin/log/del")} <td class='text-left nowrap'>
<a data-dbclick class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该日志吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/log/del')}">删 除</a> {if auth("admin/log/del")}
{/if} <a data-dbclick class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该日志吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/log/del')}">删 除</a>
</td> {/if}
</tr> </td>
<!--{/foreach}--> </tr>
</tbody> <!--{/foreach}-->
{/notempty} </tbody>
</table> {/notempty}
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block} {/block}

6
application/admin/view/main.html
View File

@ -1,11 +1,11 @@
<div class="layui-card"> <div class="layui-card layui-bg-gray">
{block name='style'}{/block} {block name='style'}{/block}
{notempty name='title'} {notempty name='title'}
<div class="layui-card-header layui-anim layui-anim-fadein notselect"> <div class="layui-card-header layui-anim layui-anim-fadein notselect">
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''} <span class="layui-icon layui-icon-next font-s10 color-desc margin-right-5"></span>{$title|default=''}
<div class="pull-right">{block name='button'}{/block}</div> <div class="pull-right">{block name='button'}{/block}</div>
</div> </div>
{/notempty} {/notempty}
<div class="layui-card-body layui-anim layui-anim-fadein">{block name='content'}{/block}</div> <div class="layui-card-body layui-anim layui-anim-upbit">{block name='content'}{/block}</div>
{block name='script'}{/block} {block name='script'}{/block}
</div> </div>

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

@ -13,68 +13,68 @@
{/block} {/block}
{block name="content"} {block name="content"}
<!--{empty name='list'}--> <div style="background:#fff">
<blockquote class="layui-elem-quote">没 有 记 录 哦！</blockquote> <!--{empty name='list'}-->
<!--{else}--> <blockquote class="layui-elem-quote">没 有 记 录 哦！</blockquote>
<input type="hidden" value="resort" name="action"> <!--{else}-->
<table class="layui-table" lay-skin="line"> <table class="layui-table" lay-skin="line">
<thead> <thead>
<tr> <tr>
<th class='list-table-check-td think-checkbox'> <th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'> <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th> </th>
<th class='list-table-sort-td'> <th class='list-table-sort-td'>
<button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button> <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
</th> </th>
<th class='text-center' style="width:30px"></th> <th class='text-center' style="width:30px"></th>
<th style="width:180px"></th> <th style="width:180px"></th>
<th class='layui-hide-xs' style="width:180px"></th> <th class='layui-hide-xs' style="width:180px"></th>
<th style="width:100px"></th> <th colspan="2"></th>
<th></th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody> <!--{foreach $list as $key=>$vo}-->
<!--{foreach $list as $key=>$vo}--> <tr data-dbclick>
<tr data-dbclick> <td class='list-table-check-td think-checkbox'>
<td class='list-table-check-td think-checkbox'> <input class="list-check-box" value='{$vo.ids}' type='checkbox'>
<input class="list-check-box" value='{$vo.ids}' type='checkbox'> </td>
</td> <td class='list-table-sort-td'>
<td class='list-table-sort-td'> <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">
<input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"> </td>
</td> <td class='text-center'><i class="{$vo.icon} font-s18"></i></td>
<td class='text-center'><i class="{$vo.icon} font-s18"></i></td> <td class="nowrap"><span class="color-desc">{$vo.spl|raw}</span>{$vo.title}</td>
<td class="nowrap"><span class="color-desc">{$vo.spl|raw}</span>{$vo.title}</td> <td class='layui-hide-xs'>{$vo.url}</td>
<td class='layui-hide-xs'>{$vo.url}</td> <td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}</td>
<td class='text-center nowrap'>{eq name='vo.status' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}</td> <td class='text-center nowrap notselect'>
<td class='text-center nowrap notselect'>
{if auth("admin/menu/add")} {if auth("admin/menu/add")}
<span class="text-explode">|</span> <span class="text-explode">|</span>
<!--{if $vo.spt<2}--> <!--{if $vo.spt<2}-->
<a class="layui-btn layui-btn-xs layui-btn-primary" data-tips-text="添加子菜单" data-modal='{:url("add")}?pid={$vo.id}'>添 加</a> <a class="layui-btn layui-btn-xs layui-btn-primary" data-tips-text="添加子菜单" data-modal='{:url("add")}?pid={$vo.id}'>添 加</a>
<!--{else}--> <!--{else}-->
<a class="layui-btn layui-btn-xs layui-btn-disabled">添 加</a> <a class="layui-btn layui-btn-xs layui-btn-disabled">添 加</a>
<!--{/if}--> <!--{/if}-->
{/if} {/if}
{if auth("admin/menu/edit")} {if auth("admin/menu/edit")}
<a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑菜单" data-modal='{:url("admin/menu/edit")}?id={$vo.id}'>编 辑</a> <a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑菜单" data-modal='{:url("admin/menu/edit")}?id={$vo.id}'>编 辑</a>
{/if} {/if}
{if $vo.status eq 1 and auth("admin/menu/forbid")} {if $vo.status eq 1 and auth("admin/menu/forbid")}
<a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('forbid')}" data-value="id#{$vo.ids};status#0" data-csrf="{:systoken('admin/menu/forbid')}">禁 用</a> <a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('forbid')}" data-value="id#{$vo.ids};status#0" data-csrf="{:systoken('admin/menu/forbid')}">禁 用</a>
{elseif auth("admin/menu/resume")} {elseif auth("admin/menu/resume")}
<a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('resume')}" data-value="id#{$vo.ids};status#1" data-csrf="{:systoken('admin/menu/resume')}">启 用</a> <a class="layui-btn layui-btn-warm layui-btn-xs" data-action="{:url('resume')}" data-value="id#{$vo.ids};status#1" data-csrf="{:systoken('admin/menu/resume')}">启 用</a>
{/if} {/if}
{if auth("admin/menu/del")} {if auth("admin/menu/del")}
<a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.ids}" data-csrf="{:systoken('admin/menu/del')}">删 除</a> <a class="layui-btn layui-btn-danger layui-btn-xs" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.ids}" data-csrf="{:systoken('admin/menu/del')}">删 除</a>
{/if} {/if}
</td> </td>
</tr> </tr>
<!--{/foreach}--> <!--{/foreach}-->
</tbody> </tbody>
</table> </table>
<!--{/empty}--> <!--{/empty}-->
{/block} </div>
{/block}

91
application/admin/view/message/index.html
View File

@ -42,52 +42,57 @@
{/block} {/block}
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line">
<caption class="margin-bottom-10 text-left">{include file='message/index_search'}</caption>
{notempty name='list'}
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>消息信息</th>
<th class='text-left nowrap'>消息状态</th>
<th class='text-left nowrap'>创建时间</th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left nowrap'>
<a class="color-text" href="{:url('@admin')}?messagecode={$vo.code}#{$vo.url|default=''}">{$vo.title|default=''}</a><br>
<span class="color-desc">{$vo.desc|default=''}</span><br>
</td>
<td class='text-left nowrap'>
消息状态：{if $vo.read_state}<span class="layui-badge layui-bg-green">已读取</span>{else}<span class="layui-badge layui-bg-blue">未读取</span>{/if}<br>
读取时间：{$vo.read_at|default='<span class="layui-badge layui-bg-blue">未读取</span>'|raw}<br>
</td>
<td class='text-left nowrap'>日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}</td>
<td class='text-left nowrap'>
{if $vo.read_state eq 1 and auth("admin/message/state")} <div class="think-box-shadow">
<a class="layui-btn layui-btn-sm layui-btn-disabled">已 读</a>
{elseif auth("admin/message/state")}
<a class="layui-btn layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};read_state#1">已 读</a>
{/if}
{if auth("admin/message/del")} <table class="layui-table" lay-skin="line">
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该消息吗？" data-action="{:url('del')}" data-value="id#{$vo.id}">删 除</a> <caption class="margin-bottom-10 text-left">{include file='message/index_search'}</caption>
{/if} {notempty name='list'}
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>消息信息</th>
<th class='text-left nowrap'>消息状态</th>
<th class='text-left nowrap'>创建时间</th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left nowrap'>
<a class="color-text" href="{:url('@admin')}?messagecode={$vo.code}#{$vo.url|default=''}">{$vo.title|default=''}</a><br>
<span class="color-desc">{$vo.desc|default=''}</span><br>
</td>
<td class='text-left nowrap'>
消息状态：{if $vo.read_state}<span class="layui-badge layui-bg-green">已读取</span>{else}<span class="layui-badge layui-bg-blue">未读取</span>{/if}<br>
读取时间：{$vo.read_at|default='<span class="layui-badge layui-bg-blue">未读取</span>'|raw}<br>
</td>
<td class='text-left nowrap'>日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}</td>
<td class='text-left nowrap'>
</td> {if $vo.read_state eq 1 and auth("admin/message/state")}
</tr> <a class="layui-btn layui-btn-sm layui-btn-disabled">已 读</a>
{/foreach} {elseif auth("admin/message/state")}
</tbody> <a class="layui-btn layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};read_state#1">已 读</a>
</table> {/if}
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} {if auth("admin/message/del")}
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该消息吗？" data-action="{:url('del')}" data-value="id#{$vo.id}">删 除</a>
{/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block} {/block}

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

@ -26,44 +26,44 @@
{/block} {/block}
{block name="content"} {block name="content"}
<div class="layui-tab layui-tab-card layui-box"> <div class="layui-tab layui-tab-card layui-box" style="background:#fff">
<ul class="layui-tab-title"> <ul class="layui-tab-title notselect">
{foreach $groups as $key=>$group} {foreach $groups as $key=>$group}
<li data-type='{$key}'> <li data-type='{$key}'>{$group.node.title|default='<span class="color-desc">未配置名称</span>'|raw}（{$key}）</li>
{$group.node.title|default='<span class="color-desc">未配置名称</span>'|raw}（{$key}）
</li>
{/foreach} {/foreach}
</ul> </ul>
<div class="layui-tab-content"> <div class="layui-tab-content padding-0">
{foreach $groups as $key=>$group} {foreach $groups as $key=>$group}
<div class="layui-tab-item"> <div class="layui-tab-item">
<table class="layui-table border-0 block layui-elip" lay-skin="line"> <table class="layui-table border-0 margin-0" lay-skin="line">
<!--{empty name='nodes'}--> <!--{empty name='nodes'}-->
<p class="help-block text-center well">没 有 记 录 哦！</p> <p class="help-block text-center well">没 有 记 录 哦！</p>
<!--{else}--> <!--{else}-->
<!--{foreach $group.list as $key=>$vo}--> <!--{foreach $group.list as $key=>$vo}-->
<tr> <tr>
<td class='text-left nowrap'> <td class='text-left nowrap'>
<span class="color-desc">{$vo.spl|raw}</span> {$vo.node} <span class="color-desc">{$vo.spl|raw}</span>{$vo.node}
{if auth("admin/node/save")}&nbsp;<input autocomplete="off" class='layui-input inline-block title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">{/if} {if auth("admin/node/save")}
<label class="margin-left-5 color-text">
<input autocomplete="off" class='layui-input inline-block title-input' name='title' data-node="{$vo.node}" value="{$vo.title}">
</label>
{/if}
</td> </td>
<td class='text-left nowrap text-middle'> <td class='text-left nowrap text-middle'>
{if auth("admin/node/save") and $vo.spt eq 1} {if auth("admin/node/save") and $vo.spt eq 1}
<label class="color-desc think-checkbox"> <label class="color-desc think-checkbox">
<input data-login-group="{$vo.node}" type="checkbox"> 全部加入登录控制 <input data-login-group="{$vo.node}" type="checkbox"> 全部加入登录控制
</label> </label>
&nbsp;&nbsp;&nbsp;&nbsp; <label class="notselect margin-left-20 color-desc think-checkbox">
<label class="notselect margin-left-15 color-desc think-checkbox">
<input data-auth-group="{$vo.node}" type="checkbox"> 全部加入权限控制 <input data-auth-group="{$vo.node}" type="checkbox"> 全部加入权限控制
</label> </label>
&nbsp;&nbsp;&nbsp;&nbsp; <label class="notselect margin-left-20 color-desc think-checkbox">
<label class="notselect margin-left-15 color-desc think-checkbox">
<input data-menu-group="{$vo.node}" type="checkbox"> 全部加入菜单节点选择器 <input data-menu-group="{$vo.node}" type="checkbox"> 全部加入菜单节点选择器
</label> </label>
{/if} {/if}
{if auth("admin/node/save") and $vo.spt eq 2} {if auth("admin/node/save") and $vo.spt eq 2}
<span class="color-desc">&nbsp;├&nbsp;&nbsp;&nbsp;</span> <span class="color-desc">　├　</span>
<label class="notselect margin-right-15 think-checkbox"> <label class="notselect margin-right-20 think-checkbox">
<!--{notempty name='vo.is_login'}--> <!--{notempty name='vo.is_login'}-->
<input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)"> <input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
<!--{else}--> <!--{else}-->
@ -71,8 +71,8 @@
<!--{/notempty}--> <!--{/notempty}-->
加入登录控制 加入登录控制
</label> </label>
<span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├&nbsp;&nbsp;&nbsp;</span> <span class="color-desc">　├　</span>
<label class="notselect margin-right-15 think-checkbox"> <label class="notselect margin-right-20 think-checkbox">
<!--{notempty name='vo.is_auth'}--> <!--{notempty name='vo.is_auth'}-->
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'> <input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'>
<!--{else}--> <!--{else}-->
@ -80,7 +80,7 @@
<!--{/notempty}--> <!--{/notempty}-->
加入权限控制 加入权限控制
</label> </label>
<span class="color-desc">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;├&nbsp;&nbsp;&nbsp;</span> <span class="color-desc">　├　</span>
<label class="notselect think-checkbox"> <label class="notselect think-checkbox">
<!--{notempty name='vo.is_menu'}--> <!--{notempty name='vo.is_menu'}-->
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'> <input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'>

132
application/admin/view/queue/index.html
View File

@ -3,76 +3,80 @@
{block name="button"} {block name="button"}
<!--{if auth("admin/queue/del")}--> <!--{if auth("admin/queue/del")}-->
<button data-action='{:url("del")}' data-confirm="确定要删除这些任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除任务</button> <button data-action='{:url("del")}' data-confirm="确定要删除这些任务吗？" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除任务</button>
<!--{/if}--> <!--{/if}-->
{/block} {/block}
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line">
<caption class="margin-bottom-10 text-left">{include file='queue/index_search'}</caption>
<!--{notempty name='list'}-->
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>任务信息</th>
<th class='text-left nowrap'>任务时间</th>
<th class='text-left nowrap'>任务状态</th>
</tr>
</thead>
<!--{/notempty}-->
<tbody>
<!--{foreach $list as $key=>$vo}-->
<tr>
<td class='list-table-check-td think-checkbox'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'>
</td>
<td class='text-left nowrap'>
任务名称：{$vo.title}
<br>
任务指令：{$vo.uri}
</td>
<td class='text-left nowrap'>
创建时间：<span class="layui-badge layui-bg-gray">{$vo.create_at|format_datetime|raw}</span>
<br>
跟进时间：<span class="layui-badge layui-bg-gray">{$vo.status_at|format_datetime|raw}</span>
</td>
<td class='text-left nowrap'>
任务状态：
{eq name='vo.double' value='1'}
<span class="layui-badge layui-bg-green margin-right-5">复</span>
{else}
<span class="layui-badge layui-bg-blue margin-right-5">单</span>
{/eq}
{eq name='vo.status' value='1'} <div class="think-box-shadow">
<span class="layui-badge layui-bg-black">待处理</span>
{elseif $vo.status eq 2}
<span class="layui-badge layui-bg-green">处理中</span>
{elseif $vo.status eq 3}
<span class="layui-badge layui-bg-blue">处理完成</span>
{elseif $vo.status eq 4}
<span class="layui-badge layui-bg-red margin-right-5">处理失败</span>
<a class="layui-badge layui-bg-green" data-tips-text="重置该任务" data-action="{:url('redo')}" data-value="id#{$vo.id}">
<i class="layui-icon font-s12">&#xe669;</i>
</a>
{/eq}
<!--{if auth("admin/queue/del") and in_array($vo.status,[1,3,4])}-->
<a data-action='{:url("del")}' data-confirm="确定要删除该任务吗？" data-value="id#{$vo.id}" data-tips-text="删除该任务" class='layui-badge layui-bg-red margin-left-5'>
<i class="layui-icon">&#xe640;</i>
</a>
<!--{/if}-->
<br>
状态描述：
<span class="layui-badge layui-bg-gray">{$vo.status_desc|raw|default="<span class='color-desc'>没有获取到状态描述</span>"}</span>
</td>
</tr>
<!--{/foreach}-->
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} <table class="layui-table" lay-skin="line">
<caption class="margin-bottom-10 text-left">{include file='queue/index_search'}</caption>
<!--{notempty name='list'}-->
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap'>任务信息</th>
<th class='text-left nowrap'>任务时间</th>
<th class='text-left nowrap'>任务状态</th>
</tr>
</thead>
<!--{/notempty}-->
<tbody>
<!--{foreach $list as $key=>$vo}-->
<tr>
<td class='list-table-check-td think-checkbox'>
<input class="list-check-box" value='{$vo.id}' type='checkbox'>
</td>
<td class='text-left nowrap'>
任务名称：{$vo.title}
<br>
任务指令：{$vo.uri}
</td>
<td class='text-left nowrap'>
创建时间：<span class="layui-badge layui-bg-gray">{$vo.create_at|format_datetime|raw}</span>
<br>
跟进时间：<span class="layui-badge layui-bg-gray">{$vo.status_at|format_datetime|raw}</span>
</td>
<td class='text-left nowrap'>
任务状态：
{eq name='vo.double' value='1'}
<span class="layui-badge layui-bg-green margin-right-5">复</span>
{else}
<span class="layui-badge layui-bg-blue margin-right-5">单</span>
{/eq}
{eq name='vo.status' value='1'}
<span class="layui-badge layui-bg-black">待处理</span>
{elseif $vo.status eq 2}
<span class="layui-badge layui-bg-green">处理中</span>
{elseif $vo.status eq 3}
<span class="layui-badge layui-bg-blue">处理完成</span>
{elseif $vo.status eq 4}
<span class="layui-badge layui-bg-red margin-right-5">处理失败</span>
<a class="layui-badge layui-bg-green" data-tips-text="重置该任务" data-action="{:url('redo')}" data-value="id#{$vo.id}">
<i class="layui-icon font-s12">&#xe669;</i>
</a>
{/eq}
<!--{if auth("admin/queue/del") and in_array($vo.status,[1,3,4])}-->
<a data-action='{:url("del")}' data-confirm="确定要删除该任务吗？" data-value="id#{$vo.id}" data-tips-text="删除该任务" class='layui-badge layui-bg-red margin-left-5'>
<i class="layui-icon">&#xe640;</i>
</a>
<!--{/if}-->
<br>
状态描述：
<span class="layui-badge layui-bg-gray">{$vo.status_desc|raw|default="<span class='color-desc'>没有获取到状态描述</span>"}</span>
</td>
</tr>
<!--{/foreach}-->
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block} {/block}

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

@ -13,66 +13,70 @@
{/block} {/block}
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line"> <div class="think-box-shadow">
<caption class="margin-bottom-10 text-left">{include file='user/index_search'}</caption>
{notempty name='list'}
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap' style="width:120px">用户名</th>
<th class='text-left nowrap' style="width:120px">账号状态</th>
<th class='text-left nowrap' style="width:180px">创建时间</th>
<th class='text-left nowrap' style="width:150px">最后登录</th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr data-dbclick>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left nowrap'>
用户账号：{$vo.username|default=''}<br>
联系手机：{$vo.phone|default='--'}
</td>
<td class='text-left nowrap'>
登录次数：{$vo.login_num|default=0}<br>
使用状态：{eq name='vo.status' value='0'}<span class="layui-badge">已禁用</span>{else}<span class="layui-badge layui-bg-green">使用中</span>{/eq}
</td>
<td class='text-left nowrap'>日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}</td>
<td class='text-left nowrap'>{if $vo.login_num>0}日期：{$vo.login_at|format_datetime|str_replace=' ','<br>时间：',###|raw}{else} -- {/if}</td>
<td class='text-left nowrap'>
{if auth("admin/user/auth")} <table class="layui-table" lay-skin="line">
<a class="layui-btn layui-btn-primary layui-btn-sm" data-title="用户授权" data-modal='{:url("auth")}?id={$vo.id}'>授 权</a> <caption class="margin-bottom-10 text-left">{include file='user/index_search'}</caption>
{/if} {notempty name='list'}
<thead>
<tr>
<th class='list-table-check-td think-checkbox'>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'>
</th>
<th class='text-left nowrap' style="width:120px">用户名</th>
<th class='text-left nowrap' style="width:120px">账号状态</th>
<th class='text-left nowrap' style="width:180px">创建时间</th>
<th class='text-left nowrap' style="width:150px">最后登录</th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr data-dbclick>
<td class='list-table-check-td think-checkbox'><input class="list-check-box" value='{$vo.id}' type='checkbox'></td>
<td class='text-left nowrap'>
用户账号：{$vo.username|default=''}<br>
联系手机：{$vo.phone|default='-'}
</td>
<td class='text-left nowrap'>
登录次数：{$vo.login_num|default=0}<br>
使用状态：{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}
</td>
<td class='text-left nowrap'>日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}</td>
<td class='text-left nowrap'>{if $vo.login_num>0}日期：{$vo.login_at|format_datetime|str_replace=' ','<br>时间：',###|raw}{else} -- {/if}</td>
<td class='text-left nowrap'>
{if auth("admin/user/pass")} {if auth("admin/user/auth")}
<a class="layui-btn layui-btn-normal layui-btn-sm" data-title="设置密码" data-modal='{:url("pass")}?id={$vo.id}'>密 码</a> <a class="layui-btn layui-btn-primary layui-btn-sm" data-title="用户授权" data-modal='{:url("auth")}?id={$vo.id}'>授 权</a>
{/if} {/if}
{if auth("admin/user/edit")} {if auth("admin/user/pass")}
<a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a> <a class="layui-btn layui-btn-normal layui-btn-sm" data-title="设置密码" data-modal='{:url("pass")}?id={$vo.id}'>密 码</a>
{/if} {/if}
{if $vo.status eq 1 and auth("admin/user/forbid")} {if auth("admin/user/edit")}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('admin/user/forbid')}">禁 用</a> <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑用户" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
{elseif auth("admin/user/resume")} {/if}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('admin/user/resume')}">启 用</a>
{/if}
{if auth("admin/user/del")} {if $vo.status eq 1 and auth("admin/user/forbid")}
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该用户吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/user/del')}">删 除</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('admin/user/forbid')}">禁 用</a>
{/if} {elseif auth("admin/user/resume")}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('admin/user/resume')}">启 用</a>
{/if}
</td> {if auth("admin/user/del")}
</tr> <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该用户吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/user/del')}">删 除</a>
{/foreach} {/if}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} </td>
</tr>
{/foreach}
</tbody>
</table>
{/block} {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block}

15
application/service/controller/Config.php
View File

@ -17,11 +17,9 @@ namespace app\service\controller;
use library\Controller; use library\Controller;
/** /**
* 微信配置管理 * 开放平台参数配置
* Class Index * Class Config
* @package app\wechat\controller * @package app\service\controller
* @author Anyon <zoujingli@qq.com>
* @date 2017/03/27 14:43
*/ */
class Config extends Controller class Config extends Controller
{ {
@ -42,10 +40,11 @@ class Config extends Controller
$this->applyCsrfToken(); $this->applyCsrfToken();
$this->title = '开放平台接口配置'; $this->title = '开放平台接口配置';
if ($this->request->isGet()) { if ($this->request->isGet()) {
return $this->fetch(); $this->fetch();
} else { } else {
foreach ($this->request->post() as $k => $v) sysconf($k, $v); $post = $this->request->post();
$this->success('开放平台参数修改成功！', ''); foreach ($post as $k => $v) sysconf($k, $v);
$this->success('开放平台参数修改成功！');
} }
} }

10
application/service/controller/Index.php
View File

@ -14,13 +14,13 @@
namespace app\service\controller; namespace app\service\controller;
use app\service\logic\Build; use app\service\service\Build;
use app\service\logic\Wechat; use app\service\service\Wechat;
use library\Controller; use library\Controller;
use think\Db; use think\Db;
/** /**
* Class Index * 公众授权管理
* @package app\service\controller * @package app\service\controller
*/ */
class Index extends Controller class Index extends Controller
@ -33,7 +33,7 @@ class Index extends Controller
public $table = 'WechatServiceConfig'; public $table = 'WechatServiceConfig';
/** /**
* 授权公众号管理 * 公众授权管理
* @return string * @return string
* @throws \think\Exception * @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
@ -43,7 +43,7 @@ class Index extends Controller
public function index() public function index()
{ {
$this->applyCsrfToken(); $this->applyCsrfToken();
$this->title = '微信授权管理'; $this->title = '公众授权管理';
$query = $this->_query($this->table)->like('authorizer_appid,nick_name,principal_name'); $query = $this->_query($this->table)->like('authorizer_appid,nick_name,principal_name');
$query = $query->equal('service_type,status')->dateBetween('create_at'); $query = $query->equal('service_type,status')->dateBetween('create_at');
$query->where(['is_deleted' => '0'])->order('id desc')->page(); $query->where(['is_deleted' => '0'])->order('id desc')->page();

2
application/service/controller/api/Client.php
View File

@ -14,7 +14,7 @@
namespace app\service\controller\api; namespace app\service\controller\api;
use app\service\logic\Wechat; use app\service\service\Wechat;
use think\Controller; use think\Controller;
use think\Db; use think\Db;

4
application/service/controller/api/Push.php
View File

@ -14,8 +14,8 @@
namespace app\service\controller\api; namespace app\service\controller\api;
use app\service\logic\Build; use app\service\service\Build;
use app\service\logic\Wechat; use app\service\service\Wechat;
use library\Controller; use library\Controller;
use think\Db; use think\Db;

2
application/service/handler/Publish.php
View File

@ -14,7 +14,7 @@
namespace app\service\handler; namespace app\service\handler;
use app\service\logic\Wechat; use app\service\service\Wechat;
/** /**
* 第三方平台测试上线 * 第三方平台测试上线

2
application/service/handler/Receive.php
View File

@ -14,7 +14,7 @@
namespace app\service\handler; namespace app\service\handler;
use app\service\logic\Wechat; use app\service\service\Wechat;
use think\Db; use think\Db;
/** /**

11
application/service/handler/Wechat.php
View File

@ -14,7 +14,7 @@
namespace app\service\handler; namespace app\service\handler;
use app\service\logic\Wechat as WechatLogic; use app\service\service\Wechat as WechatLogic;
use think\Db; use think\Db;
/** /**
@ -64,15 +64,6 @@ class Wechat
throw new \think\Exception('Wechat Please bind Wechat first'); throw new \think\Exception('Wechat Please bind Wechat first');
} }
/**
* 接口测试
* @return integer
*/
public function test()
{
return time();
}
/** /**
* 获取当前公众号配置 * 获取当前公众号配置
* @return array|boolean * @return array|boolean

8
application/service/logic/Build.php → application/service/service/Build.php
View File

@ -12,12 +12,12 @@
// | github开源项目：https://github.com/zoujingli/framework // | github开源项目：https://github.com/zoujingli/framework
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\service\logic; namespace app\service\service;
/** /**
* 公众号授权数据处理 * 授权数据处理
* Class BuildService * Class Build
* @package app\wechat\service * @package app\service\service
*/ */
class Build class Build
{ {

4
application/service/logic/Wechat.php → application/service/service/Wechat.php
View File

@ -12,14 +12,14 @@
// | github开源项目：https://github.com/zoujingli/framework // | github开源项目：https://github.com/zoujingli/framework
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\service\logic; namespace app\service\service;
use think\Db; use think\Db;
/** /**
* 微信数据服务 * 微信数据服务
* Class Wechat * Class Wechat
* @package app\service\logic * @package app\service\service
* @method \WeChat\Card WeChatCard($appid) static 微信卡券管理 * @method \WeChat\Card WeChatCard($appid) static 微信卡券管理
* @method \WeChat\Custom WeChatCustom($appid) static 微信客服消息 * @method \WeChat\Custom WeChatCustom($appid) static 微信客服消息
* @method \WeChat\Limit WeChatLimit($appid) static 接口调用频次限制 * @method \WeChat\Limit WeChatLimit($appid) static 接口调用频次限制

12
application/service/view/config/index.html
View File

@ -2,8 +2,10 @@
{block name="content"} {block name="content"}
<div class="nowrap" style="width:1295px"> <div class="nowrap" style="width:1295px">
<div class="layui-code margin-bottom-20">强烈建议安装 YAR 扩展来实现接口通信，SOAP 不能正常显示接口的异常信息。</div> <div class="layui-code margin-top-0 margin-bottom-20 think-box-shadow" style="border-left-width:1px">
<fieldset class="margin-bottom-15 margin-right-10 pull-left" style="width:600px"> 强烈建议安装 YAR 扩展来实现接口通信，SOAP 不能正常显示接口的异常信息。
</div>
<fieldset class="margin-bottom-15 margin-right-10 pull-left think-box-shadow wechat-box">
<legend class="layui-bg-cyan">授权参数</legend> <legend class="layui-bg-cyan">授权参数</legend>
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-form-item"> <div class="layui-form-item">
@ -41,7 +43,7 @@
</form> </form>
</fieldset> </fieldset>
<fieldset class="margin-bottom-15 pull-left" style="width:600px"> <fieldset class="margin-bottom-15 pull-left think-box-shadow wechat-box">
<legend class="layui-bg-cyan">对接信息</legend> <legend class="layui-bg-cyan">对接信息</legend>
<div class="layui-form-item"> <div class="layui-form-item">
<p class="color-green">授权发起页域名</p> <p class="color-green">授权发起页域名</p>
@ -83,6 +85,10 @@
{block name='style'} {block name='style'}
<style> <style>
fieldset.wechat-box {
width: 600px
}
.right-btn { .right-btn {
top: 0; top: 0;
right: 0; right: 0;

130
application/service/view/index/index.html
View File

@ -7,73 +7,77 @@
{/block} {/block}
{block name="content"} {block name="content"}
<table class="layui-table" lay-skin="line"> <div class="think-box-shadow">
<caption class="margin-bottom-10 text-left">{include file='index/index_search'}</caption>
{notempty name='list'}
<thead>
<tr>
<th class='text-left nowrap' style="width:390px">接口信息</th>
<th class='text-left nowrap' style="width:120px">服务号信息</th>
<th class='text-left nowrap'></th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='text-left nowrap'>
<div class="inline-block text-top margin-right-5">
<img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信头像" data-tips-image src="{$vo.head_img|default=''}">
</div>
<div class="inline-block">
公众号APPID：{$vo.authorizer_appid}&nbsp;&nbsp;&nbsp;&nbsp;调用次数：{$vo.total}<br>
接口授权密钥：{$vo.appkey|default='<span class="color-desc">未生成接口服务密码, 请稍候授权绑定</span>'|raw}<br>
消息推送接口：{$vo.appuri|default='<span class="color-desc">未配置消息推送接口</span>'|raw}
</div>
</td>
<td class='text-left nowrap'>
<div class="inline-block text-top margin-right-5">
<img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信二维码" data-tips-image src="{$vo.qrcode_url|local_image}">
</div>
<div class="inline-block">
昵称：{$vo.nick_name|default='<span class="color-desc">未获取到公众号昵称</span>'|raw}<br>
公司：{$vo.principal_name|default='<span class="color-desc">未获取到公司名字</span>'|raw}<br>
状态：{if $vo.service_type eq 2}服务号{elseif $vo.service_type eq 3}小程序{else}订阅号{/if} /
{$vo.verify_type == -1 ? '<span class="color-red">未认证</span>' : '<span class="color-green">已认证</span>'} /
{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
</div>
</td>
<td class="text-left nowrap">
账号：{$vo.user_name|default='--'}<br>
日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
</td>
<td class='text-left nowrap'>
{if $vo.status eq 1 and auth("servce/index/forbid")} <table class="layui-table" lay-skin="line">
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-csrf="{:systoken('service/index/forbid')}" data-value="id#{$vo.id};status#0">禁 用</a> <caption class="margin-bottom-10 text-left">{include file='index/index_search'}</caption>
{elseif auth("servce/index/resume")} {notempty name='list'}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-csrf="{:systoken('service/index/resume')}" data-value="id#{$vo.id};status#1">启 用</a> <thead>
{/if} <tr>
<th class='text-left nowrap' style="width:390px">接口信息</th>
<th class='text-left nowrap' style="width:120px">服务号信息</th>
<th class='text-left nowrap'></th>
<th class='text-left nowrap'></th>
</tr>
</thead>
{/notempty}
<tbody>
{foreach $list as $key=>$vo}
<tr>
<td class='text-left nowrap'>
<div class="inline-block text-top margin-right-5">
<img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信头像" data-tips-image src="{$vo.head_img|default=''}">
</div>
<div class="inline-block">
公众号APPID：{$vo.authorizer_appid}&nbsp;&nbsp;&nbsp;&nbsp;调用次数：{$vo.total}<br>
接口授权密钥：{$vo.appkey|default='<span class="color-desc">未生成接口服务密码, 请稍候授权绑定</span>'|raw}<br>
消息推送接口：{$vo.appuri|default='<span class="color-desc">未配置消息推送接口</span>'|raw}
</div>
</td>
<td class='text-left nowrap'>
<div class="inline-block text-top margin-right-5">
<img onerror="this.src='__ROOT__/static/theme/img/404_icon.png'" style="width:60px;height:60px" data-tips-text="微信二维码" data-tips-image src="{$vo.qrcode_url|local_image}">
</div>
<div class="inline-block">
昵称：{$vo.nick_name|default='<span class="color-desc">未获取到公众号昵称</span>'|raw}<br>
公司：{$vo.principal_name|default='<span class="color-desc">未获取到公司名字</span>'|raw}<br>
状态：{if $vo.service_type eq 2}服务号{elseif $vo.service_type eq 3}小程序{else}订阅号{/if} /
{$vo.verify_type == -1 ? '<span class="color-red">未认证</span>' : '<span class="color-green">已认证</span>'} /
{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}
</div>
</td>
<td class="text-left nowrap">
账号：{$vo.user_name|default='--'}<br>
日期：{$vo.create_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
</td>
<td class='text-left nowrap'>
{if auth("service/index/sync")} {if $vo.status eq 1 and auth("servce/index/forbid")}
<a class="layui-btn layui-btn-sm" data-load='{:url("service/index/sync")}?appid={$vo.authorizer_appid}'>同 步</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-csrf="{:systoken('service/index/forbid')}" data-value="id#{$vo.id};status#0">禁 用</a>
{/if} {elseif auth("servce/index/resume")}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-csrf="{:systoken('service/index/resume')}" data-value="id#{$vo.id};status#1">启 用</a>
{/if}
{if auth("service/index/del")} {if auth("service/index/sync")}
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该公众号吗？" data-action="{:url('del')}" data-csrf="{:systoken('service/index/del')}" data-value="id#{$vo.id}">删 除</a> <a class="layui-btn layui-btn-sm" data-load='{:url("service/index/sync")}?appid={$vo.authorizer_appid}'>同 步</a>
{/if} {/if}
{if auth("service/index/clearquota")} {if auth("service/index/del")}
<a class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="每个公众号每个月有10次清零机会，请谨慎使用！" data-load='{:url("service/index/clearquota")}?appid={$vo.authorizer_appid}'>清 零</a> <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该公众号吗？" data-action="{:url('del')}" data-csrf="{:systoken('service/index/del')}" data-value="id#{$vo.id}">删 除</a>
{/if} {/if}
</td> {if auth("service/index/clearquota")}
</tr> <a class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="每个公众号每个月有10次清零机会，请谨慎使用！" data-load='{:url("service/index/clearquota")}?appid={$vo.authorizer_appid}'>清 零</a>
{/foreach} {/if}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty} </td>
</tr>
{/foreach}
</tbody>
</table>
{/block} {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block}

40
application/wechat/controller/Config.php
View File

@ -27,7 +27,6 @@ class Config extends Controller
{ {
/** /**
* 公众号授权绑定 * 公众号授权绑定
* @return mixed
* @throws \think\Exception * @throws \think\Exception
* @throws \think\exception\PDOException * @throws \think\exception\PDOException
*/ */
@ -53,13 +52,15 @@ class Config extends Controller
} catch (\Exception $e) { } catch (\Exception $e) {
$this->wechat = []; $this->wechat = [];
} }
return $this->fetch(); $this->fetch();
} else {
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
if ($this->request->post('wechat_type') === 'thr') {
Wechat::wechat()->setApiNotifyUri($this->thrNotify);
}
$uri = url('wechat/config/options');
$this->success('公众号参数获取成功！', url('@admin') . "#{$uri}");
} }
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
if ($this->request->post('wechat_type') === 'thr') {
Wechat::wechat()->setApiNotifyUri($this->thrNotify);
}
$this->success('公众号参数获取成功！', url('@admin') . '#' . url('wechat/config/options'));
} }
/** /**
@ -71,8 +72,8 @@ class Config extends Controller
public function payment() public function payment()
{ {
$this->applyCsrfToken(); $this->applyCsrfToken();
$this->title = '公众号支付配置';
if ($this->request->isGet()) { if ($this->request->isGet()) {
$this->title = '公众号支付配置';
$file = File::instance('local'); $file = File::instance('local');
$this->wechat_mch_ssl_cer = sysconf('wechat_mch_ssl_cer'); $this->wechat_mch_ssl_cer = sysconf('wechat_mch_ssl_cer');
$this->wechat_mch_ssl_key = sysconf('wechat_mch_ssl_key'); $this->wechat_mch_ssl_key = sysconf('wechat_mch_ssl_key');
@ -80,19 +81,20 @@ class Config extends Controller
if (!$file->has($this->wechat_mch_ssl_cer, true)) $this->wechat_mch_ssl_cer = ''; if (!$file->has($this->wechat_mch_ssl_cer, true)) $this->wechat_mch_ssl_cer = '';
if (!$file->has($this->wechat_mch_ssl_key, true)) $this->wechat_mch_ssl_key = ''; if (!$file->has($this->wechat_mch_ssl_key, true)) $this->wechat_mch_ssl_key = '';
if (!$file->has($this->wechat_mch_ssl_p12, true)) $this->wechat_mch_ssl_p12 = ''; if (!$file->has($this->wechat_mch_ssl_p12, true)) $this->wechat_mch_ssl_p12 = '';
return $this->fetch(); $this->fetch();
} } else {
if ($this->request->post('wechat_mch_ssl_type') === 'p12') { if ($this->request->post('wechat_mch_ssl_type') === 'p12') {
if (!($sslp12 = $this->request->post('wechat_mch_ssl_p12'))) { if (!($sslp12 = $this->request->post('wechat_mch_ssl_p12'))) {
$mchid = $this->request->post('wechat_mch_id'); $mchid = $this->request->post('wechat_mch_id');
$content = File::instance('local')->get($sslp12, true); $content = File::instance('local')->get($sslp12, true);
if (!openssl_pkcs12_read($content, $certs, $mchid)) { if (!openssl_pkcs12_read($content, $certs, $mchid)) {
$this->error('商户MCH_ID与支付P12证书不匹配！'); $this->error('商户MCH_ID与支付P12证书不匹配！');
}
} }
} }
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
$this->success('公众号支付配置成功！');
} }
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
$this->success('公众号支付配置成功！');
} }
} }

4
application/wechat/controller/Fans.php
View File

@ -45,8 +45,8 @@ class Fans extends Controller
public function index() public function index()
{ {
$this->title = '微信粉丝管理'; $this->title = '微信粉丝管理';
$this->_query($this->table)->like('nickname')->equal('subscribe,is_black') $query = $this->_query($this->table)->like('nickname')->equal('subscribe,is_black');
->dateBetween('subscribe_at')->order('subscribe_time desc')->page(); $query->dateBetween('subscribe_at')->order('subscribe_time desc')->page();
} }
/** /**

15
application/wechat/controller/Keys.php
View File

@ -18,7 +18,6 @@ use app\wechat\service\Wechat;
use library\Controller; use library\Controller;
use think\Db; use think\Db;
/** /**
* 回复规则管理 * 回复规则管理
* Class Keys * Class Keys
@ -66,7 +65,8 @@ class Keys extends Controller
} }
// 关键字列表显示 // 关键字列表显示
$this->title = '回复规则管理'; $this->title = '回复规则管理';
return $this->_query($this->table)->like('keys,type')->equal('status')->dateBetween('create_at')->whereNotIn('keys', ['subscribe', 'default'])->order('sort asc,id desc')->page(); $query = $this->_query($this->table)->like('keys,type')->equal('status')->dateBetween('create_at');
$query->whereNotIn('keys', ['subscribe', 'default'])->order('sort asc,id desc')->page();
} }
/** /**
@ -135,7 +135,7 @@ class Keys extends Controller
} }
/** /**
* 关注默认回复 * 配置关注回复
* @return array|string * @return array|string
*/ */
public function subscribe() public function subscribe()
@ -147,7 +147,7 @@ class Keys extends Controller
/** /**
* 无配置默认回复 * 配置默认回复
* @return array|string * @return array|string
*/ */
public function defaults() public function defaults()
@ -176,8 +176,8 @@ class Keys extends Controller
} }
/** /**
* 编辑结果处理 * 表单结果处理
* @param $result * @param boolean $result
*/ */
protected function _form_result($result) protected function _form_result($result)
{ {
@ -187,8 +187,9 @@ class Keys extends Controller
$url = url('@admin') . '#' . url('wechat/keys/index') . '?spm=' . $this->request->get('spm'); $url = url('@admin') . '#' . url('wechat/keys/index') . '?spm=' . $this->request->get('spm');
} }
$this->success('恭喜, 关键字保存成功!', $url); $this->success('恭喜, 关键字保存成功!', $url);
} else {
$this->error('关键字保存失败, 请稍候再试!');
} }
$this->error('关键字保存失败, 请稍候再试!');
} }
} }

17
application/wechat/controller/Menu.php
View File

@ -44,7 +44,6 @@ class Menu extends Controller
/** /**
* 微信菜单管理 * 微信菜单管理
* @return array
* @throws \think\Exception * @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\ModelNotFoundException
@ -57,10 +56,11 @@ class Menu extends Controller
$where = [['keys', 'notin', ['subscribe', 'default']], ['status', 'eq', '1']]; $where = [['keys', 'notin', ['subscribe', 'default']], ['status', 'eq', '1']];
$keys = Db::name('WechatKeys')->where($where)->order('sort asc,id desc')->select(); $keys = Db::name('WechatKeys')->where($where)->order('sort asc,id desc')->select();
$this->success('获取数据成功!', ['menudata' => sysdata('menudata'), 'keysdata' => $keys]); $this->success('获取数据成功!', ['menudata' => sysdata('menudata'), 'keysdata' => $keys]);
} else {
$this->title = '微信菜单定制';
$this->menuTypes = $this->menuType;
$this->fetch();
} }
$this->title = '微信菜单定制';
$this->menuTypes = $this->menuType;
return $this->fetch();
} }
/** /**
@ -74,9 +74,9 @@ class Menu extends Controller
try { try {
Wechat::WeChatMenu()->delete(); Wechat::WeChatMenu()->delete();
} catch (\Exception $e) { } catch (\Exception $e) {
$this->error('删除取消微信菜单失败，请稍候再试！' . $e->getMessage()); $this->error('删除微信菜单失败，请稍候再试！' . $e->getMessage());
} }
$this->success('删除并取消微信菜单成功！', ''); $this->success('删除微信菜单成功！', '');
} }
try { try {
sysdata('menudata', $this->buildMenu($menudata = json_decode($data, true))); sysdata('menudata', $this->buildMenu($menudata = json_decode($data, true)));
@ -132,10 +132,7 @@ class Menu extends Controller
case 'view': case 'view':
return ['name' => $item['name'], 'type' => $item['type'], 'url' => $item['url']]; return ['name' => $item['name'], 'type' => $item['type'], 'url' => $item['url']];
case 'miniprogram': case 'miniprogram':
return [ return ['name' => $item['name'], 'type' => $item['type'], 'url' => $item['url'], 'appid' => $item['appid'], 'pagepath' => $item['pagepath']];
'name' => $item['name'], 'type' => $item['type'], 'url' => $item['url'],
'appid' => $item['appid'], 'pagepath' => $item['pagepath'],
];
} }
} }

47
application/wechat/controller/News.php
View File

@ -35,12 +35,16 @@ class News extends Controller
/** /**
* 微信图文管理 * 微信图文管理
* @return array|string * @return array|string
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function index() public function index()
{ {
$this->title = '微信图文列表'; $this->title = '微信图文列表';
$db = Db::name($this->table)->where(['is_deleted' => '0']); $this->_query($this->table)->where(['is_deleted' => '0'])->order('id desc')->page();
return parent::_page($db->order('id desc'));
} }
/** /**
@ -58,6 +62,11 @@ class News extends Controller
/** /**
* 图文选择器 * 图文选择器
* @return string * @return string
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/ */
public function select() public function select()
{ {
@ -78,7 +87,6 @@ class News extends Controller
/** /**
* 添加微信图文 * 添加微信图文
* @return string
* @throws \think\Exception * @throws \think\Exception
* @throws \think\exception\PDOException * @throws \think\exception\PDOException
*/ */
@ -86,21 +94,21 @@ class News extends Controller
{ {
if ($this->request->isGet()) { if ($this->request->isGet()) {
$this->title = '新建图文'; $this->title = '新建图文';
return $this->fetch('form'); $this->fetch('form');
} } else {
$data = $this->request->post(); $data = $this->request->post();
if (($ids = $this->_apply_news_article($data['data'])) && !empty($ids)) { if (($ids = $this->_apply_news_article($data['data'])) && !empty($ids)) {
if (data_save($this->table, ['article_id' => $ids, 'create_by' => session('user.id')], 'id') !== false) { if (data_save($this->table, ['article_id' => $ids, 'create_by' => session('user.id')], 'id') !== false) {
$url = url('@admin') . '#' . url('@wechat/news/index') . '?spm=' . $this->request->get('spm'); $url = url('@admin') . '#' . url('@wechat/news/index') . '?spm=' . $this->request->get('spm');
$this->success('图文添加成功！', $url); $this->success('图文添加成功！', $url);
}
} }
$this->error('图文添加失败，请稍候再试！');
} }
$this->error('图文添加失败，请稍候再试！');
} }
/** /**
* 编辑微信图文 * 编辑微信图文
* @return string
* @throws \think\Exception * @throws \think\Exception
* @throws \think\exception\PDOException * @throws \think\exception\PDOException
*/ */
@ -112,15 +120,16 @@ class News extends Controller
if ($this->request->get('output') === 'json') { if ($this->request->get('output') === 'json') {
$this->success('获取数据成功！', Media::news($id)); $this->success('获取数据成功！', Media::news($id));
} }
return $this->fetch('form', ['title' => '编辑图文']); $this->fetch('form', ['title' => '编辑图文']);
} } else {
$post = $this->request->post(); $post = $this->request->post();
if (isset($post['data']) && ($ids = $this->_apply_news_article($post['data']))) { if (isset($post['data']) && ($ids = $this->_apply_news_article($post['data']))) {
if (data_save('wechat_news', ['id' => $id, 'article_id' => $ids], 'id')) { if (data_save('wechat_news', ['id' => $id, 'article_id' => $ids], 'id')) {
$this->success('图文更新成功！', url('@admin') . '#' . url('@wechat/news/index')); $this->success('图文更新成功！', url('@admin') . '#' . url('@wechat/news/index'));
}
} }
$this->error('图文更新失败，请稍候再试！');
} }
$this->error('图文更新失败，请稍候再试！');
} }
/** /**

5
application/wechat/controller/api/Review.php
View File

@ -36,7 +36,7 @@ class Review extends Controller
public function news($id = 0) public function news($id = 0)
{ {
$this->news = Media::news(empty($id) ? input('id') : $id); $this->news = Media::news(empty($id) ? input('id') : $id);
return $this->fetch(); $this->fetch();
} }
/** /**
@ -53,7 +53,8 @@ class Review extends Controller
{ {
$where = ['id' => empty($id) ? input('id') : $id]; $where = ['id' => empty($id) ? input('id') : $id];
Db::name('WechatNewsArticle')->where($where)->update(['read_num' => Db::raw('read_num+1')]); Db::name('WechatNewsArticle')->where($where)->update(['read_num' => Db::raw('read_num+1')]);
return $this->fetch('', ['info' => Db::name('WechatNewsArticle')->where($where)->find()]); $this->info = Db::name('WechatNewsArticle')->where($where)->find();
$this->fetch();
} }
/** /**

5
application/wechat/service/Wechat.php
View File

@ -119,8 +119,9 @@ class Wechat extends \We
* 接口对象实例化 * 接口对象实例化
* @param string $name 接口名称 * @param string $name 接口名称
* @param string $type 接口类型 * @param string $type 接口类型
* @param array $config * @param array $config 微信配置
* @return mixed * @return mixed
* @throws \SoapFault
* @throws \think\Exception * @throws \think\Exception
* @throws \think\exception\PDOException * @throws \think\exception\PDOException
*/ */
@ -147,7 +148,7 @@ class Wechat extends \We
/** /**
* 获取微信网页JSSDK * 获取微信网页JSSDK
* @param null|string $url JS签名地址 * @param string $url JS签名地址
* @return array * @return array
* @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException * @throws \WeChat\Exceptions\LocalCacheException

31
application/wechat/view/config/options.html
View File

@ -2,23 +2,26 @@
{block name="content"} {block name="content"}
<form class="layui-card layui-form"> <div style="max-width:1000px">
<div class="layui-card-body"> <form class="layui-card layui-form">
<div class="layui-form-item"> <div class="layui-card-body think-box-shadow padding-bottom-5">
<label class="layui-form-label">Type<br><span class="nowrap color-desc">对接方式</span></label> <div class="layui-form-item">
<div class="layui-input-block"> <label class="layui-form-label">Type<br><span class="nowrap color-desc">对接方式</span></label>
{foreach ['api'=>'公众号平台API模式','thr'=>'第三方平台授权模式','test'=>'接口功能测试'] as $k=>$v} <div class="layui-input-block">
<input type="radio" data-wechat-type="{$k}" name="wechat_type" value="{$k}" title="{$v}" lay-filter="wechat_type"> {foreach ['api'=>'公众号平台API模式','thr'=>'第三方平台授权模式','test'=>'接口功能测试'] as $k=>$v}
{/foreach} <input type="radio" data-wechat-type="{$k}" name="wechat_type" value="{$k}" title="{$v}" lay-filter="wechat_type">
<p class="help-block">请选择微信对接方式，其中第三方平台授权需要微信开放平台支持，同时需要搭建 SERVICE 服务！</p> {/foreach}
<p class="help-block">请选择微信对接方式，其中第三方平台授权需要微信开放平台支持，同时需要搭建 SERVICE 服务！</p>
</div>
</div> </div>
</div> </div>
</form>
<div class="think-box-shadow">
<div data-type="api">{include file='config/options_api'}</div>
<div data-type="thr">{include file='config/options_thr'}</div>
<div data-type="test">{include file='config/options_help'}</div>
</div> </div>
</form> </div>
<div data-type="api">{include file='config/options_api'}</div>
<div data-type="thr">{include file='config/options_thr'}</div>
<div data-type="test">{include file='config/options_help'}</div>
{/block} {/block}

10
application/wechat/view/config/options_api.html
View File

@ -1,6 +1,6 @@
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body padding-0"> <div class="layui-card-body">
<div class="color-blue padding-left-40 padding-bottom-20"> <div class="color-blue padding-left-40 padding-bottom-20">
使用API直接对接时，需要在微信公众号平台配置授权IP及网页授权域名，另外再将获取到的参数填写到下面！ 使用API直接对接时，需要在微信公众号平台配置授权IP及网页授权域名，另外再将获取到的参数填写到下面！
@ -56,12 +56,8 @@
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center">
<div class="layui-row"> <input type="hidden" name="wechat_type" value="api">
<div class="layui-col-sm8 layui-col-md6"> <button class="layui-btn" type="submit">保存配置</button>
<input type="hidden" name="wechat_type" value="api">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>

42
application/wechat/view/config/options_help.html
View File

@ -1,7 +1,7 @@
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body" style="padding-left:40px"> <div class="layui-card-body" style="padding-left:40px">
<div class="layui-elem-quote border-0" style="max-width:630px"> <div class="layui-elem-quote border-0">
<p class="font-s14 margin-bottom-10 color-text"> <p class="font-s14 margin-bottom-10 color-text">
<strong>第三方平台授权</strong><br> <strong>第三方平台授权</strong><br>
JSSDK签名测试需要在开放平台配置当前的授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a> JSSDK签名测试需要在开放平台配置当前的授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a>
@ -15,25 +15,27 @@
JSAPI支付测试需要在微信商户平台配置支付目录：<a data-copy="{:url('@wechat/api.tools/','','',true)}">{:url('@wechat/api.tools/','','',true)}</a> JSAPI支付测试需要在微信商户平台配置支付目录：<a data-copy="{:url('@wechat/api.tools/','','',true)}">{:url('@wechat/api.tools/','','',true)}</a>
</p> </p>
</div> </div>
<div class="pull-left padding-right-15 notselect"> <div class="layui-clear">
<img class="notselect" data-tips-image src="{:url('@wechat/api.tools/oauth_qrc')}" style="width:120px"> <div class="pull-left padding-right-15 notselect">
<p class="text-center">网页授权</p> <img class="notselect" data-tips-image src="{:url('@wechat/api.tools/oauth_qrc')}" style="width:120px">
</div> <p class="text-center">网页授权</p>
<div class="pull-left padding-left-0 padding-right-15"> </div>
<img class="notselect" data-tips-image src="{:url('@wechat/api.tools/jssdk_qrc')}" style="width:120px;"> <div class="pull-left padding-left-0 padding-right-15">
<p class="text-center">JSSDK签名</p> <img class="notselect" data-tips-image src="{:url('@wechat/api.tools/jssdk_qrc')}" style="width:120px;">
</div> <p class="text-center">JSSDK签名</p>
<div class="pull-left padding-left-0 padding-right-15"> </div>
<img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/jsapiqrc')}" style="width:120px;"> <div class="pull-left padding-left-0 padding-right-15">
<p class="text-center">JSAPI支付</p> <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/jsapiqrc')}" style="width:120px;">
</div> <p class="text-center">JSAPI支付</p>
<div class="pull-left padding-left-0 padding-right-15"> </div>
<img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/scanoneqrc')}" style="width:120px;"> <div class="pull-left padding-left-0 padding-right-15">
<p class="text-center">扫码支付①</p> <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/scanoneqrc')}" style="width:120px;">
</div> <p class="text-center">扫码支付①</p>
<div class="pull-left padding-left-0"> </div>
<img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/scanqrc')}" style="width:120px;"> <div class="pull-left padding-left-0">
<p class="text-center">扫码支付②</p> <img onerror="this.src='__ROOT__/static/theme/img/wechat/qrc_pay_error.jpg'" class="notselect" data-tips-image src="{:url('@wechat/api.tools/scanqrc')}" style="width:120px;">
<p class="text-center">扫码支付②</p>
</div>
</div> </div>
</div> </div>
</form> </form>

10
application/wechat/view/config/options_thr.html
View File

@ -1,6 +1,6 @@
<form onsubmit="return false" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off"> <form onsubmit="return false" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
<div class="layui-card-body padding-0"> <div class="layui-card-body">
<div class="color-blue padding-left-40 padding-bottom-20"> <div class="color-blue padding-left-40 padding-bottom-20">
使用第三方授权时，需要单独搭建 SERVICE 服务并将域名配置到 WECHAT 文件，二者需要使用 Yar 或 Soap 通信！ 使用第三方授权时，需要单独搭建 SERVICE 服务并将域名配置到 WECHAT 文件，二者需要使用 Yar 或 Soap 通信！
@ -59,12 +59,8 @@
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="layui-form-item text-center"> <div class="layui-form-item text-center">
<div class="layui-row"> <input type="hidden" name="wechat_type" value="thr">
<div class="layui-col-sm8 layui-col-md6"> <button class="layui-btn" type="submit">保存配置</button>
<input type="hidden" name="wechat_type" value="thr">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div>
</div> </div>
</div> </div>

13
application/wechat/view/config/payment.html
View File

@ -1,11 +1,11 @@
{extend name="admin@main"} {extend name="admin@main"}
{block name="content"} {block name="content"}
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off" lay-filter="payment"> <form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card ' autocomplete="off" lay-filter="payment" style="max-width:1000px">
<div class="layui-card-body"> <div class="layui-card-body think-box-shadow padding-bottom-20">
<div class="layui-form-item"> <div class="layui-form-item margin-top-20">
<label class="layui-form-label">MchId<br><span class="nowrap color-desc">微信商户ID</span></label> <label class="layui-form-label">MchId<br><span class="nowrap color-desc">微信商户ID</span></label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="wechat_mch_id" required placeholder="请输入微信商户ID（必填）" value="{:sysconf('wechat_mch_id')}" class="layui-input"> <input name="wechat_mch_id" required placeholder="请输入微信商户ID（必填）" value="{:sysconf('wechat_mch_id')}" class="layui-input">
@ -53,11 +53,8 @@
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<div class="layui-form-item"> <div class="layui-form-item text-center">
<label class="layui-form-label"></label> <button class="layui-btn" type="submit">保存配置</button>
<div class="layui-input-block text-center" style="max-width:300px">
<button class="layui-btn" type="submit">保存配置</button>
</div>
</div> </div>
</div> </div>

149
application/wechat/view/fans/index.html
View File

@ -17,79 +17,78 @@
{/block} {/block}
{block name="content"} {block name="content"}
<div class="think-box-shadow">
<table class="layui-table" lay-skin="line"> <table class="layui-table" lay-skin="line">
<caption class="margin-bottom-10 text-left">{include file='fans/index_search'}</caption> <caption class="margin-bottom-10 text-left">{include file='fans/index_search'}</caption>
<!--{notempty name='list'}--> <!--{notempty name='list'}-->
<thead> <thead>
<tr> <tr>
<th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th> <th class='list-table-check-td think-checkbox'><input data-auto-none data-check-target='.list-check-box' type='checkbox'></th>
<th width="180px" class='text-left nowrap'>微信昵称</th> <th width="180px" class='text-left nowrap'>微信昵称</th>
<th width="180px" class="text-left nowrap">粉丝标签</th> <th width="180px" class="text-left nowrap">粉丝标签</th>
<th width="150px" class='text-left nowrap'>性别语言</th> <th width="150px" class='text-left nowrap'>性别语言</th>
<th width="180px" class='text-left nowrap'>关注时间</th> <th width="180px" class='text-left nowrap'>关注时间</th>
<th width="80px"></th> <th width="80px"></th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<!--{/notempty}--> <!--{/notempty}-->
<tbody> <tbody>
<!--{foreach $list as $key=>$vo}--> <!--{foreach $list as $key=>$vo}-->
<tr> <tr>
<td class='list-table-check-td think-checkbox'> <td class='list-table-check-td think-checkbox'>
<input class="list-check-box" value='{$vo.openid}' type='checkbox'> <input class="list-check-box" value='{$vo.openid}' type='checkbox'>
</td> </td>
<td class='text-left nowrap relative layui-elip'> <td class='text-left nowrap relative layui-elip'>
<img src="{$vo.headimgurl|default=''}" onerror="$(this).remove()" data-tips-image class="inline-block" style="width:40px;height:40px;vertical-align:top;margin-right:5px"> <img src="{$vo.headimgurl|default=''}" onerror="$(this).remove()" data-tips-image class="inline-block" style="width:40px;height:40px;vertical-align:top;margin-right:5px">
<div class="inline-block"> <div class="inline-block">
昵称：{$vo.nickname|default='--'} 昵称：{$vo.nickname|default='--'}
<br>
区域：{$vo.country|default='--'} {$vo.province} {$vo.city}
</div>
</td>
<td class="text-left padding-0">
<div style="max-height:60px;overflow:auto">{foreach $vo.tags as $t}<p><span class="layui-badge layui-bg-cyan margin-right-5">{$t|default='--'}</span></p>{/foreach}</div>
</td>
<td class='text-left nowrap'>
性别：{switch name='vo.sex'}{case value='1'}男{/case}{case value='2'}女{/case}{default}未知{/switch}
<br> <br>
区域：{$vo.country|default='--'} {$vo.province} {$vo.city} 语言：{$vo.language|raw}
</div> </td>
</td> <td class='text-left nowrap'>
<td class="text-left padding-0"> 日期：{$vo.subscribe_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
<div style="max-height:60px;overflow:auto">{foreach $vo.tags as $t}<p><span class="layui-badge layui-bg-cyan margin-right-5">{$t|default='--'}</span></p>{/foreach}</div> </td>
</td> <td class='text-center nowrap'>
<td class='text-left nowrap'> {eq name='vo.subscribe' value='0'}
性别：{switch name='vo.sex'}{case value='1'}男{/case}{case value='2'}女{/case}{default}未知{/switch} <span class="layui-badge">未关注</span>
<br> {else}
语言：{$vo.language|raw} <span class="layui-badge layui-bg-green">已关注</span>
</td> {/eq}
<td class='text-left nowrap'> <br>
日期：{$vo.subscribe_at|format_datetime|str_replace=' ','<br>时间：',###|raw} {eq name='vo.is_black' value='0'}
</td> <span class="layui-badge layui-bg-green">未拉黑</span>
<td class='text-center nowrap'> {else}
{eq name='vo.subscribe' value='0'} <span class="layui-badge">已拉黑</span>
<span class="layui-badge">未关注</span> {/eq}
{else} </td>
<span class="layui-badge layui-bg-green">已关注</span> <td class="nowrap">
{/eq} {eq name='vo.is_black' value='0'}
<br> <!--{if auth("wechat/fans/setblack")}-->
{eq name='vo.is_black' value='0'} <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('setblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/setblack')}">拉 黑</a>
<span class="layui-badge layui-bg-green">未拉黑</span> <!--{/if}-->
{else} {else}
<span class="layui-badge">已拉黑</span> <!--{if auth("wechat/fans/delblack")}-->
{/eq} <a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('delblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/delblack')}">拉 白</a>
</td> <!--{/if}-->
<td class="nowrap"> {/eq}
{eq name='vo.is_black' value='0'} <!--{if auth("wechat/fans/del")}-->
<!--{if auth("wechat/fans/setblack")}--> <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该粉丝吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/fans/del')}">删 除</a>
<a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('setblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/setblack')}">拉 黑</a> <!--{/if}-->
<!--{/if}--> </td>
{else} </tr>
<!--{if auth("wechat/fans/delblack")}--> <!--{/foreach}-->
<a class="margin-left-10 layui-btn layui-btn-normal layui-btn-sm" data-action="{:url('delblack')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('wechat/fans/delblack')}">拉 白</a> </tbody>
<!--{/if}--> </table>
{/eq} {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
<!--{if auth("wechat/fans/del")}--> </div>
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该粉丝吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/fans/del')}">删 除</a> {/block}
<!--{/if}-->
</td>
</tr>
<!--{/foreach}-->
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
{/block}

3
application/wechat/view/keys/form.html
View File

@ -2,7 +2,6 @@
{block name="style"} {block name="style"}
<style> <style>
.keys-container{top:10px}
.keys-container .input-group-addon{top:0;right:0;color:#eee;width:25px;padding:7px;position:absolute;margin-top:-1px;text-align:center;background:#393D49} .keys-container .input-group-addon{top:0;right:0;color:#eee;width:25px;padding:7px;position:absolute;margin-top:-1px;text-align:center;background:#393D49}
.keys-container [data-tips-image]{width:112px;height:auto} .keys-container [data-tips-image]{width:112px;height:auto}
.keys-container .layui-card{width:580px;height:578px;position:absolute;border:1px solid #ccc} .keys-container .layui-card{width:580px;height:578px;position:absolute;border:1px solid #ccc}
@ -11,7 +10,7 @@
{/block} {/block}
{block name="content"} {block name="content"}
<div class="nowrap"> <div class="nowrap think-box-shadow" style="width:910px">
<div class='mobile-preview inline-block'> <div class='mobile-preview inline-block'>
<div class='mobile-header'>公众号</div> <div class='mobile-header'>公众号</div>
<div class='mobile-body'> <div class='mobile-body'>

146
application/wechat/view/keys/index.html
View File

@ -13,83 +13,83 @@
{/block} {/block}
{block name='content'} {block name='content'}
<table class="layui-table" lay-skin="line"> <div class="think-box-shadow">
<caption class="margin-bottom-10 text-left">{include file='keys/index_search'}</caption> <table class="layui-table" lay-skin="line">
<!--{notempty name='list'}--> <caption class="margin-bottom-10 text-left">{include file='keys/index_search'}</caption>
<thead> <!--{notempty name='list'}-->
<tr> <thead>
<th class='list-table-check-td think-checkbox'> <tr>
<input data-auto-none data-check-target='.list-check-box' type='checkbox'/> <th class='list-table-check-td think-checkbox'>
</th> <input data-auto-none data-check-target='.list-check-box' type='checkbox'/>
<th class='list-table-sort-td'> </th>
<button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button> <th class='list-table-sort-td'>
</th> <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
<th class="text-left nowrap">关键字</th> </th>
<th class="text-left nowrap">类型</th> <th class="text-left nowrap">关键字</th>
<th class="text-left nowrap">预览</th> <th class="text-left nowrap">类型</th>
<th class="text-left nowrap">添加时间</th> <th class="text-left nowrap">预览</th>
<th class="text-left nowrap">状态</th> <th class="text-left nowrap">添加时间</th>
<th></th> <th class="text-left nowrap">状态</th>
</tr> <th></th>
</thead> </tr>
<!--{/notempty}--> </thead>
<tbody> <!--{/notempty}-->
{foreach $list as $key=>$vo} <tbody>
<tr> {foreach $list as $key=>$vo}
<td class='list-table-check-td think-checkbox'> <tr>
<input class="list-check-box" value='{$vo.id}' type='checkbox'/> <td class='list-table-check-td think-checkbox'>
</td> <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
<td class='list-table-sort-td'> </td>
<input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"> <td class='list-table-sort-td'>
</td> <input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input">
<td class="text-left nowrap"> </td>
{notempty name='vo.qrc'}<i class="fa fa-qrcode fa-lg pointer margin-right-5" data-load="{$vo.qrc}" data-time="false" data-tips-text="生成关键字二维码"></i>{/notempty} <td class="text-left nowrap">
{$vo.keys} {notempty name='vo.qrc'}<i class="fa fa-qrcode fa-lg pointer margin-right-5" data-load="{$vo.qrc}" data-time="false" data-tips-text="生成关键字二维码"></i>{/notempty}
</td> {$vo.keys}
<td class="text-left nowrap">{$vo.type}</td> </td>
<td class="text-left nowrap"> <td class="text-left nowrap">{$vo.type}</td>
{if $vo.type eq '音乐'} <td class="text-left nowrap">
<a data-phone-view='{:url("@wechat/api.review/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览 <i class="fa fa-eye"></i></a> {if $vo.type eq '音乐'}
{elseif in_array($vo.type,['文字','转客服'])} <a data-phone-view='{:url("@wechat/api.review/music")}?title={$vo.music_title|urlencode}&desc={$vo.music_desc|urlencode}'>预览 <i class="fa fa-eye"></i></a>
<a data-phone-view='{:url("@wechat/api.review/text")}?content={$vo.content|urlencode}'>预览 <i class="fa fa-eye"></i></a> {elseif in_array($vo.type,['文字','转客服'])}
{elseif $vo.type eq '图片'} <a data-phone-view='{:url("@wechat/api.review/text")}?content={$vo.content|urlencode}'>预览 <i class="fa fa-eye"></i></a>
<a data-phone-view='{:url("@wechat/api.review/image")}?content={$vo.image_url|urlencode}'>预览 <i class="fa fa-eye"></i></a> {elseif $vo.type eq '图片'}
{elseif $vo.type eq '图文'} <a data-phone-view='{:url("@wechat/api.review/image")}?content={$vo.image_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
<a data-phone-view='{:url("@wechat/api.review/news/".$vo.news_id)}'>预览 <i class="fa fa-eye"></i></a> {elseif $vo.type eq '图文'}
{elseif $vo.type eq '视频'} <a data-phone-view='{:url("@wechat/api.review/news/".$vo.news_id)}'>预览 <i class="fa fa-eye"></i></a>
<a data-phone-view='{:url("@wechat/api.review/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览 <i class="fa fa-eye"></i></a> {elseif $vo.type eq '视频'}
{elseif $vo.type eq '语音'} <a data-phone-view='{:url("@wechat/api.review/video")}?title={$vo.video_title|urlencode}&desc={$vo.video_desc|urlencode}&url={$vo.video_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
<a data-phone-view='{:url("@wechat/api.review/voice")}?content={$vo.voice_url|urlencode}'>预览 <i class="fa fa-eye"></i></a> {elseif $vo.type eq '语音'}
{else} <a data-phone-view='{:url("@wechat/api.review/voice")}?content={$vo.voice_url|urlencode}'>预览 <i class="fa fa-eye"></i></a>
{$vo.content} {else}
{/if} {$vo.content}
</td> {/if}
<td class="text-left nowrap">{$vo.create_at|format_datetime}</td> </td>
<td class='text-left nowrap'>{if $vo.status eq 0}<span class="color-desc">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}</td> <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
<td class='text-left nowrap'> <td class='text-left nowrap'>{if $vo.status eq 0}<span class="color-desc">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}</td>
<td class='text-left nowrap'>
{if auth("wechat/keys/edit")} {if auth("wechat/keys/edit")}
<a class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a> <a class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
{/if} {/if}
{if $vo.status eq 1 and auth("wechat/keys/forbid")} {if $vo.status eq 1 and auth("wechat/keys/forbid")}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('wechat/keys/forbid')}">禁 用</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('wechat/keys/forbid')}">禁 用</a>
{elseif auth("wechat/keys/resume")} {elseif auth("wechat/keys/resume")}
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('wechat/keys/resume')}">启 用</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('resume')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('wechat/keys/resume')}">启 用</a>
{/if} {/if}
{if auth("wechat/keys/del")} {if auth("wechat/keys/del")}
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该规则吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/keys/del')}">删 除</a> <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该规则吗？" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('wechat/keys/del')}">删 除</a>
{/if} {/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</td>
</tr>
{/foreach}
</tbody>
</table>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div>
{/block} {/block}
{block name="script"} {block name="script"}

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

@ -1,7 +1,7 @@
{extend name="admin@main"} {extend name="admin@main"}
{block name='content'} {block name='content'}
<div id="MenuEditor" class="layui-hide" style="width:915px"> <div id="MenuEditor" class="layui-hide think-box-shadow" style="width:910px">
<div class='mobile-preview inline-block'> <div class='mobile-preview inline-block'>
<div class='mobile-header'>公众号</div> <div class='mobile-header'>公众号</div>
<div class='mobile-body'></div> <div class='mobile-body'></div>
@ -29,7 +29,7 @@
</ul> </ul>
</div> </div>
<div class="absolute inline-block layui-card margin-left-10" style="border:1px solid #ccc;height:578px;width:570px;top:10px"> <div class="absolute inline-block layui-card margin-left-10" style="border:1px solid #ccc;height:578px;width:570px">
<div class="layui-card-header layui-bg-gray text-center">菜单编辑</div> <div class="layui-card-header layui-bg-gray text-center">菜单编辑</div>
<div class="layui-card-body" ng-if="list.length<1"> <div class="layui-card-body" ng-if="list.length<1">
<blockquote class="layui-elem-quote border-0 text-center">请在左侧创建菜单...</blockquote> <blockquote class="layui-elem-quote border-0 text-center">请在左侧创建菜单...</blockquote>

31
application/wechat/view/news/form.html
View File

@ -33,17 +33,17 @@
<form class="layui-form" role="form" name="news" onsubmit="return false"> <form class="layui-form" role="form" name="news" onsubmit="return false">
<label class="layui-form-item relative block"> <label class="layui-form-item relative block">
<span class="help-block">文章标题<sup class="color-red padding-left-5">*</sup></span> <span class="color-green">文章标题</span>
<input maxlength="64" ng-model="item.title" required placeholder="请在这里输入标题" name='title' class="layui-input"> <input maxlength="64" ng-model="item.title" required placeholder="请在这里输入标题" name='title' class="layui-input">
</label> </label>
<label class="layui-form-item relative block"> <label class="layui-form-item relative block">
<span class="help-block">文章作者<sup class="color-red padding-left-5">*</sup></span> <span class="color-green">文章作者</span>
<input maxlength="64" ng-model="item.author" required placeholder="请输入文章作者" name='author' class="layui-input"> <input maxlength="64" ng-model="item.author" required placeholder="请输入文章作者" name='author' class="layui-input">
</label> </label>
<div class="layui-form-item"> <div class="layui-form-item label-required-prev">
<span class="help-block">图文封面大图片<sup class="color-red padding-left-5">*</sup></span> <span class="color-green">图文封面大图片</span>
<div class="layui-clear"> <div class="layui-clear">
<div class="upload-image-box pull-left transition" data-tips-image="{{item.local_url}}" style="{{item.style}}"> <div class="upload-image-box pull-left transition" data-tips-image="{{item.local_url}}" style="{{item.style}}">
<input ng-model="item.local_url" data-auto-none value="{{item.local_url}}" type="hidden" name="local_url"> <input ng-model="item.local_url" data-auto-none value="{{item.local_url}}" type="hidden" name="local_url">
@ -59,8 +59,8 @@
<p class="color-desc">封面大图片建议尺寸 900像素 * 500像素</p> <p class="color-desc">封面大图片建议尺寸 900像素 * 500像素</p>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item label-required-prev">
<span class="help-block">图文文章内容<sup class="color-red padding-left-5">*</sup></span> <span class="color-green">图文文章内容</span>
<textarea ng-model="item.content" name='content'></textarea> <textarea ng-model="item.content" name='content'></textarea>
</div> </div>
@ -225,21 +225,4 @@
</script> </script>
{/block} {/block}
{block name="style"} {block name="style"}{include file='wechat@news/form_style'}{/block}
<style>
.label-required:after{content:''}
.news-left.layui-card .layui-card-header,.news-right.layui-card .layui-card-header{border:none;background:#eee}
.news-left.layui-card .layui-card-body,.news-right.layui-card .layui-card-body{margin-bottom:30px;border:1px solid #eee}
.news-left{left:20px;width:300px;position:absolute}
.news-right{left:330px;right:20px;overflow:hidden;position:absolute}
.news-left .news-item{width:280px;height:150px;cursor:pointer;max-width:270px;overflow:hidden;position:relative;border:1px solid #ccc;background-size:cover;background-position:center center}
.news-left .news-item.active{border:1px solid #44b549!important}
.news-left .article-add{color:#999;display:block;font-size:22px;text-align:center}
.news-left .article-add:hover{color:#666}
.news-left .news-title{bottom:0;color:#fff;width:272px;display:block;padding:0 5px;max-height:6em;overflow:hidden;margin-left:-1px;position:absolute;text-overflow:ellipsis;background:rgba(0,0,0,.7)}
.news-left .news-item a{color:#fff;width:30px;height:30px;float:right;font-size:12px;margin-top:-1px;line-height:34px;text-align:center;margin-right:-1px;background-color:rgba(0,0,0,.5)}
.news-left .news-item:hover a{display:inline-block!important}
.news-left .news-item a:hover{text-decoration:none;background-color:#0C0C0C}
.news-right .upload-image-box{width:130px;height:90px;background:url(__ROOT__/static/plugs/uploader/theme/image.png) no-repeat center center;background-size:cover;border:1px solid rgba(125,125,125,.1)}
</style>
{/block}

99
application/wechat/view/news/form_style.html Normal file
View File

@ -0,0 +1,99 @@
<style>
.label-required:after {
content: ''
}
.news-left.layui-card .layui-card-header, .news-right.layui-card .layui-card-header {
border: none;
background: #eee
}
.news-left.layui-card .layui-card-body, .news-right.layui-card .layui-card-body {
margin-bottom: 30px;
border: 1px solid #eee
}
.news-left {
left: 20px;
width: 300px;
position: absolute
}
.news-right {
left: 330px;
right: 20px;
overflow: hidden;
position: absolute
}
.news-left .news-item {
width: 280px;
height: 150px;
cursor: pointer;
max-width: 270px;
overflow: hidden;
position: relative;
border: 1px solid #ccc;
background-size: cover;
background-position: center center
}
.news-left .news-item.active {
border: 1px solid #44b549 !important
}
.news-left .article-add {
color: #999;
display: block;
font-size: 22px;
text-align: center
}
.news-left .article-add:hover {
color: #666
}
.news-left .news-title {
bottom: 0;
color: #fff;
width: 272px;
display: block;
padding: 0 5px;
max-height: 6em;
overflow: hidden;
margin-left: -1px;
position: absolute;
text-overflow: ellipsis;
background: rgba(0, 0, 0, .7)
}
.news-left .news-item a {
color: #fff;
width: 30px;
height: 30px;
float: right;
font-size: 12px;
margin-top: -1px;
line-height: 34px;
text-align: center;
margin-right: -1px;
background-color: rgba(0, 0, 0, .5)
}
.news-left .news-item:hover a {
display: inline-block !important
}
.news-left .news-item a:hover {
text-decoration: none;
background-color: #0C0C0C
}
.news-right .upload-image-box {
width: 130px;
height: 90px;
background: url(__ROOT__/static/plugs/uploader/theme/image.png) no-repeat center center;
background-size: cover;
border: 1px solid rgba(125, 125, 125, .1)
}
</style>

51
application/wechat/view/news/index.html
View File

@ -5,35 +5,34 @@
{/block} {/block}
{block name='content'} {block name='content'}
<div class="think-box-shadow">
<div id="news-box" class="layui-clear"> <div id="news-box" class="layui-clear">
{foreach $list as $vo} {foreach $list as $vo}
<div class="news-item"> <div class="news-item">
<div class='news-tools layui-hide'> <div class='news-tools layui-hide'>
<a data-phone-view="{:url('@wechat/api.review/news/'.$vo.id)}" href='javascript:void(0)'>预览</a> <a data-phone-view="{:url('@wechat/api.review/news/'.$vo.id)}" href='javascript:void(0)'>预览</a>
<a data-open='{:url("edit")}?id={$vo.id}' href='javascript:void(0)'>编辑</a> <a data-open='{:url("edit")}?id={$vo.id}' href='javascript:void(0)'>编辑</a>
<a data-news-del="{$vo.id}" href='javascript:void(0)'>删除</a> <a data-news-del="{$vo.id}" href='javascript:void(0)'>删除</a>
</div>
{foreach $vo.articles as $k => $v}
{if $k < 1}
<div data-tips-image='{$v.local_url}' class='news-articel-item' style='background-image:url("{$v.local_url}")'>
{if $v.title}<p>{$v.title}</p>{/if}
</div>
<div class="hr-line-dashed"></div>
{else}
<div class='news-articel-item other'>
<span>{$v.title}</span>
<div data-tips-image='{$v.local_url}' style='background-image:url("{$v.local_url}");'></div>
</div>
<div class="hr-line-dashed"></div>
{/if}
{/foreach}
</div> </div>
{foreach $vo.articles as $k => $v}
{if $k < 1}
<div data-tips-image='{$v.local_url}' class='news-articel-item' style='background-image:url("{$v.local_url}")'>
{if $v.title}<p>{$v.title}</p>{/if}
</div>
<div class="hr-line-dashed"></div>
{else}
<div class='news-articel-item other'>
<span>{$v.title}</span>
<div data-tips-image='{$v.local_url}' style='background-image:url("{$v.local_url}");'></div>
</div>
<div class="hr-line-dashed"></div>
{/if}
{/foreach} {/foreach}
</div> </div>
{/foreach} {empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
</div> </div>
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
{/block} {/block}
{block name='script'} {block name='script'}
@ -81,4 +80,4 @@
#news-box .news-tools{top:0;z-index:80;color:#fff;width:302px;padding:0 5px;margin-left:-6px;line-height:38px;text-align:right;position:absolute;background:rgba(0,0,0,.7)} #news-box .news-tools{top:0;z-index:80;color:#fff;width:302px;padding:0 5px;margin-left:-6px;line-height:38px;text-align:right;position:absolute;background:rgba(0,0,0,.7)}
#news-box .news-tools a{color:#fff;margin-left:10px} #news-box .news-tools a{color:#fff;margin-left:10px}
</style> </style>
{/block} {/block}

95
public/static/admin.js
View File

@ -10,20 +10,20 @@
// | github开源项目：https://github.com/zoujingli/framework // | github开源项目：https://github.com/zoujingli/framework
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// IE兼容提示 // 浏览器兼容提示
(function (w) { (function (w) {
if (!("WebSocket" in w && 2 === w.WebSocket.CLOSING)) { if (!("WebSocket" in w && 2 === w.WebSocket.CLOSING)) {
document.body.innerHTML = '<div class="version-debug">您使用的浏览器已经<strong>过时</strong>，建议使用最新版本的谷歌浏览器。<a target="_blank" href="https://pc.qq.com/detail/1/detail_2661.html" class="layui-btn layui-btn-primary">立即下载</a></div>'; document.body.innerHTML = '<div class="version-debug">您使用的浏览器已经<strong>过时</strong>，建议使用最新版本的谷歌浏览器。<a target="_blank" href="https://pc.qq.com/detail/1/detail_2661.html" class="layui-btn layui-btn-primary">立即下载</a></div>';
} }
}(window)); }(window));
// Layui及jQuery兼容处理 // Layui & jQuery
if (typeof jQuery === 'undefined') window.$ = window.jQuery = layui.$; if (typeof jQuery === 'undefined') window.$ = window.jQuery = layui.$;
window.form = layui.form, window.layer = layui.layer, window.laydate = layui.laydate; window.form = layui.form, window.layer = layui.layer, window.laydate = layui.laydate;
// 当前资源URL目录 // 当前资源URL目录
window.baseRoot = (function () { window.baseRoot = (function (src) {
var src = document.scripts[document.scripts.length - 1].src; src = document.scripts[document.scripts.length - 1].src;
return src.substring(0, src.lastIndexOf("/") + 1); return src.substring(0, src.lastIndexOf("/") + 1);
})(); })();
@ -63,8 +63,8 @@ define('jquery', [], function () {
$(function () { $(function () {
window.$body = $('body'); window.$body = $('body');
/*! 消息组件实例 */ /*! 消息组件实例 */
$.msg = new function () { $.msg = new function (that) {
var that = this; that = this;
this.indexs = []; this.indexs = [];
this.shade = [0.02, '#000']; this.shade = [0.02, '#000'];
// 关闭消息框 // 关闭消息框
@ -124,8 +124,8 @@ $(function () {
}; };
/*! 表单自动化组件 */ /*! 表单自动化组件 */
$.form = new function () { $.form = new function (that) {
var that = this; that = this;
// 内容区选择器 // 内容区选择器
this.selecter = '.layui-layout-admin>.layui-body'; this.selecter = '.layui-layout-admin>.layui-body';
// 刷新当前页面 // 刷新当前页面
@ -138,14 +138,18 @@ $(function () {
$dom = $dom || $(this.selecter); $dom = $dom || $(this.selecter);
$dom.find('[required]').map(function ($parent) { $dom.find('[required]').map(function ($parent) {
if (($parent = $(this).parent()) && $parent.is('label')) { if (($parent = $(this).parent()) && $parent.is('label')) {
$parent.addClass('label-required-prev') $parent.addClass('label-required-prev');
} else { } else {
$parent.prevAll('label').addClass('label-required-next') $parent.prevAll('label').addClass('label-required-next');
} }
}); });
$dom.find('[data-date-range]').map(function () { $dom.find('input[data-date-range]').map(function () {
laydate.render({range: true, elem: this});
this.setAttribute('autocomplete', 'off'); this.setAttribute('autocomplete', 'off');
laydate.render({
range: true, elem: this, done: function (value) {
$(this.elem).val(value).trigger('change');
}
});
}); });
$dom.find('[data-file]:not([data-inited])').map(function (index, elem, $this, field) { $dom.find('[data-file]:not([data-inited])').map(function (index, elem, $this, field) {
$this = $(elem), field = $this.attr('data-field') || 'file'; $this = $(elem), field = $this.attr('data-field') || 'file';
@ -163,12 +167,11 @@ $(function () {
that.reInit($(that.selecter)); that.reInit($(that.selecter));
}, 500); }, 500);
}; };
// 以hash打开网页 // 以HASH打开新网页
this.href = function (url, obj) { this.href = function (url, obj) {
if (url !== '#') window.location.href = '#' + $.menu.parseUri(url, obj); if (url !== '#') window.location.href = '#' + $.menu.parseUri(url, obj);
else if (obj && obj.getAttribute('data-menu-node')) { else if (obj && obj.getAttribute('data-menu-node')) {
var node = obj.getAttribute('data-menu-node'); $('[data-menu-node^="' + obj.getAttribute('data-menu-node') + '-"][data-open!="#"]:first').trigger('click');
$('[data-menu-node^="' + node + '-"][data-open!="#"]:first').trigger('click');
} }
}; };
// 异步加载的数据 // 异步加载的数据
@ -197,17 +200,17 @@ $(function () {
// 加载HTML到目标位置 // 加载HTML到目标位置
this.open = function (url, data, callback, loading, tips) { this.open = function (url, data, callback, loading, tips) {
this.load(url, data, 'get', function (ret) { this.load(url, data, 'get', function (ret) {
return typeof ret === 'object' ? $.msg.auto(ret) : that.show(ret); return (typeof ret === 'object' ? $.msg.auto(ret) : that.show(ret)), false;
}, loading, tips); }, loading, tips);
}; };
// 打开一个iframe窗口 // 打开一个iframe窗口
this.iframe = function (url, title, area) { this.iframe = function (url, title, area) {
return layer.open({title: title || '窗口', type: 2, area: area || ['800px', '550px'], fix: true, maxmin: false, content: url}); return layer.open({title: title || '窗口', type: 2, area: area || ['800px', '580px'], fix: true, maxmin: false, content: url});
}; };
// 加载HTML到弹出层 // 加载HTML到弹出层
this.modal = function (url, data, title, callback, loading, tips) { this.modal = function (url, data, title, callback, loading, tips) {
this.load(url, data, 'GET', function (res) { this.load(url, data, 'GET', function (res) {
if (typeof (res) === 'object') return $.msg.auto(res); if (typeof (res) === 'object') return $.msg.auto(res), false;
var index = layer.open({ var index = layer.open({
type: 1, btn: false, area: "800px", content: res, title: title || '', success: function (dom, index) { type: 1, btn: false, area: "800px", content: res, title: title || '', success: function (dom, index) {
$(dom).find('[data-close]').off('click').on('click', function () { $(dom).find('[data-close]').off('click').on('click', function () {
@ -220,14 +223,14 @@ $(function () {
} }
}); });
$.msg.indexs.push(index); $.msg.indexs.push(index);
return (typeof callback === 'function') && callback.call(this); return (typeof callback === 'function') && callback.call(that);
}, loading, tips); }, loading, tips);
}; };
}; };
/*! 后台菜单辅助插件 */ /*! 后台菜单辅助插件 */
$.menu = new function () { $.menu = new function (that) {
var self = this; that = this;
// 计算URL地址中有效的URI // 计算URL地址中有效的URI
this.getUri = function (uri) { this.getUri = function (uri) {
uri = uri || window.location.href; uri = uri || window.location.href;
@ -250,7 +253,7 @@ $(function () {
var attrs = uri.split('?')[1].split('&'); var attrs = uri.split('?')[1].split('&');
for (var i in attrs) if (attrs[i].indexOf('=') > -1) { for (var i in attrs) if (attrs[i].indexOf('=') > -1) {
var tmp = attrs[i].split('=').slice(); var tmp = attrs[i].split('=').slice();
params[tmp[0]] = decodeURI(tmp[1].replace(/%2B/ig, '%20')); params[tmp[0]] = decodeURIComponent(tmp[1].replace(/%2B/ig, '%20'));
} }
} }
delete params[""]; delete params[""];
@ -282,7 +285,7 @@ $(function () {
})($('.layui-layout-admin'), 'layui-layout-left-mini'); })($('.layui-layout-admin'), 'layui-layout-left-mini');
// 左则二级菜单展示 // 左则二级菜单展示
$('[data-submenu-layout]>a').on('click', function () { $('[data-submenu-layout]>a').on('click', function () {
self.syncOpenStatus(1); that.syncOpenStatus(1);
}); });
// 同步二级菜单展示状态 // 同步二级菜单展示状态
this.syncOpenStatus = function (mode) { this.syncOpenStatus = function (mode) {
@ -295,9 +298,9 @@ $(function () {
window.onhashchange = function () { window.onhashchange = function () {
var hash = window.location.hash || ''; var hash = window.location.hash || '';
if (hash.length < 1) return $('[data-menu-node][data-open!="#"]:first').trigger('click'); if (hash.length < 1) return $('[data-menu-node][data-open!="#"]:first').trigger('click');
$.form.load(hash), self.syncOpenStatus(2); $.form.load(hash), that.syncOpenStatus(2);
// 菜单选择切换 // 菜单选择切换
var node = self.queryNode(self.getUri()); var node = that.queryNode(that.getUri());
if (/^m-/.test(node)) { if (/^m-/.test(node)) {
var $all = $('a[data-menu-node]').parent(), tmp = node.split('-'), tmpNode = tmp.shift(); var $all = $('a[data-menu-node]').parent(), tmp = node.split('-'), tmpNode = tmp.shift();
while (tmp.length > 0) { while (tmp.length > 0) {
@ -312,7 +315,7 @@ $(function () {
$('[data-menu-node="' + node + '"]').parent().parent().parent().addClass('layui-nav-itemed'); $('[data-menu-node="' + node + '"]').parent().parent().parent().addClass('layui-nav-itemed');
$('.layui-layout-admin').removeClass('layui-layout-left-hide'); $('.layui-layout-admin').removeClass('layui-layout-left-hide');
} else $('.layui-layout-admin').addClass('layui-layout-left-hide'); } else $('.layui-layout-admin').addClass('layui-layout-left-hide');
self.syncOpenStatus(1); that.syncOpenStatus(1);
} }
}; };
// URI初始化动作 // URI初始化动作
@ -322,8 +325,8 @@ $(function () {
/*! 注册对象到Jq */ /*! 注册对象到Jq */
$.vali = function (form, callback, options) { $.vali = function (form, callback, options) {
return (new function () { return (new function (that) {
var that = this; that = this;
// 表单元素 // 表单元素
this.tags = 'input,textarea,select'; this.tags = 'input,textarea,select';
// 检测元素事件 // 检测元素事件
@ -344,17 +347,16 @@ $(function () {
}; };
// 判断表单元素是否为空 // 判断表单元素是否为空
this.isEmpty = function (ele, value) { this.isEmpty = function (ele, value) {
var trimValue = this.trim(ele.value); var trim = this.trim(ele.value);
value = value || ele.getAttribute('placeholder'); value = value || ele.getAttribute('placeholder');
return (trimValue === "" || trimValue === value); return (trim === "" || trim === value);
}; };
// 正则验证表单元素 // 正则验证表单元素
this.isRegex = function (ele, regex, params) { this.isRegex = function (ele, regex, params) {
var inputValue = $(ele).val(); var input = $(ele).val(), real = this.trim(input);
var realValue = this.trim(inputValue);
regex = regex || ele.getAttribute('pattern'); regex = regex || ele.getAttribute('pattern');
if (realValue === "" || !regex) return true; if (real === "" || !regex) return true;
return new RegExp(regex, params || 'i').test(realValue); return new RegExp(regex, params || 'i').test(real);
}; };
// 检侧所的表单元素 // 检侧所的表单元素
this.checkAllInput = function () { this.checkAllInput = function () {
@ -584,8 +586,7 @@ $(function () {
/*! 注册 data-action 事件行为 */ /*! 注册 data-action 事件行为 */
$body.on('click', '[data-action]', function () { $body.on('click', '[data-action]', function () {
var $this = $(this), data = {}; var $this = $(this), data = {}, time = $this.attr('data-time'), action = $this.attr('data-action');
var time = $this.attr('data-time'), action = $this.attr('data-action');
var loading = $this.attr('data-loading'), method = $this.attr('data-method') || 'post'; var loading = $this.attr('data-loading'), method = $this.attr('data-method') || 'post';
var rule = $this.attr('data-value') || (function (rule, ids) { var rule = $this.attr('data-value') || (function (rule, ids) {
$($this.attr('data-target') || 'input[type=checkbox].list-check-box').map(function () { $($this.attr('data-target') || 'input[type=checkbox].list-check-box').map(function () {
@ -662,6 +663,13 @@ $(function () {
}, 100); }, 100);
}; };
/*! 注册 data-tips-text 事件行为 */
$body.on('mouseenter', '[data-tips-text]', function () {
$(this).attr('index', layer.tips($(this).attr('data-tips-text'), this, {tips: [$(this).attr('data-tips-type') || 3, '#78BA32']}));
}).on('mouseleave', '[data-tips-text]', function () {
layer.close($(this).attr('index'));
});
/*! 注册 data-tips-image 事件行为 */ /*! 注册 data-tips-image 事件行为 */
$body.on('click', '[data-tips-image]', function () { $body.on('click', '[data-tips-image]', function () {
$.previewImage(this.getAttribute('data-tips-image') || this.src, this.getAttribute('data-width')); $.previewImage(this.getAttribute('data-tips-image') || this.src, this.getAttribute('data-width'));
@ -692,13 +700,6 @@ $(function () {
layer.style(layer.open({type: true, scrollbar: false, area: ['320px', '600px'], title: false, closeBtn: true, shadeClose: false, skin: 'layui-layer-nobg', content: $(tpl.replace('_TITLE_', title || '公众号').replace('_URL_', href)).html(),}), {boxShadow: 'none'}); layer.style(layer.open({type: true, scrollbar: false, area: ['320px', '600px'], title: false, closeBtn: true, shadeClose: false, skin: 'layui-layer-nobg', content: $(tpl.replace('_TITLE_', title || '公众号').replace('_URL_', href)).html(),}), {boxShadow: 'none'});
}; };
/*! 注册 data-tips-text 事件行为 */
$body.on('mouseenter', '[data-tips-text]', function () {
$(this).attr('index', layer.tips($(this).attr('data-tips-text'), this, {tips: [$(this).attr('data-tips-type') || 3, '#78BA32']}));
}).on('mouseleave', '[data-tips-text]', function () {
layer.close($(this).attr('index'));
});
/*! 表单编辑返回操作 */ /*! 表单编辑返回操作 */
$body.on('click', '[data-history-back]', function () { $body.on('click', '[data-history-back]', function () {
var title = this.getAttribute('data-history-back') || '确定要返回上一页吗？'; var title = this.getAttribute('data-history-back') || '确定要返回上一页吗？';
@ -725,6 +726,14 @@ $(function () {
}); });
}); });
/*! 图片加载异常处理 */
document.addEventListener('error', function (e, elem) {
elem = e.target;
if (elem.tagName.toLowerCase() === 'img') {
elem.src = baseRoot + 'theme/img/404_icon.png';
}
}, true);
/*! 初始化事件 */ /*! 初始化事件 */
$.menu.listen(); $.menu.listen();
$.vali.listen(); $.vali.listen();

9
public/static/plugs/ckeditor/config.js
View File

@ -21,7 +21,7 @@ CKEDITOR.plugins.add("uimage", {
init: function (editor) { init: function (editor) {
editor.ui.addButton("UploadImage", {label: "上传本地图片", command: 'uimage', icon: 'image', toolbar: 'insert,10'}); editor.ui.addButton("UploadImage", {label: "上传本地图片", command: 'uimage', icon: 'image', toolbar: 'insert,10'});
setTimeout(function () { setTimeout(function () {
$('.cke_button__uploadimage_label').parent().map(function () { $('#cke_' + editor.name).find('.cke_button__uploadimage_label').parent().map(function () {
$(this).attr('data-type', 'png,jpg,gif').uploadFile(function (url) { $(this).attr('data-type', 'png,jpg,gif').uploadFile(function (url) {
editor.insertElement(CKEDITOR.dom.element.createFromHtml('<img style="max-width:100%" src="' + url + '" border="0" title="image">')); editor.insertElement(CKEDITOR.dom.element.createFromHtml('<img style="max-width:100%" src="' + url + '" border="0" title="image">'));
}); });
@ -35,7 +35,7 @@ CKEDITOR.plugins.add('umusic', {
init: function (editor) { init: function (editor) {
editor.ui.addButton("UploadMusic", {label: "上传MP3文件", command: 'umusic', icon: 'specialchar', toolbar: 'insert,10'}); editor.ui.addButton("UploadMusic", {label: "上传MP3文件", command: 'umusic', icon: 'specialchar', toolbar: 'insert,10'});
setTimeout(function () { setTimeout(function () {
$('.cke_button__uploadmusic_label').parent().map(function () { $('#cke_' + editor.name).find('.cke_button__uploadmusic_label').parent().map(function () {
$(this).attr('data-type', 'mp3').uploadFile(function (url) { $(this).attr('data-type', 'mp3').uploadFile(function (url) {
editor.insertElement(CKEDITOR.dom.element.createFromHtml('<audio controls="controls"><source src="' + url + '" type="audio/mpeg"></audio>')); editor.insertElement(CKEDITOR.dom.element.createFromHtml('<audio controls="controls"><source src="' + url + '" type="audio/mpeg"></audio>'));
}); });
@ -49,7 +49,7 @@ CKEDITOR.plugins.add('uvideo', {
init: function (editor) { init: function (editor) {
editor.ui.addButton("UploadVideo", {label: "上传MP4文件", command: 'uvideo', icon: 'flash', toolbar: 'insert,10'}); editor.ui.addButton("UploadVideo", {label: "上传MP4文件", command: 'uvideo', icon: 'flash', toolbar: 'insert,10'});
setTimeout(function () { setTimeout(function () {
$('.cke_button__uploadvideo_label').parent().map(function () { $('#cke_' + editor.name).find('.cke_button__uploadvideo_label').parent().map(function () {
$(this).attr('data-type', 'mp4').uploadFile(function (url) { $(this).attr('data-type', 'mp4').uploadFile(function (url) {
editor.insertElement(CKEDITOR.dom.element.createFromHtml('<video width="100%" controls="controls"><source src="' + url + '" type="audio/mp4"></video>')); editor.insertElement(CKEDITOR.dom.element.createFromHtml('<video width="100%" controls="controls"><source src="' + url + '" type="audio/mp4"></video>'));
}); });
@ -71,5 +71,4 @@ CKEDITOR.plugins.add('uhtml', {
} }
}); });
} }
}); });

30
public/static/plugs/jquery/area/area.js vendored Normal file
View File

@ -0,0 +1,30 @@
/* PCAS (Province City Area Selector 省、市、地区联动选择JS封装类) Ver 2.02 完整版 *\
制作时间:2005-12-30
更新时间:2006-01-24
数据修正:2012-01-17（截止2011年10月31日）
演示地址:http://www.popub.net/script/pcasunzip.html
下载地址:http://www.popub.net/script/pcasunzip.js
应用说明:页面包含<script type="text/javascript" src="pcasunzip.js" charset="gb2312"></script>
省市联动
new PCAS("Province","City")
new PCAS("Province","City","吉林省")
new PCAS("Province","City","吉林省","吉林市")
省市地区联动
new PCAS("Province","City","Area")
new PCAS("Province","City","Area","吉林省")
new PCAS("Province","City","Area","吉林省","松原市")
new PCAS("Province","City","Area","吉林省","松原市","宁江区")
省、市、地区对象取得的值均为实际值。
注：省、市、地区提示信息选项的值为""(空字符串)
\*** 程序制作/版权所有:崔永祥(333) E-Mail:zhadan007@21cn.com 网址:http://www.popub.net ***/
SPT = "-省份-";
SCT = "-城市-";
SAT = "-地区-";
ShowT = 0; /* 提示文字 0:不显示 1:显示 */
PCAD = "__STRING__";
if (ShowT)PCAD = SPT + "$" + SCT + "," + SAT + "#" + PCAD; PCAArea = []; PCAP = []; PCAC = []; PCAA = []; PCAN = PCAD.split("#"); for (i = 0; i < PCAN.length; i++){PCAA[i] = []; TArea = PCAN[i].split("$")[1].split("|"); for (j = 0; j < TArea.length; j++){PCAA[i][j] = TArea[j].split(","); if (PCAA[i][j].length == 1)PCAA[i][j][1] = SAT; TArea[j] = TArea[j].split(",")[0]}PCAArea[i] = PCAN[i].split("$")[0] + "," + TArea.join(","); PCAP[i] = PCAArea[i].split(",")[0]; PCAC[i] = PCAArea[i].split(',')}function PCAS(){this.SelP = document.getElementsByName(arguments[0])[0]; this.SelC = document.getElementsByName(arguments[1])[0]; this.SelA = document.getElementsByName(arguments[2])[0]; this.DefP = this.SelA?arguments[3]:arguments[2]; this.DefC = this.SelA?arguments[4]:arguments[3]; this.DefA = this.SelA?arguments[5]:arguments[4]; this.SelP.PCA = this; this.SelC.PCA = this; this.SelP.onchange = function(){PCAS.SetC(this.PCA)}; if (this.SelA)this.SelC.onchange = function(){PCAS.SetA(this.PCA)}; PCAS.SetP(this)}; PCAS.SetP = function(PCA){for (i = 0; i < PCAP.length; i++){PCAPT = PCAPV = PCAP[i]; if (PCAPT == SPT)PCAPV = ""; PCA.SelP.options.add(new Option(PCAPT, PCAPV)); if (PCA.DefP == PCAPV)PCA.SelP[i].selected = true}PCAS.SetC(PCA)}; PCAS.SetC = function(PCA){PI = PCA.SelP.selectedIndex; PCA.SelC.length = 0; for (i = 1; i < PCAC[PI].length; i++){PCACT = PCACV = PCAC[PI][i]; if (PCACT == SCT)PCACV = ""; PCA.SelC.options.add(new Option(PCACT, PCACV)); if (PCA.DefC == PCACV)PCA.SelC[i - 1].selected = true}if (PCA.SelA)PCAS.SetA(PCA)}; PCAS.SetA = function(PCA){PI = PCA.SelP.selectedIndex; CI = PCA.SelC.selectedIndex; PCA.SelA.length = 0; for (i = 1; i < PCAA[PI][CI].length; i++){PCAAT = PCAAV = PCAA[PI][CI][i]; if (PCAAT == SAT)PCAAV = ""; PCA.SelA.options.add(new Option(PCAAT, PCAAV)); if (PCA.DefA == PCAAV)PCA.SelA[i - 1].selected = true} try{$(PCA.SelA).trigger('change')} catch (e){}}

6191
public/static/plugs/jquery/area/area.json Normal file
View File

File diff suppressed because it is too large Load Diff

18
public/static/plugs/jquery/area/area.php Normal file
View File

@ -0,0 +1,18 @@
<?php
$data = [];
$list = json_decode(file_get_contents(__DIR__ . '/area.json'), true);
foreach ($list as $citys) {
$lines = [];
foreach ($citys['list'] as $area) {
$lines[] = $area['name'] . ',' . join(',', $area['list']);
}
$data[] = $citys['name'] . '$' . join('|', $lines);
}
$filename = dirname(__DIR__) . '/pcasunzips.js';
$content = str_replace('__STRING__', join('#', $data), file_get_contents(__DIR__ . '/area.js'));
if (file_put_contents($filename, $content)) {
echo 'success';
} else {
echo 'error';
}

6
public/static/plugs/jquery/pcasunzips.js vendored
View File

File diff suppressed because one or more lines are too long

39
public/static/theme/css/console.css
View File

@ -12,20 +12,21 @@
// | github开源项目：https://github.com/zoujingli/framework // | github开源项目：https://github.com/zoujingli/framework
// +--------------------------------------------------------------------*/ // +--------------------------------------------------------------------*/
::-webkit-input-placeholder {color: #aaa} ::-webkit-input-placeholder{color:#aaa}
::-webkit-scrollbar {width: 3px;height: 3px} ::-webkit-scrollbar{width:3px;height:3px}
::-webkit-scrollbar-track {background: #ccc !important} ::-webkit-scrollbar-track{background:#ccc!important}
::-webkit-scrollbar-thumb {background-color: #666 !important} ::-webkit-scrollbar-thumb{background-color:#666!important}
::selection {color: #fff !important;background-color: #ec494e !important} ::selection{color:#fff!important;background-color:#ec494e!important}
::-moz-selection {color: #fff !important;background-color: #ec494e !important} ::-moz-selection{color:#fff!important;background-color:#ec494e!important}
:-webkit-autofill, :-webkit-autofill:active, :-webkit-autofill:focus, :-webkit-autofill:hover {box-shadow: 0 2px 3px 0 rgba(0, 0, 0, .1) inset !important;-webkit-transition: color 9999s ease-out, background-color 9999s ease-out !important;-webkit-transition-delay: 9999s !important;-webkit-text-fill-color: #333 !important} :-webkit-autofill, :-webkit-autofill:active, :-webkit-autofill:focus, :-webkit-autofill:hover{box-shadow:0 2px 3px 0 rgba(0, 0, 0, .1) inset!important;-webkit-transition:color 9999s ease-out, background-color 9999s ease-out!important;-webkit-transition-delay:9999s!important;-webkit-text-fill-color:#333!important}
body{color:#333;font-size:12px;font-family:'\5FAE\8F6F\96C5\9ED1','Microsoft YaHei','Helvetica Neue','Luxi Sans','DejaVu Sans','Hiragino Sans GB',serif} body{color:#333;font-size:12px;font-family:'\5FAE\8F6F\96C5\9ED1','Microsoft YaHei','Helvetica Neue','Luxi Sans','DejaVu Sans','Hiragino Sans GB',serif}
a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}.moxie-shim{display:none!important} a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}.moxie-shim{display:none!important}
.version-debug{width:100%;color:#fff;height:100px;font-size:20px;text-align:center;line-height:100px;margin-bottom:40px;background-color:#E90D24} .version-debug{width:100%;color:#fff;height:100px;font-size:20px;text-align:center;line-height:100px;margin-bottom:40px;background-color:#E90D24}
/* 页面布局 - 全局 */ /* 页面布局 - 全局 */
.layui-layout>.layui-body,.layui-layout>.layui-side{top:50px;bottom:0;overflow:auto}
.layui-layout>.layui-body>.layui-card{box-shadow:none} .layui-layout>.layui-body>.layui-card{box-shadow:none}
.layui-layout>.layui-body>.layui-card>.layui-card-header{height:50px;border:none;line-height:50px;box-shadow:0 2px 3px 0 rgba(0,0,0,.1)} .layui-layout>.layui-body>.layui-card>.layui-card-body{padding:15px 15px}
.layui-layout>.layui-body,.layui-layout>.layui-side{top:50px;bottom:0;overflow:auto}
.layui-layout>.layui-body>.layui-card>.layui-card-header{height:50px;border:none;line-height:50px;box-shadow:0 2px 3px 0 rgba(0,0,0,.1);background:#fff}
/* 页面布局 - 头部 */ /* 页面布局 - 头部 */
.layui-header{height:50px;background:#009688!important} .layui-header{height:50px;background:#009688!important}
.layui-header .layui-layout-left,.layui-header .layui-layout-right{padding:0} .layui-header .layui-layout-left,.layui-header .layui-layout-right{padding:0}
@ -58,7 +59,7 @@ a{color:#06C;cursor:pointer}a:hover{color:#039}input::-ms-clear{display:none}.mo
.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item .layui-nav-child{padding:0;display:block!important;background-color:rgba(0,0,0,.3)!important} .layui-layout.layui-layout-left-mini>.layui-side .layui-nav-item .layui-nav-child{padding:0;display:block!important;background-color:rgba(0,0,0,.3)!important}
.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-tree-top i{display:inline-block;-webkit-transform:rotate(180deg);transform:rotate(180deg);-ms-transform:rotate(180deg)} .layui-layout.layui-layout-left-mini>.layui-side .layui-nav-tree-top i{display:inline-block;-webkit-transform:rotate(180deg);transform:rotate(180deg);-ms-transform:rotate(180deg)}
.layui-layout.layui-layout-left-mini>.layui-side .layui-nav-more{display:none!important} .layui-layout.layui-layout-left-mini>.layui-side .layui-nav-more{display:none!important}
/* 下拉 */ /* 下拉样式 */
.layui-nav .layui-nav-item .layui-nav-more{top:0;border:none;right:15px;width:auto;height:auto;margin-top:0;font-size:14px;font-style:normal;font-family:layui-icon!important;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased} .layui-nav .layui-nav-item .layui-nav-more{top:0;border:none;right:15px;width:auto;height:auto;margin-top:0;font-size:14px;font-style:normal;font-family:layui-icon!important;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}
.layui-nav .layui-nav-item .layui-nav-mored,.layui-nav .layui-nav-itemed .layui-nav-more{border:none;margin-top:0;transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)} .layui-nav .layui-nav-item .layui-nav-mored,.layui-nav .layui-nav-itemed .layui-nav-more{border:none;margin-top:0;transform:rotate(180deg);-o-transform:rotate(180deg);-ms-transform:rotate(180deg);-moz-transform:rotate(180deg);-webkit-transform:rotate(180deg)}
.layui-nav .layui-nav-item .layui-nav-more::before{content:"\e619"} .layui-nav .layui-nav-item .layui-nav-more::before{content:"\e619"}
@ -99,9 +100,9 @@ fieldset{margin:0;border:1px solid #e6e6e6;padding:10px 20px 5px 20px}
/* 分隔线条 */ /* 分隔线条 */
.hr-line-dashed{color:#fff;height:1px;margin:20px 0;background-color:#fff;border-top:1px dashed #e7eaec} .hr-line-dashed{color:#fff;height:1px;margin:20px 0;background-color:#fff;border-top:1px dashed #e7eaec}
.hr-line-solid{margin-top:15px;margin-bottom:15px;border-bottom:1px solid #e7eaec;background-color:rgba(0,0,0,0)} .hr-line-solid{margin-top:15px;margin-bottom:15px;border-bottom:1px solid #e7eaec;background-color:rgba(0,0,0,0)}
.label-required-prev{text-indent:-5px} .label-required-prev:before{width:1em;margin-left:-0.8em;color:red;content:'*';display:inline-block;position:absolute;text-align:left;font-weight:700;line-height:1.6em}
.label-required-prev:before{width:5px;color:red;content:'*';display:inline-block;position:relative;text-align:left;font-weight:700;line-height:1.8em} .label-required:after,.label-required-next:after{top:6px;right:5px;color:red;content:'*';position:absolute;margin-left:4px;font-weight:700;line-height:1.8em}
.label-required-next:after{top:6px;right:5px;color:red;content:'*';position:absolute;margin-left:4px;font-weight:700;line-height:1.8em} .label-required-null:before,.label-required-null:before{content:none!important}
/* 通用分页 */ /* 通用分页 */
.pagination-container{line-height:40px} .pagination-container{line-height:40px}
.pagination-container>span{color:#666;font-size:9pt} .pagination-container>span{color:#666;font-size:9pt}
@ -119,20 +120,22 @@ fieldset{margin:0;border:1px solid #e6e6e6;padding:10px 20px 5px 20px}
.uploadimagemtl:hover a{cursor:pointer;display:inline-block} .uploadimagemtl:hover a{cursor:pointer;display:inline-block}
.uploadimagemtl:hover a:hover{color:#fff;text-decoration:none} .uploadimagemtl:hover a:hover{color:#fff;text-decoration:none}
/** Layui样式调整 */ /** Layui样式调整 */
.layui-btn-sm.layui-btn-primary{line-height:28px}
.layui-btn-xs.layui-btn-primary{line-height:20px}
.layui-input,.layui-select{line-height:38px} .layui-input,.layui-select{line-height:38px}
.layui-table td,.layui-table th{font-size:12px} .layui-table td,.layui-table th{font-size:12px}
.layui-btn-sm.layui-btn-primary{line-height:28px}
.layui-btn-xs.layui-btn-primary{line-height:20px}
.laydate-footer-btns span{line-height:24px!important}
.layui-table td .text-explode{color:#ccc!important;margin:0 4px!important} .layui-table td .text-explode{color:#ccc!important;margin:0 4px!important}
.layui-table td .text-explode:first-child{display:none;opacity:0} .layui-table td .text-explode:first-child{display:none;opacity:0}
.layui-table td .background-image{float:left;width:40px;height:40px;display:inline-block;margin-right:5px;background:no-repeat center center;background-size:cover;vertical-align:middle} .layui-table td .background-image{float:left;width:40px;height:40px;display:inline-block;margin-right:5px;background:no-repeat center center;background-size:cover;vertical-align:middle}
.layui-table .list-table-image{width:22px;cursor:pointer} .layui-table .list-table-image{width:22px;cursor:pointer}
.layui-table .list-table-sort-td{width:60px!important;text-align:center!important} .layui-table .list-table-sort-td{width:10px!important;text-align:center!important;padding-left:5px!important;padding-right:5px!important}
.layui-table .list-table-sort-td button{width:56px;background:#009688} .layui-table .list-table-sort-td button{width:56px;background:#009688}
.layui-table .list-table-sort-td input{width:50px;color:#666;padding:2px;border:1px solid #e6e6e6;text-align:center;font-size:9pt;line-height:18px} .layui-table .list-table-sort-td input{width:50px;color:#666;padding:2px;border:1px solid #e6e6e6;text-align:center;font-size:9pt;line-height:18px}
.layui-table .list-table-check-td{width:30px!important;text-align:center} .layui-table .list-table-check-td{width:10px!important;text-align:center;padding-left:15px!important;padding-right:15px!important}
.layui-table .list-table-check-td input{margin:0!important;vertical-align:middle} .layui-table .list-table-check-td input{margin:0!important;vertical-align:middle}
/** checkbox 优化 */ .think-box-shadow{box-shadow:0 2px 3px 0 rgba(0,0,0,.1);background:#fff;padding:20px!important}
/** checkbox & radio */
label.think-checkbox,label.think-radio{display:inline-block;margin-right:10px} label.think-checkbox,label.think-radio{display:inline-block;margin-right:10px}
.think-checkbox,.think-radio{margin-top:10px;font-weight:400;line-height:17px;cursor:pointer} .think-checkbox,.think-radio{margin-top:10px;font-weight:400;line-height:17px;cursor:pointer}
.think-checkbox input[type=checkbox]{width:18px;height:18px;border:1px solid #dcdcdc;cursor:pointer;margin:0 5px 0 0;position:relative;display:inline-block!important;background:#fff;appearance:none;box-sizing:border-box!important;border-radius:1px;vertical-align:bottom;-webkit-appearance:none} .think-checkbox input[type=checkbox]{width:18px;height:18px;border:1px solid #dcdcdc;cursor:pointer;margin:0 5px 0 0;position:relative;display:inline-block!important;background:#fff;appearance:none;box-sizing:border-box!important;border-radius:1px;vertical-align:bottom;-webkit-appearance:none}

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

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

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

@ -487,12 +487,17 @@ class Console
public function getNamespaces() public function getNamespaces()
{ {
$namespaces = []; $namespaces = [];
foreach ($this->commands as $command) { foreach ($this->commands as $name => $command) {
$namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName())); if (is_string($command)) {
$namespaces = array_merge($namespaces, $this->extractAllNamespaces($name));
} else {
$namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
foreach ($command->getAliases() as $alias) { foreach ($command->getAliases() as $alias) {
$namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias)); $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias));
}
} }
} }
return array_values(array_unique(array_filter($namespaces))); return array_values(array_unique(array_filter($namespaces)));

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

@ -571,7 +571,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->autoRelationUpdate(); $this->autoRelationUpdate();
} }
return false; return true;
} elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) { } elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
// 自动写入更新时间 // 自动写入更新时间
$data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime); $data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);

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

@ -519,7 +519,7 @@ class Validate
if (isset($this->append[$field])) { if (isset($this->append[$field])) {
// 追加额外的验证规则 // 追加额外的验证规则
$rules = array_unique(array_merge($rules, $this->append[$field])); $rules = array_unique(array_merge($rules, $this->append[$field]), SORT_REGULAR);
} }
$i = 0; $i = 0;

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

@ -249,7 +249,6 @@ abstract class Driver
{ {
if ($this->tag) { if ($this->tag) {
$key = $this->getTagkey($this->tag); $key = $this->getTagkey($this->tag);
$prev = $this->tag;
$this->tag = null; $this->tag = null;
if ($this->has($key)) { if ($this->has($key)) {
@ -266,7 +265,6 @@ abstract class Driver
} }
$this->set($key, $value, 0); $this->set($key, $value, 0);
$this->tag = $prev;
} }
} }

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

@ -267,10 +267,6 @@ class Redis extends Driver
protected function getTagItem($tag) protected function getTagItem($tag)
{ {
$tagName = $this->getTagKey($tag); $tagName = $this->getTagKey($tag);
$keys = $this->handler->sMembers($tagName); return $this->handler->sMembers($tagName);
return array_map(function ($key) {
return $this->getCacheKey($key);
}, $keys);
} }
} }

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

@ -1512,6 +1512,7 @@ class Query
{ {
if ($field instanceof $this) { if ($field instanceof $this) {
$this->options['where'] = $field->getOptions('where'); $this->options['where'] = $field->getOptions('where');
$this->bind($field->getBind(false));
return $this; return $this;
} }
@ -2197,12 +2198,12 @@ class Query
} }
/** /**
* 设置需要追加输出的属性 * 设置需要附加的输出属性
* @access public * @access public
* @param array $append 需要追加的属性 * @param array $append 属性列表
* @return $this * @return $this
*/ */
public function append(array $append) public function append(array $append = [])
{ {
$this->options['append'] = $append; $this->options['append'] = $append;
return $this; return $this;
@ -3355,13 +3356,13 @@ class Query
// 输出属性控制 // 输出属性控制
if (!empty($options['visible'])) { if (!empty($options['visible'])) {
$result->visible($options['visible']); $result->visible($options['visible'], true);
} elseif (!empty($options['hidden'])) { } elseif (!empty($options['hidden'])) {
$result->hidden($options['hidden']); $result->hidden($options['hidden'], true);
} }
if (!empty($options['append'])) { if (!empty($options['append'])) {
$result->append($options['append']); $result->append($options['append'], true);
} }
// 关联查询 // 关联查询

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

@ -24,8 +24,10 @@ class Collection extends BaseCollection
*/ */
public function load($relation) public function load($relation)
{ {
$item = current($this->items); if (!$this->isEmpty()) {
$item->eagerlyResultSet($this->items, $relation); $item = current($this->items);
$item->eagerlyResultSet($this->items, $relation);
}
return $this; return $this;
} }

21
thinkphp/library/think/model/Relation.php
View File

@ -58,6 +58,16 @@ abstract class Relation
return $this->query->getModel(); return $this->query->getModel();
} }
/**
* 获取当前的关联模型类的实例
* @access public
* @return Query
*/
public function getQuery()
{
return $this->query;
}
/** /**
* 设置当前关联为自关联 * 设置当前关联为自关联
* @access public * @access public
@ -129,6 +139,17 @@ abstract class Relation
} }
} }
/**
* 更新数据
* @access public
* @param array $data 更新数据
* @return integer|string
*/
public function update(array $data = [])
{
return $this->query->update($data);
}
/** /**
* 删除记录 * 删除记录
* @access public * @access public

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

@ -327,9 +327,13 @@ trait Attribute
$method = 'set' . Loader::parseName($name, 1) . 'Attr'; $method = 'set' . Loader::parseName($name, 1) . 'Attr';
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$value = $this->$method($value, array_merge($this->data, $data)); $origin = $this->data;
$value = $this->$method($value, array_merge($this->data, $data));
$this->set[$name] = true; $this->set[$name] = true;
if (is_null($value) && $origin !== $this->data) {
return;
}
} elseif (isset($this->type[$name])) { } elseif (isset($this->type[$name])) {
// 类型转换 // 类型转换
$value = $this->writeTransform($value, $this->type[$name]); $value = $this->writeTransform($value, $this->type[$name]);

8
thinkphp/library/think/model/concern/Conversion.php
View File

@ -164,13 +164,15 @@ trait Conversion
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if ($val instanceof Model || $val instanceof ModelCollection) { if ($val instanceof Model || $val instanceof ModelCollection) {
// 关联模型对象 // 关联模型对象
if (isset($this->visible[$key])) { if (isset($this->visible[$key]) && is_array($this->visible[$key])) {
$val->visible($this->visible[$key]); $val->visible($this->visible[$key]);
} elseif (isset($this->hidden[$key])) { } elseif (isset($this->hidden[$key]) && is_array($this->hidden[$key])) {
$val->hidden($this->hidden[$key]); $val->hidden($this->hidden[$key]);
} }
// 关联模型对象 // 关联模型对象
$item[$key] = $val->toArray(); if (!isset($this->hidden[$key]) || true !== $this->hidden[$key]) {
$item[$key] = $val->toArray();
}
} elseif (isset($this->visible[$key])) { } elseif (isset($this->visible[$key])) {
$item[$key] = $this->getAttr($key); $item[$key] = $this->getAttr($key);
} elseif (!isset($this->hidden[$key]) && !$hasVisible) { } elseif (!isset($this->hidden[$key]) && !$hasVisible) {

6
thinkphp/library/think/model/concern/RelationShip.php
View File

@ -204,7 +204,7 @@ trait RelationShip
$relationResult = $this->$method(); $relationResult = $this->$method();
if (isset($withRelationAttr[$relationName])) { if (isset($withRelationAttr[$relationName])) {
$relationResult->withAttr($withRelationAttr[$relationName]); $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
} }
$this->relation[$relation] = $relationResult->getRelation($subRelation, $closure); $this->relation[$relation] = $relationResult->getRelation($subRelation, $closure);
@ -248,7 +248,7 @@ trait RelationShip
$relationResult = $this->$relation(); $relationResult = $this->$relation();
if (isset($withRelationAttr[$relationName])) { if (isset($withRelationAttr[$relationName])) {
$relationResult->withAttr($withRelationAttr[$relationName]); $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
} }
$relationResult->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $join); $relationResult->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $join);
@ -290,7 +290,7 @@ trait RelationShip
$relationResult = $this->$relation(); $relationResult = $this->$relation();
if (isset($withRelationAttr[$relationName])) { if (isset($withRelationAttr[$relationName])) {
$relationResult->withAttr($withRelationAttr[$relationName]); $relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
} }
$relationResult->eagerlyResult($result, $relation, $subRelation, $closure, $join); $relationResult->eagerlyResult($result, $relation, $subRelation, $closure, $join);

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

@ -642,17 +642,26 @@ abstract class Rule
protected function checkCrossDomain($request) protected function checkCrossDomain($request)
{ {
if (!empty($this->option['cross_domain'])) { if (!empty($this->option['cross_domain'])) {
$header = [ $header = [
'Access-Control-Allow-Origin' => '*', 'Access-Control-Allow-Credentials' => 'true',
'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE', 'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE',
'Access-Control-Allow-Headers' => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With', 'Access-Control-Allow-Headers' => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With',
]; ];
if (!empty($this->option['header'])) { if (!empty($this->option['header'])) {
$header = array_merge($header, $this->option['header']); $header = array_merge($header, $this->option['header']);
} }
if (!isset($header['Access-Control-Allow-Origin'])) {
$httpOrigin = $request->header('origin');
if ($httpOrigin && strpos(config('cookie.domain'), $httpOrigin)) {
$header['Access-Control-Allow-Origin'] = $httpOrigin;
} else {
$header['Access-Control-Allow-Origin'] = '*';
}
}
$this->option['header'] = $header; $this->option['header'] = $header;
if ($request->method(true) == 'OPTIONS') { if ($request->method(true) == 'OPTIONS') {

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

@ -118,8 +118,8 @@ class RuleGroup extends Rule
*/ */
public function check($request, $url, $completeMatch = false) public function check($request, $url, $completeMatch = false)
{ {
// 跨域OPTIONS请求
if ($dispatch = $this->checkCrossDomain($request)) { if ($dispatch = $this->checkCrossDomain($request)) {
// 跨域OPTIONS请求
return $dispatch; return $dispatch;
} }

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

@ -149,11 +149,6 @@ class RuleItem extends Rule
*/ */
public function checkRule($request, $url, $match = null, $completeMatch = false) public function checkRule($request, $url, $match = null, $completeMatch = false)
{ {
if ($dispatch = $this->checkCrossDomain($request)) {
// 允许跨域
return $dispatch;
}
// 检查参数有效性 // 检查参数有效性
if (!$this->checkOption($this->option, $request)) { if (!$this->checkOption($this->option, $request)) {
return false; return false;
@ -169,6 +164,15 @@ class RuleItem extends Rule
} }
if (false !== $match) { if (false !== $match) {
if (!empty($option['cross_domain'])) {
if ($dispatch = $this->checkCrossDomain($request)) {
// 允许跨域
return $dispatch;
}
$option['header'] = $this->option['header'];
}
// 检查前置行为 // 检查前置行为
if (isset($option['before']) && false === $this->checkBefore($option['before'])) { if (isset($option['before']) && false === $this->checkBefore($option['before'])) {
return false; return false;

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

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

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132 class ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0
{ {
public static $files = array ( public static $files = array (
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@ -346,9 +346,9 @@ class ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixDirsPsr4;
$loader->classMap = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$classMap; $loader->classMap = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

56
vendor/composer/installed.json vendored
View File

@ -177,8 +177,8 @@
}, },
{ {
"name": "symfony/options-resolver", "name": "symfony/options-resolver",
"version": "v3.4.26", "version": "v3.4.28",
"version_normalized": "3.4.26.0", "version_normalized": "3.4.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/options-resolver.git", "url": "https://github.com/symfony/options-resolver.git",
@ -239,17 +239,17 @@
}, },
{ {
"name": "topthink/framework", "name": "topthink/framework",
"version": "v5.1.36", "version": "v5.1.37.1",
"version_normalized": "5.1.36.0", "version_normalized": "5.1.37.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/framework.git", "url": "https://github.com/top-think/framework.git",
"reference": "135eee67ce9ee0b07da201f743d7dd88ec431abb" "reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/135eee67ce9ee0b07da201f743d7dd88ec431abb", "url": "https://api.github.com/repos/top-think/framework/zipball/05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
"reference": "135eee67ce9ee0b07da201f743d7dd88ec431abb", "reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -271,7 +271,7 @@
"sebastian/phpcpd": "2.*", "sebastian/phpcpd": "2.*",
"squizlabs/php_codesniffer": "2.*" "squizlabs/php_codesniffer": "2.*"
}, },
"time": "2019-04-28T08:56:58+00:00", "time": "2019-05-28T06:57:29+00:00",
"type": "think-framework", "type": "think-framework",
"installation-source": "dist", "installation-source": "dist",
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -445,17 +445,17 @@
}, },
{ {
"name": "zoujingli/ip2region", "name": "zoujingli/ip2region",
"version": "v1.0.5", "version": "v1.0.6",
"version_normalized": "1.0.5.0", "version_normalized": "1.0.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ip2region.git", "url": "https://github.com/zoujingli/ip2region.git",
"reference": "944dc687304133027c4586a35ff78b57e56dd659" "reference": "054b6580f4e1f441ca700939fbddd6c0b8488f7a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ip2region/zipball/944dc687304133027c4586a35ff78b57e56dd659", "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/054b6580f4e1f441ca700939fbddd6c0b8488f7a",
"reference": "944dc687304133027c4586a35ff78b57e56dd659", "reference": "054b6580f4e1f441ca700939fbddd6c0b8488f7a",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -467,7 +467,7 @@
"require": { "require": {
"php": ">=5.3" "php": ">=5.3"
}, },
"time": "2019-01-23T06:23:53+00:00", "time": "2019-05-18T06:44:34+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -499,12 +499,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "00585bd6214a0539165de8cf4bfefff798e49787" "reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/00585bd6214a0539165de8cf4bfefff798e49787", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/706b33fa3d9c9106b61e5c2949a279dc4009f066",
"reference": "00585bd6214a0539165de8cf4bfefff798e49787", "reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -523,7 +523,7 @@
"qiniu/php-sdk": "^7.2", "qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*" "topthink/framework": "5.1.*"
}, },
"time": "2019-04-30T05:59:26+00:00", "time": "2019-06-04T02:50:32+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -543,17 +543,17 @@
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",
"version": "v1.2.11", "version": "v1.2.12",
"version_normalized": "1.2.11.0", "version_normalized": "1.2.12.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/WeChatDeveloper.git", "url": "https://github.com/zoujingli/WeChatDeveloper.git",
"reference": "b4a905a6188807f7d5e51c9e2ea7622c97db476b" "reference": "9464d20af40b24bc06fd146509ad003c17240116"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/b4a905a6188807f7d5e51c9e2ea7622c97db476b", "url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9464d20af40b24bc06fd146509ad003c17240116",
"reference": "b4a905a6188807f7d5e51c9e2ea7622c97db476b", "reference": "9464d20af40b24bc06fd146509ad003c17240116",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -571,7 +571,7 @@
"ext-simplexml": "*", "ext-simplexml": "*",
"php": ">=5.4" "php": ">=5.4"
}, },
"time": "2019-04-23T07:52:27+00:00", "time": "2019-05-16T02:17:20+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -614,12 +614,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/WeOpenDeveloper.git", "url": "https://github.com/zoujingli/WeOpenDeveloper.git",
"reference": "8bd3fe34a25c267e22415a4d6526e16bf10d6b61" "reference": "ce6e66eb2531da89a4463f595797258ad2bae385"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/8bd3fe34a25c267e22415a4d6526e16bf10d6b61", "url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/ce6e66eb2531da89a4463f595797258ad2bae385",
"reference": "8bd3fe34a25c267e22415a4d6526e16bf10d6b61", "reference": "ce6e66eb2531da89a4463f595797258ad2bae385",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -635,7 +635,7 @@
"php": ">=5.4", "php": ">=5.4",
"zoujingli/wechat-developer": "^1.0" "zoujingli/wechat-developer": "^1.0"
}, },
"time": "2019-04-28T09:38:09+00:00", "time": "2019-05-09T03:34:57+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {

269
vendor/zoujingli/ip2region/Ip2Region.php vendored
View File

@ -4,86 +4,85 @@
* *
* @author chenxin<chenxin619315@gmail.com> * @author chenxin<chenxin619315@gmail.com>
* @date 2015-10-29 * @date 2015-10-29
*/ */
defined('INDEX_BLOCK_LENGTH') or define('INDEX_BLOCK_LENGTH', 12); defined('INDEX_BLOCK_LENGTH') or define('INDEX_BLOCK_LENGTH', 12);
defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 8192); defined('TOTAL_HEADER_LENGTH') or define('TOTAL_HEADER_LENGTH', 8192);
class Ip2Region class Ip2Region
{ {
/** /**
* db file handler * db file handler
*/ */
private $dbFileHandler = NULL; private $dbFileHandler = null;
/** /**
* header block info * header block info
*/ */
private $HeaderSip = NULL; private $HeaderSip = null;
private $HeaderPtr = NULL; private $HeaderPtr = null;
private $headerLen = 0; private $headerLen = 0;
/** /**
* super block index info * super block index info
*/ */
private $firstIndexPtr = 0; private $firstIndexPtr = 0;
private $lastIndexPtr = 0; private $lastIndexPtr = 0;
private $totalBlocks = 0; private $totalBlocks = 0;
/** /**
* for memory mode only * for memory mode only
* the original db binary string * the original db binary string
*/ */
private $dbBinStr = NULL; private $dbBinStr = null;
private $dbFile = NULL; private $dbFile = null;
/** /**
* construct method * construct method
* *
* @param ip2regionFile * @param ip2regionFile
*/ */
public function __construct($ip2regionFile = null) public function __construct($ip2regionFile = null)
{ {
$this->dbFile = is_null($ip2regionFile) ? __DIR__ . '/ip2region.db' : $ip2regionFile; $this->dbFile = is_null($ip2regionFile) ? __DIR__ . '/ip2region.db' : $ip2regionFile;
} }
/** /**
* all the db binary string will be loaded into memory * all the db binary string will be loaded into memory
* then search the memory only and this will a lot faster than disk base search * then search the memory only and this will a lot faster than disk base search
* @Note: * @Note:
* invoke it once before put it to public invoke could make it thread safe * invoke it once before put it to public invoke could make it thread safe
* *
* @param $ip * @param string $ip
*/ * @return array|null
* @throws Exception
*/
public function memorySearch($ip) public function memorySearch($ip)
{ {
//check and load the binary string for the first time //check and load the binary string for the first time
if ( $this->dbBinStr == NULL ) { if ($this->dbBinStr == null) {
$this->dbBinStr = file_get_contents($this->dbFile); $this->dbBinStr = file_get_contents($this->dbFile);
if ( $this->dbBinStr == false ) { if ($this->dbBinStr == false) {
throw new Exception("Fail to open the db file {$this->dbFile}"); throw new Exception("Fail to open the db file {$this->dbFile}");
} }
$this->firstIndexPtr = self::getLong($this->dbBinStr, 0); $this->firstIndexPtr = self::getLong($this->dbBinStr, 0);
$this->lastIndexPtr = self::getLong($this->dbBinStr, 4); $this->lastIndexPtr = self::getLong($this->dbBinStr, 4);
$this->totalBlocks = ($this->lastIndexPtr-$this->firstIndexPtr)/INDEX_BLOCK_LENGTH + 1; $this->totalBlocks = ($this->lastIndexPtr - $this->firstIndexPtr) / INDEX_BLOCK_LENGTH + 1;
} }
if (is_string($ip)) $ip = self::safeIp2long($ip);
if ( is_string($ip) ) $ip = self::safeIp2long($ip);
//binary search to define the data //binary search to define the data
$l = 0; $l = 0;
$h = $this->totalBlocks; $h = $this->totalBlocks;
$dataPtr = 0; $dataPtr = 0;
while ( $l <= $h ) { while ($l <= $h) {
$m = (($l + $h) >> 1); $m = (($l + $h) >> 1);
$p = $this->firstIndexPtr + $m * INDEX_BLOCK_LENGTH; $p = $this->firstIndexPtr + $m * INDEX_BLOCK_LENGTH;
$sip = self::getLong($this->dbBinStr, $p); $sip = self::getLong($this->dbBinStr, $p);
if ( $ip < $sip ) { if ($ip < $sip) {
$h = $m - 1; $h = $m - 1;
} else { } else {
$eip = self::getLong($this->dbBinStr, $p + 4); $eip = self::getLong($this->dbBinStr, $p + 4);
if ( $ip > $eip ) { if ($ip > $eip) {
$l = $m + 1; $l = $m + 1;
} else { } else {
$dataPtr = self::getLong($this->dbBinStr, $p + 8); $dataPtr = self::getLong($this->dbBinStr, $p + 8);
@ -91,63 +90,57 @@ class Ip2Region
} }
} }
} }
//not matched just stop it here //not matched just stop it here
if ( $dataPtr == 0 ) return NULL; if ($dataPtr == 0) return null;
//get the data //get the data
$dataLen = (($dataPtr >> 24) & 0xFF); $dataLen = (($dataPtr >> 24) & 0xFF);
$dataPtr = ($dataPtr & 0x00FFFFFF); $dataPtr = ($dataPtr & 0x00FFFFFF);
return array( return array(
'city_id' => self::getLong($this->dbBinStr, $dataPtr), 'city_id' => self::getLong($this->dbBinStr, $dataPtr),
'region' => substr($this->dbBinStr, $dataPtr + 4, $dataLen - 4) 'region' => substr($this->dbBinStr, $dataPtr + 4, $dataLen - 4),
); );
} }
/** /**
* get the data block throught the specifield ip address or long ip numeric with binary search algorithm * get the data block throught the specifield ip address or long ip numeric with binary search algorithm
* *
* @param ip * @param string ip
* @return mixed Array or NULL for any error * @return mixed Array or NULL for any error
*/ * @throws Exception
public function binarySearch( $ip ) */
public function binarySearch($ip)
{ {
//check and conver the ip address //check and conver the ip address
if ( is_string($ip) ) $ip = self::safeIp2long($ip); if (is_string($ip)) $ip = self::safeIp2long($ip);
if ( $this->totalBlocks == 0 ) { if ($this->totalBlocks == 0) {
//check and open the original db file //check and open the original db file
if ( $this->dbFileHandler == NULL ) { if ($this->dbFileHandler == null) {
$this->dbFileHandler = fopen($this->dbFile, 'r'); $this->dbFileHandler = fopen($this->dbFile, 'r');
if ( $this->dbFileHandler == false ) { if ($this->dbFileHandler == false) {
throw new Exception("Fail to open the db file {$this->dbFile}"); throw new Exception("Fail to open the db file {$this->dbFile}");
} }
} }
fseek($this->dbFileHandler, 0); fseek($this->dbFileHandler, 0);
$superBlock = fread($this->dbFileHandler, 8); $superBlock = fread($this->dbFileHandler, 8);
$this->firstIndexPtr = self::getLong($superBlock, 0); $this->firstIndexPtr = self::getLong($superBlock, 0);
$this->lastIndexPtr = self::getLong($superBlock, 4); $this->lastIndexPtr = self::getLong($superBlock, 4);
$this->totalBlocks = ($this->lastIndexPtr-$this->firstIndexPtr)/INDEX_BLOCK_LENGTH + 1; $this->totalBlocks = ($this->lastIndexPtr - $this->firstIndexPtr) / INDEX_BLOCK_LENGTH + 1;
} }
//binary search to define the data //binary search to define the data
$l = 0; $l = 0;
$h = $this->totalBlocks; $h = $this->totalBlocks;
$dataPtr = 0; $dataPtr = 0;
while ( $l <= $h ) { while ($l <= $h) {
$m = (($l + $h) >> 1); $m = (($l + $h) >> 1);
$p = $m * INDEX_BLOCK_LENGTH; $p = $m * INDEX_BLOCK_LENGTH;
fseek($this->dbFileHandler, $this->firstIndexPtr + $p); fseek($this->dbFileHandler, $this->firstIndexPtr + $p);
$buffer = fread($this->dbFileHandler, INDEX_BLOCK_LENGTH); $buffer = fread($this->dbFileHandler, INDEX_BLOCK_LENGTH);
$sip = self::getLong($buffer, 0); $sip = self::getLong($buffer, 0);
if ( $ip < $sip ) { if ($ip < $sip) {
$h = $m - 1; $h = $m - 1;
} else { } else {
$eip = self::getLong($buffer, 4); $eip = self::getLong($buffer, 4);
if ( $ip > $eip ) { if ($ip > $eip) {
$l = $m + 1; $l = $m + 1;
} else { } else {
$dataPtr = self::getLong($buffer, 8); $dataPtr = self::getLong($buffer, 8);
@ -155,128 +148,115 @@ class Ip2Region
} }
} }
} }
//not matched just stop it here //not matched just stop it here
if ( $dataPtr == 0 ) return NULL; if ($dataPtr == 0) return null;
//get the data //get the data
$dataLen = (($dataPtr >> 24) & 0xFF); $dataLen = (($dataPtr >> 24) & 0xFF);
$dataPtr = ($dataPtr & 0x00FFFFFF); $dataPtr = ($dataPtr & 0x00FFFFFF);
fseek($this->dbFileHandler, $dataPtr); fseek($this->dbFileHandler, $dataPtr);
$data = fread($this->dbFileHandler, $dataLen); $data = fread($this->dbFileHandler, $dataLen);
return array('city_id' => self::getLong($data, 0), 'region' => substr($data, 4));
return array(
'city_id' => self::getLong($data, 0),
'region' => substr($data, 4)
);
} }
/** /**
* get the data block associated with the specifield ip with b-tree search algorithm * get the data block associated with the specifield ip with b-tree search algorithm
* @Note: not thread safe * @Note: not thread safe
* *
* @param ip * @param string ip
* @return Mixed Array for NULL for any error * @return Mixed Array for NULL for any error
*/ * @throws Exception
public function btreeSearch( $ip ) */
public function btreeSearch($ip)
{ {
if ( is_string($ip) ) $ip = self::safeIp2long($ip); if (is_string($ip)) $ip = self::safeIp2long($ip);
//check and load the header //check and load the header
if ( $this->HeaderSip == NULL ) { if ($this->HeaderSip == null) {
//check and open the original db file //check and open the original db file
if ( $this->dbFileHandler == NULL ) { if ($this->dbFileHandler == null) {
$this->dbFileHandler = fopen($this->dbFile, 'r'); $this->dbFileHandler = fopen($this->dbFile, 'r');
if ( $this->dbFileHandler == false ) { if ($this->dbFileHandler == false) {
throw new Exception("Fail to open the db file {$this->dbFile}"); throw new Exception("Fail to open the db file {$this->dbFile}");
} }
} }
fseek($this->dbFileHandler, 8); fseek($this->dbFileHandler, 8);
$buffer = fread($this->dbFileHandler, TOTAL_HEADER_LENGTH); $buffer = fread($this->dbFileHandler, TOTAL_HEADER_LENGTH);
//fill the header //fill the header
$idx = 0; $idx = 0;
$this->HeaderSip = array(); $this->HeaderSip = array();
$this->HeaderPtr = array(); $this->HeaderPtr = array();
for ( $i = 0; $i < TOTAL_HEADER_LENGTH; $i += 8 ) { for ($i = 0; $i < TOTAL_HEADER_LENGTH; $i += 8) {
$startIp = self::getLong($buffer, $i); $startIp = self::getLong($buffer, $i);
$dataPtr = self::getLong($buffer, $i + 4); $dataPtr = self::getLong($buffer, $i + 4);
if ( $dataPtr == 0 ) break; if ($dataPtr == 0) break;
$this->HeaderSip[] = $startIp; $this->HeaderSip[] = $startIp;
$this->HeaderPtr[] = $dataPtr; $this->HeaderPtr[] = $dataPtr;
$idx++; $idx++;
} }
$this->headerLen = $idx; $this->headerLen = $idx;
} }
//1. define the index block with the binary search //1. define the index block with the binary search
$l = 0; $h = $this->headerLen; $sptr = 0; $eptr = 0; $l = 0;
while ( $l <= $h ) { $h = $this->headerLen;
$sptr = 0;
$eptr = 0;
while ($l <= $h) {
$m = (($l + $h) >> 1); $m = (($l + $h) >> 1);
//perfetc matched, just return it //perfetc matched, just return it
if ( $ip == $this->HeaderSip[$m] ) { if ($ip == $this->HeaderSip[$m]) {
if ( $m > 0 ) { if ($m > 0) {
$sptr = $this->HeaderPtr[$m-1]; $sptr = $this->HeaderPtr[$m - 1];
$eptr = $this->HeaderPtr[$m ]; $eptr = $this->HeaderPtr[$m];
} else { } else {
$sptr = $this->HeaderPtr[$m ]; $sptr = $this->HeaderPtr[$m];
$eptr = $this->HeaderPtr[$m+1]; $eptr = $this->HeaderPtr[$m + 1];
} }
break; break;
} }
//less then the middle value //less then the middle value
if ( $ip < $this->HeaderSip[$m] ) { if ($ip < $this->HeaderSip[$m]) {
if ( $m == 0 ) { if ($m == 0) {
$sptr = $this->HeaderPtr[$m ]; $sptr = $this->HeaderPtr[$m];
$eptr = $this->HeaderPtr[$m+1]; $eptr = $this->HeaderPtr[$m + 1];
break; break;
} else if ( $ip > $this->HeaderSip[$m-1] ) { } elseif ($ip > $this->HeaderSip[$m - 1]) {
$sptr = $this->HeaderPtr[$m-1]; $sptr = $this->HeaderPtr[$m - 1];
$eptr = $this->HeaderPtr[$m ]; $eptr = $this->HeaderPtr[$m];
break; break;
} }
$h = $m - 1; $h = $m - 1;
} else { } else {
if ( $m == $this->headerLen - 1 ) { if ($m == $this->headerLen - 1) {
$sptr = $this->HeaderPtr[$m-1]; $sptr = $this->HeaderPtr[$m - 1];
$eptr = $this->HeaderPtr[$m ]; $eptr = $this->HeaderPtr[$m];
break; break;
} else if ( $ip <= $this->HeaderSip[$m+1] ) { } elseif ($ip <= $this->HeaderSip[$m + 1]) {
$sptr = $this->HeaderPtr[$m ]; $sptr = $this->HeaderPtr[$m];
$eptr = $this->HeaderPtr[$m+1]; $eptr = $this->HeaderPtr[$m + 1];
break; break;
} }
$l = $m + 1; $l = $m + 1;
} }
} }
//match nothing just stop it //match nothing just stop it
if ( $sptr == 0 ) return NULL; if ($sptr == 0) return null;
//2. search the index blocks to define the data //2. search the index blocks to define the data
$blockLen = $eptr - $sptr; $blockLen = $eptr - $sptr;
fseek($this->dbFileHandler, $sptr); fseek($this->dbFileHandler, $sptr);
$index = fread($this->dbFileHandler, $blockLen + INDEX_BLOCK_LENGTH); $index = fread($this->dbFileHandler, $blockLen + INDEX_BLOCK_LENGTH);
$dataptr = 0; $dataptr = 0;
$l = 0; $h = $blockLen / INDEX_BLOCK_LENGTH; $l = 0;
while ( $l <= $h ) { $h = $blockLen / INDEX_BLOCK_LENGTH;
while ($l <= $h) {
$m = (($l + $h) >> 1); $m = (($l + $h) >> 1);
$p = (int)($m * INDEX_BLOCK_LENGTH); $p = (int)($m * INDEX_BLOCK_LENGTH);
$sip = self::getLong($index, $p); $sip = self::getLong($index, $p);
if ( $ip < $sip ) { if ($ip < $sip) {
$h = $m - 1; $h = $m - 1;
} else { } else {
$eip = self::getLong($index, $p + 4); $eip = self::getLong($index, $p + 4);
if ( $ip > $eip ) { if ($ip > $eip) {
$l = $m + 1; $l = $m + 1;
} else { } else {
$dataptr = self::getLong($index, $p + 8); $dataptr = self::getLong($index, $p + 8);
@ -284,78 +264,67 @@ class Ip2Region
} }
} }
} }
//not matched //not matched
if ( $dataptr == 0 ) return NULL; if ($dataptr == 0) return null;
//3. get the data //3. get the data
$dataLen = (($dataptr >> 24) & 0xFF); $dataLen = (($dataptr >> 24) & 0xFF);
$dataPtr = ($dataptr & 0x00FFFFFF); $dataPtr = ($dataptr & 0x00FFFFFF);
fseek($this->dbFileHandler, $dataPtr); fseek($this->dbFileHandler, $dataPtr);
$data = fread($this->dbFileHandler, $dataLen); $data = fread($this->dbFileHandler, $dataLen);
return array('city_id' => self::getLong($data, 0), 'region' => substr($data, 4));
return array(
'city_id' => self::getLong($data, 0),
'region' => substr($data, 4)
);
} }
/** /**
* safe self::safeIp2long function * safe self::safeIp2long function
* *
* @param ip * @param string ip
* */ * @return string
public static function safeIp2long($ip) */
public static function safeIp2long($ip)
{ {
$ip = ip2long($ip); $ip = ip2long($ip);
// convert signed int to unsigned int if on 32 bit operating system // convert signed int to unsigned int if on 32 bit operating system
if ($ip < 0 && PHP_INT_SIZE == 4) { if ($ip < 0 && PHP_INT_SIZE == 4) {
$ip = sprintf("%u", $ip); $ip = sprintf("%u", $ip);
} }
return $ip; return $ip;
} }
/** /**
* read a long from a byte buffer * read a long from a byte buffer
* *
* @param b * @param integer b
* @param offset * @param integer offset
*/ * @return string
public static function getLong( $b, $offset ) */
public static function getLong($b, $offset)
{ {
$val = ( $val = (
(ord($b[$offset++])) | (ord($b[$offset++])) |
(ord($b[$offset++]) << 8) | (ord($b[$offset++]) << 8) |
(ord($b[$offset++]) << 16) | (ord($b[$offset++]) << 16) |
(ord($b[$offset ]) << 24) (ord($b[$offset]) << 24)
); );
// convert signed int to unsigned int if on 32 bit operating system // convert signed int to unsigned int if on 32 bit operating system
if ($val < 0 && PHP_INT_SIZE == 4) { if ($val < 0 && PHP_INT_SIZE == 4) {
$val = sprintf("%u", $val); $val = sprintf("%u", $val);
} }
return $val; return $val;
} }
/** /**
* destruct method, resource destroy * destruct method, resource destroy
*/ */
public function __destruct() public function __destruct()
{ {
if ( $this->dbFileHandler != NULL ) { if ($this->dbFileHandler != null) {
fclose($this->dbFileHandler); fclose($this->dbFileHandler);
} }
$this->dbBinStr = null;
$this->dbBinStr = NULL; $this->HeaderSip = null;
$this->HeaderSip = NULL; $this->HeaderPtr = null;
$this->HeaderPtr = NULL;
} }
} }
?>

BIN
vendor/zoujingli/ip2region/ip2region.db vendored
View File

Binary file not shown.

21
vendor/zoujingli/think-library/src/common.php vendored
View File

@ -36,7 +36,7 @@ if (!function_exists('format_datetime')) {
*/ */
function format_datetime($datetime, $format = 'Y年m月d日 H:i:s') function format_datetime($datetime, $format = 'Y年m月d日 H:i:s')
{ {
if (empty($datetime)) return '--'; if (empty($datetime)) return '-';
if (is_numeric($datetime)) return date($format, $datetime); if (is_numeric($datetime)) return date($format, $datetime);
return date($format, strtotime($datetime)); return date($format, strtotime($datetime));
} }
@ -55,16 +55,17 @@ if (!function_exists('sysconf')) {
{ {
static $data = []; static $data = [];
list($field, $raw) = explode('|', "{$name}|"); list($field, $raw) = explode('|', "{$name}|");
$key = md5(config('database.hostname') . '#' . config('database.database'));
if ($value !== null) { if ($value !== null) {
\think\facade\Cache::tag('system')->rm('_sysconf_'); \think\facade\Cache::tag('system')->rm("_sysconfig_{$key}");
list($row, $data) = [['name' => $field, 'value' => $value], []]; list($row, $data) = [['name' => $field, 'value' => $value], []];
return \library\tools\Data::save('SystemConfig', $row, 'name'); return \library\tools\Data::save('SystemConfig', $row, 'name');
} }
if (empty($data)) { if (empty($data)) {
$data = \think\facade\Cache::tag('system')->get('_sysconf_', []); $data = \think\facade\Cache::tag('system')->get("_sysconfig_{$key}", []);
if (empty($data)) { if (empty($data)) {
$data = \think\Db::name('SystemConfig')->column('name,value'); $data = \think\Db::name('SystemConfig')->column('name,value');
\think\facade\Cache::tag('system')->set('_sysconf_', $data, 60); \think\facade\Cache::tag('system')->set("_sysconfig_{$key}", $data, 60);
} }
} }
return isset($data[$field]) ? (strtolower($raw) === 'raw' ? $data[$field] : htmlspecialchars($data[$field])) : ''; return isset($data[$field]) ? (strtolower($raw) === 'raw' ? $data[$field] : htmlspecialchars($data[$field])) : '';
@ -224,11 +225,15 @@ if (!function_exists('emoji_clear')) {
// 注册系统常用指令 // 注册系统常用指令
\think\Console::addDefaultCommands([ \think\Console::addDefaultCommands([
'library\command\Sess', 'library\command\Sess',
'library\command\task\Stop', 'library\command\task\State', 'library\command\task\Stop',
'library\command\task\Start', 'library\command\task\Reset', 'library\command\task\State',
'library\command\task\Start',
'library\command\task\Reset',
'library\command\sync\Admin', 'library\command\sync\Admin',
'library\command\sync\Plugs', 'library\command\sync\Config', 'library\command\sync\Plugs',
'library\command\sync\Wechat', 'library\command\sync\Service', 'library\command\sync\Config',
'library\command\sync\Wechat',
'library\command\sync\Service',
]); ]);
// 动态加载模块配置 // 动态加载模块配置

15
vendor/zoujingli/think-library/src/tools/Data.php vendored
View File

@ -126,7 +126,7 @@ class Data
} }
/** /**
* 数据唯一数字编码 * 唯一数字编码
* @param integer $length * @param integer $length
* @return string * @return string
*/ */
@ -139,6 +139,19 @@ class Data
return $string; return $string;
} }
/**
* 唯一日期编码
* @param integer $length
* @return string
*/
public static function uniqidDateCode($length = 14)
{
if ($length < 14) $length = 14;
$string = date('Ymd') . (date('H') + date('i')) . date('s');
while (strlen($string) < $length) $string .= rand(0, 9);
return $string;
}
/** /**
* 文件大小显示转换 * 文件大小显示转换
* @param integer $size * @param integer $size

3
vendor/zoujingli/wechat-developer/.gitignore vendored
View File

@ -5,4 +5,5 @@
/Cache /Cache
/Test/cert /Test/cert
/nbproject /nbproject
/composer.lock /composer.lock
/_test/cert

2
vendor/zoujingli/wechat-developer/We.php vendored
View File

@ -74,7 +74,7 @@ class We
* 定义当前版本 * 定义当前版本
* @var string * @var string
*/ */
const VERSION = '1.2.9'; const VERSION = '1.2.12';
/** /**
* 静态配置 * 静态配置

8
vendor/zoujingli/wechat-developer/WeChat/Contracts/BasicWeChat.php vendored
View File

@ -40,19 +40,19 @@ class BasicWeChat
* 当前请求方法参数 * 当前请求方法参数
* @var array * @var array
*/ */
private $currentMethod = []; protected $currentMethod = [];
/** /**
* 当前模式 * 当前模式
* @var bool * @var bool
*/ */
private $isTry = false; protected $isTry = false;
/** /**
* 注册代替函数 * 注册代替函数
* @var string * @var string
*/ */
private $GetAccessTokenCallback; protected $GetAccessTokenCallback;
/** /**
* BasicWeChat constructor. * BasicWeChat constructor.
@ -128,7 +128,7 @@ class BasicWeChat
} }
/** /**
* 清理删除accessToken * 清理删除 AccessToken
* @return bool * @return bool
*/ */
public function delAccessToken() public function delAccessToken()

2
vendor/zoujingli/wechat-developer/WeChat/Custom.php vendored
View File

@ -79,7 +79,7 @@ class Custom extends BasicWeChat
* @throws Exceptions\InvalidResponseException * @throws Exceptions\InvalidResponseException
* @throws Exceptions\LocalCacheException * @throws Exceptions\LocalCacheException
*/ */
public function inviteworker($kf_account, $invite_wx) public function inviteWorker($kf_account, $invite_wx)
{ {
$url = 'https://api.weixin.qq.com/customservice/kfaccount/inviteworker?access_token=ACCESS_TOKEN'; $url = 'https://api.weixin.qq.com/customservice/kfaccount/inviteworker?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());

12
vendor/zoujingli/wechat-developer/WeChat/Media.php vendored
View File

@ -56,7 +56,11 @@ class Media extends BasicWeChat
$url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}"; $url = "https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id={$media_id}";
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
$result = Tools::get($url); $result = Tools::get($url);
if (json_decode($result)) { if (is_array($json = json_decode($result, true))) {
if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
return Tools::json2arr($result); return Tools::json2arr($result);
} }
return is_null($outType) ? $result : $outType($result); return is_null($outType) ? $result : $outType($result);
@ -139,7 +143,11 @@ class Media extends BasicWeChat
$url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN"; $url = "https://api.weixin.qq.com/cgi-bin/material/get_material?access_token=ACCESS_TOKEN";
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
$result = Tools::post($url, ['media_id' => $media_id]); $result = Tools::post($url, ['media_id' => $media_id]);
if (json_decode($result)) { if (is_array($json = json_decode($result, true))) {
if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
return Tools::json2arr($result); return Tools::json2arr($result);
} }
return is_null($outType) ? $result : $outType($result); return is_null($outType) ? $result : $outType($result);

1
vendor/zoujingli/wechat-developer/WeChat/Pay.php vendored
View File

@ -160,6 +160,7 @@ class Pay extends BasicWePay
* @param array $options 静音参数 * @param array $options 静音参数
* @param null|string $outType 输出类型 * @param null|string $outType 输出类型
* @return bool|string * @return bool|string
* @throws Exceptions\LocalCacheException
* @throws InvalidResponseException * @throws InvalidResponseException
*/ */
public function billDownload(array $options, $outType = null) public function billDownload(array $options, $outType = null)

19
vendor/zoujingli/wechat-developer/WeMini/Qrcode.php vendored
View File

@ -16,6 +16,7 @@ namespace WeMini;
use WeChat\Contracts\BasicWeChat; use WeChat\Contracts\BasicWeChat;
use WeChat\Contracts\Tools; use WeChat\Contracts\Tools;
use WeChat\Exceptions\InvalidResponseException;
/** /**
* 微信小程序二维码管理 * 微信小程序二维码管理
@ -44,7 +45,11 @@ class Qrcode extends BasicWeChat
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
$data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline]; $data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
$result = Tools::post($url, Tools::arr2json($data)); $result = Tools::post($url, Tools::arr2json($data));
if (json_decode($result)) { if (is_array($json = json_decode($result, true))) {
if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
return Tools::json2arr($result); return Tools::json2arr($result);
} }
return is_null($outType) ? $result : $outType($result); return is_null($outType) ? $result : $outType($result);
@ -70,7 +75,11 @@ class Qrcode extends BasicWeChat
$data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline]; $data = ['scene' => $scene, 'width' => $width, 'auto_color' => $auto_color, 'page' => $page, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
$result = Tools::post($url, Tools::arr2json($data)); $result = Tools::post($url, Tools::arr2json($data));
if (json_decode($result)) { if (is_array($json = json_decode($result, true))) {
if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
return Tools::json2arr($result); return Tools::json2arr($result);
} }
return is_null($outType) ? $result : $outType($result); return is_null($outType) ? $result : $outType($result);
@ -91,7 +100,11 @@ class Qrcode extends BasicWeChat
$url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN'; $url = 'https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN';
$this->registerApi($url, __FUNCTION__, func_get_args()); $this->registerApi($url, __FUNCTION__, func_get_args());
$result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width])); $result = Tools::post($url, Tools::arr2json(['path' => $path, 'width' => $width]));
if (json_decode($result)) { if (is_array($json = json_decode($result, true))) {
if (!$this->isTry && isset($json['errcode']) && in_array($json['errcode'], ['40014', '40001', '41001', '42001'])) {
[$this->delAccessToken(), $this->isTry = true];
return call_user_func_array([$this, $this->currentMethod['method']], $this->currentMethod['arguments']);
}
return Tools::json2arr($result); return Tools::json2arr($result);
} }
return is_null($outType) ? $result : $outType($result); return is_null($outType) ? $result : $outType($result);

21
vendor/zoujingli/weopen-developer/LICENSE vendored Normal file
View File

@ -0,0 +1,21 @@
MIT License
Copyright (c) 2019 邹景立
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.