mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
[更新]同步framework代码
This commit is contained in:
Anyon
parent
8d221b531b
commit
0147f95194
@ -41,7 +41,8 @@ class Auth extends Controller
|
||||
public function index()
|
||||
{
|
||||
$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');
|
||||
foreach ($nodes as &$node) $node['checked'] = in_array($node['node'], $checked);
|
||||
$data = $this->_apply_filter(\library\tools\Data::arr2tree($nodes, 'node', 'pnode', '_sub_'));
|
||||
return $this->success('获取权限配置成功！', $data);
|
||||
return $this->success('获取权限节点成功！', $data);
|
||||
case 'save': // 保存权限配置
|
||||
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')->insertAll($data);
|
||||
return $this->success('权限授权配置更新成功！');
|
||||
return $this->success('权限授权更新成功！');
|
||||
default:
|
||||
return $this->_form($this->table, 'apply');
|
||||
}
|
||||
|
||||
@ -159,7 +159,7 @@ class Index extends Controller
|
||||
{
|
||||
$this->applyCsrfToken();
|
||||
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 {
|
||||
$this->error('只能修改登录用户的资料！');
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use library\Controller;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 系统日志管理
|
||||
@ -40,7 +41,8 @@ class Log extends Controller
|
||||
public function index()
|
||||
{
|
||||
$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('日志清理失败，请稍候再试！');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除系统日志
|
||||
*/
|
||||
|
||||
@ -30,7 +30,7 @@ class Message extends Controller
|
||||
*/
|
||||
protected $table = 'SystemMessage';
|
||||
|
||||
/***
|
||||
/**
|
||||
* 系统消息管理
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
@ -41,7 +41,8 @@ class Message extends Controller
|
||||
public function index()
|
||||
{
|
||||
$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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -60,9 +60,10 @@ class Node extends Controller
|
||||
$nodes = array_unique(array_column(\app\admin\service\Auth::get(), 'node'));
|
||||
if (false !== Db::name($this->table)->whereNotIn('node', $nodes)->delete()) {
|
||||
$this->success('清理无效的节点配置成功！', '');
|
||||
}
|
||||
} else {
|
||||
$this->error('清理无效的节点配置，请稍候再试！');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新节点数据
|
||||
@ -79,8 +80,9 @@ class Node extends Controller
|
||||
}
|
||||
empty($data) || data_save($this->table, $data, 'node');
|
||||
$this->success('节点配置保存成功！', '');
|
||||
}
|
||||
} else {
|
||||
$this->error('访问异常，请重新进入...');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -45,8 +45,8 @@ class User extends Controller
|
||||
public function index()
|
||||
{
|
||||
$this->title = '系统用户管理';
|
||||
$query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status');
|
||||
$query->where(['is_deleted' => '0'])->order('id desc')->page();
|
||||
$query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at');
|
||||
$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']);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除系统用户
|
||||
*/
|
||||
public function del()
|
||||
{
|
||||
if (in_array('10000', explode(',', $this->request->post('id')))) {
|
||||
$this->error('系统超级账号禁止删除！');
|
||||
}
|
||||
$this->applyCsrfToken();
|
||||
$this->_delete($this->table);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -24,6 +24,7 @@ class Message extends Controller
|
||||
{
|
||||
/**
|
||||
* Message constructor.
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
||||
@ -27,6 +27,7 @@ class Plugs extends Controller
|
||||
|
||||
/**
|
||||
* Plugs constructor.
|
||||
* @throws \think\Exception
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
|
||||
@ -20,6 +20,9 @@ if (!function_exists('auth')) {
|
||||
*/
|
||||
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);
|
||||
}
|
||||
}
|
||||
@ -39,7 +42,7 @@ if (!function_exists('sysdata')) {
|
||||
$data = json_decode(\think\Db::name('SystemData')->where('name', $name)->value('value'), true);
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,14 @@
|
||||
{extend name='main'}
|
||||
|
||||
{block name="content"}
|
||||
<div class="think-box-shadow">
|
||||
<ul id="zTree" class="ztree notselect"></ul>
|
||||
<div class="hr-line-dashed"></div>
|
||||
<div class="layui-form-item text-center">
|
||||
<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>
|
||||
{/block}
|
||||
|
||||
{block name="script"}
|
||||
@ -68,13 +70,39 @@
|
||||
<link href="__ROOT__/static/plugs/ztree/zTreeStyle/zTreeStyle.css" rel="stylesheet">
|
||||
<script src="__ROOT__/static/plugs/ztree/ztree.all.min.js"></script>
|
||||
<style>
|
||||
ul.ztree li{white-space:normal!important;}
|
||||
ul.ztree li span.button.switch{margin-right:5px;}
|
||||
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;}
|
||||
ul.ztree li {
|
||||
white-space: normal !important;
|
||||
}
|
||||
|
||||
ul.ztree li span.button.switch {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
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>
|
||||
{/block}
|
||||
@ -12,6 +12,8 @@
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div class="think-box-shadow">
|
||||
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='auth/index_search'}</caption>
|
||||
<!--{notempty name='list'}-->
|
||||
@ -20,9 +22,8 @@
|
||||
<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-left nowrap'>权限信息</th>
|
||||
<th class='text-left nowrap'>创建时间</th>
|
||||
<th class="text-center">状态</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
@ -32,29 +33,35 @@
|
||||
<!--{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-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/edit")}
|
||||
<span class="text-explode">|</span>
|
||||
<a data-dbclick class="layui-btn layui-btn-xs" data-title="编辑权限" data-modal='{:url("admin/auth/edit")}?id={$vo.id}'>编 辑</a>
|
||||
<a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑权限" data-modal='{:url("admin/auth/edit")}?id={$vo.id}'>编 辑</a>
|
||||
{/if}
|
||||
|
||||
{if auth("admin/auth/apply")}
|
||||
<a class="layui-btn layui-btn-normal layui-btn-xs" data-open='{:url("admin/auth/apply")}?id={$vo.id}'>授 权</a>
|
||||
<a class="layui-btn layui-btn-normal layui-btn-sm" data-open='{:url("admin/auth/apply")}?id={$vo.id}'>授 权</a>
|
||||
{/if}
|
||||
|
||||
{if $vo.status eq 1 and auth("admin/auth/forbid")}
|
||||
<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-warm layui-btn-sm" data-action="{:url('forbid')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('admin/auth/forbid')}">禁 用</a>
|
||||
{elseif auth("admin/auth/resume")}
|
||||
<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>
|
||||
<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}
|
||||
|
||||
{if auth("admin/auth/del")}
|
||||
<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-danger layui-btn-sm" data-confirm="确定要删除数据吗?" data-action="{:url('del')}" data-value="id#{$vo.id}" data-csrf="{:systoken('admin/auth/del')}">删 除</a>
|
||||
{/if}
|
||||
|
||||
</td>
|
||||
@ -65,4 +72,6 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
|
||||
{/block}
|
||||
@ -2,8 +2,9 @@
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div style="max-width:1000px">
|
||||
<form class="layui-card layui-form">
|
||||
<div class="layui-card-body">
|
||||
<div class="layui-card-body padding-bottom-5 think-box-shadow">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">Storage<br><span class="nowrap color-desc">存储类型</span></label>
|
||||
<div class="layui-input-block">
|
||||
@ -15,10 +16,12 @@
|
||||
</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>
|
||||
|
||||
{/block}
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card padding-0' autocomplete="off">
|
||||
<div class="layui-card-body padding-0">
|
||||
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
|
||||
<div class="layui-card-body">
|
||||
<div class="color-blue padding-left-40 padding-bottom-20">
|
||||
文件将存储在本地服务器，需确保服务器的 public/upload 目录有写入权限，还需要有足够的存储空间。
|
||||
</div>
|
||||
@ -12,12 +12,8 @@
|
||||
</div>
|
||||
<div class="hr-line-dashed margin-left-40"></div>
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<input type="hidden" name="storage_type" value="local">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -1,5 +1,5 @@
|
||||
<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">
|
||||
文件将上传到阿里云OSS空间，需要配置OSS公开访问及跨域策略（目前已实现自动创建空间及配置访问策略）。
|
||||
</div>
|
||||
@ -70,12 +70,8 @@
|
||||
</div>
|
||||
<div class="hr-line-dashed margin-left-40"></div>
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<input type="hidden" name="storage_type" value="oss">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -1,5 +1,5 @@
|
||||
<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">
|
||||
文件将上传到七牛云空间（<a target="_blank" href="https://portal.qiniu.com/signup?code=3lhz6nmnwbple">点击这里免费申请10G存储</a>），申请成功后添加公开bucket并配置接口密钥。
|
||||
</div>
|
||||
@ -71,12 +71,8 @@
|
||||
</div>
|
||||
<div class="hr-line-dashed margin-left-40"></div>
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<input type="hidden" name="storage_type" value="qiniu">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
|
||||
<div class="layui-card-body">
|
||||
<div class="layui-form-item">
|
||||
<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 padding-bottom-10 think-box-shadow" style="padding-right:80px!important">
|
||||
<div class="layui-form-item margin-top-20">
|
||||
<label class="layui-form-label">Name<br><span class="nowrap color-desc">程序名称</span></label>
|
||||
<div class="layui-input-block">
|
||||
<input name="app_name" required placeholder="请输入程序名称" value="{:sysconf('app_name')}" class="layui-input">
|
||||
@ -25,13 +25,6 @@
|
||||
<p class="help-block">网站名称，显示在浏览器标签上</p>
|
||||
</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">
|
||||
<label class="layui-form-label">Browser<br><span class="nowrap color-desc">浏览器图标</span></label>
|
||||
<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>
|
||||
</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">
|
||||
<label class="layui-form-label">Miitbeian<br><span class="nowrap color-desc">网站备案</span></label>
|
||||
<div class="layui-input-block">
|
||||
@ -49,13 +49,9 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed margin-left-40"></div>
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<div class="layui-form-item text-center padding-bottom-10">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{/block}
|
||||
@ -17,7 +17,6 @@
|
||||
{block name="style"}{/block}
|
||||
<script>window.ROOT_URL = '__ROOT__';</script>
|
||||
<script src="__ROOT__/static/plugs/jquery/pace.min.js"></script>
|
||||
|
||||
</head>
|
||||
|
||||
<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>
|
||||
|
||||
@ -1,35 +1,68 @@
|
||||
{extend name='main'}
|
||||
|
||||
{block name='content'}
|
||||
<table class="layui-table" lay-even lay-skin="line">
|
||||
<div class="layui-row layui-col-space10">
|
||||
<div class="layui-col-md6">
|
||||
<fieldset class="think-box-shadow">
|
||||
<legend class="layui-bg-cyan">系统信息</legend>
|
||||
<table class="layui-table" lay-skin="line" lay-even>
|
||||
<colgroup>
|
||||
<col width="20%">
|
||||
<col width="30%">
|
||||
<col width="20%">
|
||||
<col width="30%">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-left" colspan="2">系统信息</th>
|
||||
<th class="text-left" colspan="2">产品团队</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="max-width:200px">应用组件版本</td>
|
||||
<td>当前程序版本</td>
|
||||
<td>{:sysconf('app_version')}</td>
|
||||
<td style="max-width:200px">产品名称</td>
|
||||
<td>framework</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>运行PHP版本</td>
|
||||
<td>{$Think.PHP_VERSION}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>ThinkPHP版本</td>
|
||||
<td>{$think_ver}</td>
|
||||
<td>在线体验</td>
|
||||
<td><a target="_blank" href="http://framework.thinkadmin.top">http://framework.thinkadmin.top</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>MySQL数据库版本</td>
|
||||
<td>{$mysql_ver}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>服务器操作系统</td>
|
||||
<td>{:php_uname('s')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>WEB运行环境</td>
|
||||
<td>{:php_sapi_name()}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>上传大小限制</td>
|
||||
<td>{:ini_get('upload_max_filesize')}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>POST大小限制</td>
|
||||
<td>{:ini_get('post_max_size')}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
</div>
|
||||
<div class="layui-col-md6">
|
||||
<fieldset class="think-box-shadow">
|
||||
<legend class="layui-bg-cyan">产品团队</legend>
|
||||
<table class="layui-table" lay-skin="line" lay-even>
|
||||
<colgroup>
|
||||
<col width="30%">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>产品名称</td>
|
||||
<td>framework</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>在线体验</td>
|
||||
<td><a target="_blank" href="http://framework.thinkadmin.top">http://framework.thinkadmin.top</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>官方QQ群</td>
|
||||
<td>
|
||||
<a href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a">
|
||||
@ -38,35 +71,28 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>WEB运行环境</td>
|
||||
<td>{:php_sapi_name()}</td>
|
||||
<td>项目地址</td>
|
||||
<td><a target="_blank" href="https://github.com/zoujingli/framework">https://github.com/zoujingli/framework</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>MySQL数据库版本</td>
|
||||
<td>{$mysql_ver}</td>
|
||||
<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>运行PHP版本</td>
|
||||
<td>{$Think.PHP_VERSION}</td>
|
||||
<td>开发团队</td>
|
||||
<td><a href="http://www.cuci.cc" target="_blank">广州楚才信息科技有限公司</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>上传大小限制</td>
|
||||
<td>{:ini_get('upload_max_filesize')}</td>
|
||||
<td>团队官网</td>
|
||||
<td><a target="_blank" href="http://www.cuci.cc">http://www.cuci.cc</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>POST大小限制</td>
|
||||
<td>{:ini_get('post_max_size')}</td>
|
||||
<td>办公地址</td>
|
||||
<td>广州市天河区东圃一横路东泷商贸中心G02</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
{/block}
|
||||
@ -2,6 +2,10 @@
|
||||
|
||||
{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")}
|
||||
<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}
|
||||
@ -9,6 +13,7 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div class="think-box-shadow">
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='log/index_search'}</caption>
|
||||
{notempty name='list'}
|
||||
@ -58,4 +63,6 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
|
||||
{/block}
|
||||
@ -1,11 +1,11 @@
|
||||
<div class="layui-card">
|
||||
<div class="layui-card layui-bg-gray">
|
||||
{block name='style'}{/block}
|
||||
{notempty name='title'}
|
||||
<div class="layui-card-header layui-anim layui-anim-fadein notselect">
|
||||
<span class="layui-icon font-s10 color-desc margin-right-5"></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>
|
||||
{/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}
|
||||
</div>
|
||||
@ -13,10 +13,10 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div style="background:#fff">
|
||||
<!--{empty name='list'}-->
|
||||
<blockquote class="layui-elem-quote">没 有 记 录 哦！</blockquote>
|
||||
<!--{else}-->
|
||||
<input type="hidden" value="resort" name="action">
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -29,8 +29,7 @@
|
||||
<th class='text-center' style="width:30px"></th>
|
||||
<th style="width:180px"></th>
|
||||
<th class='layui-hide-xs' style="width:180px"></th>
|
||||
<th style="width:100px"></th>
|
||||
<th></th>
|
||||
<th colspan="2"></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -45,7 +44,7 @@
|
||||
<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='layui-hide-xs'>{$vo.url}</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'>{eq name='vo.status' value='0'}<span class="color-red">已禁用</span>{else}<span class="color-green">使用中</span>{/eq}</td>
|
||||
<td class='text-center nowrap notselect'>
|
||||
|
||||
{if auth("admin/menu/add")}
|
||||
@ -77,4 +76,5 @@
|
||||
</tbody>
|
||||
</table>
|
||||
<!--{/empty}-->
|
||||
</div>
|
||||
{/block}
|
||||
@ -42,6 +42,9 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div class="think-box-shadow">
|
||||
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='message/index_search'}</caption>
|
||||
{notempty name='list'}
|
||||
@ -90,4 +93,6 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
|
||||
{/block}
|
||||
@ -26,18 +26,16 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div class="layui-tab layui-tab-card layui-box">
|
||||
<ul class="layui-tab-title">
|
||||
<div class="layui-tab layui-tab-card layui-box" style="background:#fff">
|
||||
<ul class="layui-tab-title notselect">
|
||||
{foreach $groups as $key=>$group}
|
||||
<li data-type='{$key}'>
|
||||
{$group.node.title|default='<span class="color-desc">未配置名称</span>'|raw}（{$key}）
|
||||
</li>
|
||||
<li data-type='{$key}'>{$group.node.title|default='<span class="color-desc">未配置名称</span>'|raw}（{$key}）</li>
|
||||
{/foreach}
|
||||
</ul>
|
||||
<div class="layui-tab-content">
|
||||
<div class="layui-tab-content padding-0">
|
||||
{foreach $groups as $key=>$group}
|
||||
<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'}-->
|
||||
<p class="help-block text-center well">没 有 记 录 哦！</p>
|
||||
<!--{else}-->
|
||||
@ -45,25 +43,27 @@
|
||||
<tr>
|
||||
<td class='text-left nowrap'>
|
||||
<span class="color-desc">{$vo.spl|raw}</span>{$vo.node}
|
||||
{if auth("admin/node/save")} <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 class='text-left nowrap text-middle'>
|
||||
{if auth("admin/node/save") and $vo.spt eq 1}
|
||||
<label class="color-desc think-checkbox">
|
||||
<input data-login-group="{$vo.node}" type="checkbox"> 全部加入登录控制
|
||||
</label>
|
||||
|
||||
<label class="notselect margin-left-15 color-desc think-checkbox">
|
||||
<label class="notselect margin-left-20 color-desc think-checkbox">
|
||||
<input data-auth-group="{$vo.node}" type="checkbox"> 全部加入权限控制
|
||||
</label>
|
||||
|
||||
<label class="notselect margin-left-15 color-desc think-checkbox">
|
||||
<label class="notselect margin-left-20 color-desc think-checkbox">
|
||||
<input data-menu-group="{$vo.node}" type="checkbox"> 全部加入菜单节点选择器
|
||||
</label>
|
||||
{/if}
|
||||
{if auth("admin/node/save") and $vo.spt eq 2}
|
||||
<span class="color-desc"> ├ </span>
|
||||
<label class="notselect margin-right-15 think-checkbox">
|
||||
<span class="color-desc"> ├ </span>
|
||||
<label class="notselect margin-right-20 think-checkbox">
|
||||
<!--{notempty name='vo.is_login'}-->
|
||||
<input data-login-filter="{$vo.pnode}" checked='checked' class="check-box login_{$key}" type='checkbox' value='1' name='is_login' data-node="{$vo.node}" onclick="!this.checked && ($('.auth_{$key}')[0].checked = !!this.checked)">
|
||||
<!--{else}-->
|
||||
@ -71,8 +71,8 @@
|
||||
<!--{/notempty}-->
|
||||
加入登录控制
|
||||
</label>
|
||||
<span class="color-desc"> ├ </span>
|
||||
<label class="notselect margin-right-15 think-checkbox">
|
||||
<span class="color-desc"> ├ </span>
|
||||
<label class="notselect margin-right-20 think-checkbox">
|
||||
<!--{notempty name='vo.is_auth'}-->
|
||||
<input data-auth-filter="{$vo.pnode}" name='is_auth' data-node="{$vo.node}" checked='checked' class="check-box auth_{$key}" type='checkbox' onclick="this.checked && ($('.login_{$key}')[0].checked = !!this.checked)" value='1'>
|
||||
<!--{else}-->
|
||||
@ -80,7 +80,7 @@
|
||||
<!--{/notempty}-->
|
||||
加入权限控制
|
||||
</label>
|
||||
<span class="color-desc"> ├ </span>
|
||||
<span class="color-desc"> ├ </span>
|
||||
<label class="notselect think-checkbox">
|
||||
<!--{notempty name='vo.is_menu'}-->
|
||||
<input data-menu-filter="{$vo.pnode}" name='is_menu' data-node="{$vo.node}" checked='checked' class='check-box menu_{$key}' type='checkbox' value='1'>
|
||||
|
||||
@ -3,12 +3,15 @@
|
||||
{block name="button"}
|
||||
|
||||
<!--{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}-->
|
||||
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div class="think-box-shadow">
|
||||
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='queue/index_search'}</caption>
|
||||
<!--{notempty name='list'}-->
|
||||
@ -75,4 +78,5 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
{/block}
|
||||
@ -13,6 +13,8 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div class="think-box-shadow">
|
||||
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='user/index_search'}</caption>
|
||||
{notempty name='list'}
|
||||
@ -35,11 +37,11 @@
|
||||
<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='--'}
|
||||
联系手机：{$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}
|
||||
使用状态：{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>
|
||||
@ -75,4 +77,6 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
|
||||
{/block}
|
||||
@ -17,11 +17,9 @@ namespace app\service\controller;
|
||||
use library\Controller;
|
||||
|
||||
/**
|
||||
* 微信配置管理
|
||||
* Class Index
|
||||
* @package app\wechat\controller
|
||||
* @author Anyon <zoujingli@qq.com>
|
||||
* @date 2017/03/27 14:43
|
||||
* 开放平台参数配置
|
||||
* Class Config
|
||||
* @package app\service\controller
|
||||
*/
|
||||
class Config extends Controller
|
||||
{
|
||||
@ -42,10 +40,11 @@ class Config extends Controller
|
||||
$this->applyCsrfToken();
|
||||
$this->title = '开放平台接口配置';
|
||||
if ($this->request->isGet()) {
|
||||
return $this->fetch();
|
||||
$this->fetch();
|
||||
} else {
|
||||
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
|
||||
$this->success('开放平台参数修改成功！', '');
|
||||
$post = $this->request->post();
|
||||
foreach ($post as $k => $v) sysconf($k, $v);
|
||||
$this->success('开放平台参数修改成功！');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
namespace app\service\controller;
|
||||
|
||||
use app\service\logic\Build;
|
||||
use app\service\logic\Wechat;
|
||||
use app\service\service\Build;
|
||||
use app\service\service\Wechat;
|
||||
use library\Controller;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* Class Index
|
||||
* 公众授权管理
|
||||
* @package app\service\controller
|
||||
*/
|
||||
class Index extends Controller
|
||||
@ -33,7 +33,7 @@ class Index extends Controller
|
||||
public $table = 'WechatServiceConfig';
|
||||
|
||||
/**
|
||||
* 授权公众号管理
|
||||
* 公众授权管理
|
||||
* @return string
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
@ -43,7 +43,7 @@ class Index extends Controller
|
||||
public function index()
|
||||
{
|
||||
$this->applyCsrfToken();
|
||||
$this->title = '微信授权管理';
|
||||
$this->title = '公众授权管理';
|
||||
$query = $this->_query($this->table)->like('authorizer_appid,nick_name,principal_name');
|
||||
$query = $query->equal('service_type,status')->dateBetween('create_at');
|
||||
$query->where(['is_deleted' => '0'])->order('id desc')->page();
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
namespace app\service\controller\api;
|
||||
|
||||
use app\service\logic\Wechat;
|
||||
use app\service\service\Wechat;
|
||||
use think\Controller;
|
||||
use think\Db;
|
||||
|
||||
|
||||
@ -14,8 +14,8 @@
|
||||
|
||||
namespace app\service\controller\api;
|
||||
|
||||
use app\service\logic\Build;
|
||||
use app\service\logic\Wechat;
|
||||
use app\service\service\Build;
|
||||
use app\service\service\Wechat;
|
||||
use library\Controller;
|
||||
use think\Db;
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
namespace app\service\handler;
|
||||
|
||||
use app\service\logic\Wechat;
|
||||
use app\service\service\Wechat;
|
||||
|
||||
/**
|
||||
* 第三方平台测试上线
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
namespace app\service\handler;
|
||||
|
||||
use app\service\logic\Wechat;
|
||||
use app\service\service\Wechat;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
namespace app\service\handler;
|
||||
|
||||
use app\service\logic\Wechat as WechatLogic;
|
||||
use app\service\service\Wechat as WechatLogic;
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
@ -64,15 +64,6 @@ class Wechat
|
||||
throw new \think\Exception('Wechat Please bind Wechat first');
|
||||
}
|
||||
|
||||
/**
|
||||
* 接口测试
|
||||
* @return integer
|
||||
*/
|
||||
public function test()
|
||||
{
|
||||
return time();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前公众号配置
|
||||
* @return array|boolean
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
// | github开源项目：https://github.com/zoujingli/framework
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\service\logic;
|
||||
namespace app\service\service;
|
||||
|
||||
/**
|
||||
* 公众号授权数据处理
|
||||
* Class BuildService
|
||||
* @package app\wechat\service
|
||||
* 授权数据处理
|
||||
* Class Build
|
||||
* @package app\service\service
|
||||
*/
|
||||
class Build
|
||||
{
|
||||
@ -12,14 +12,14 @@
|
||||
// | github开源项目：https://github.com/zoujingli/framework
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\service\logic;
|
||||
namespace app\service\service;
|
||||
|
||||
use think\Db;
|
||||
|
||||
/**
|
||||
* 微信数据服务
|
||||
* Class Wechat
|
||||
* @package app\service\logic
|
||||
* @package app\service\service
|
||||
* @method \WeChat\Card WeChatCard($appid) static 微信卡券管理
|
||||
* @method \WeChat\Custom WeChatCustom($appid) static 微信客服消息
|
||||
* @method \WeChat\Limit WeChatLimit($appid) static 接口调用频次限制
|
||||
@ -2,8 +2,10 @@
|
||||
|
||||
{block name="content"}
|
||||
<div class="nowrap" style="width:1295px">
|
||||
<div class="layui-code margin-bottom-20">强烈建议安装 YAR 扩展来实现接口通信，SOAP 不能正常显示接口的异常信息。</div>
|
||||
<fieldset class="margin-bottom-15 margin-right-10 pull-left" style="width:600px">
|
||||
<div class="layui-code margin-top-0 margin-bottom-20 think-box-shadow" style="border-left-width:1px">
|
||||
强烈建议安装 YAR 扩展来实现接口通信，SOAP 不能正常显示接口的异常信息。
|
||||
</div>
|
||||
<fieldset class="margin-bottom-15 margin-right-10 pull-left think-box-shadow wechat-box">
|
||||
<legend class="layui-bg-cyan">授权参数</legend>
|
||||
<form onsubmit="return false;" data-auto="true" method="post" class='layui-form layui-card' autocomplete="off">
|
||||
<div class="layui-form-item">
|
||||
@ -41,7 +43,7 @@
|
||||
</form>
|
||||
</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>
|
||||
<div class="layui-form-item">
|
||||
<p class="color-green">授权发起页域名</p>
|
||||
@ -83,6 +85,10 @@
|
||||
|
||||
{block name='style'}
|
||||
<style>
|
||||
fieldset.wechat-box {
|
||||
width: 600px
|
||||
}
|
||||
|
||||
.right-btn {
|
||||
top: 0;
|
||||
right: 0;
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div class="think-box-shadow">
|
||||
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='index/index_search'}</caption>
|
||||
{notempty name='list'}
|
||||
@ -76,4 +78,6 @@
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
|
||||
{/block}
|
||||
@ -27,7 +27,6 @@ class Config extends Controller
|
||||
{
|
||||
/**
|
||||
* 公众号授权绑定
|
||||
* @return mixed
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
@ -53,13 +52,15 @@ class Config extends Controller
|
||||
} catch (\Exception $e) {
|
||||
$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);
|
||||
}
|
||||
$this->success('公众号参数获取成功！', url('@admin') . '#' . url('wechat/config/options'));
|
||||
$uri = url('wechat/config/options');
|
||||
$this->success('公众号参数获取成功！', url('@admin') . "#{$uri}");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -71,8 +72,8 @@ class Config extends Controller
|
||||
public function payment()
|
||||
{
|
||||
$this->applyCsrfToken();
|
||||
$this->title = '公众号支付配置';
|
||||
if ($this->request->isGet()) {
|
||||
$this->title = '公众号支付配置';
|
||||
$file = File::instance('local');
|
||||
$this->wechat_mch_ssl_cer = sysconf('wechat_mch_ssl_cer');
|
||||
$this->wechat_mch_ssl_key = sysconf('wechat_mch_ssl_key');
|
||||
@ -80,8 +81,8 @@ 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_key, true)) $this->wechat_mch_ssl_key = '';
|
||||
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 (!($sslp12 = $this->request->post('wechat_mch_ssl_p12'))) {
|
||||
$mchid = $this->request->post('wechat_mch_id');
|
||||
@ -94,5 +95,6 @@ class Config extends Controller
|
||||
foreach ($this->request->post() as $k => $v) sysconf($k, $v);
|
||||
$this->success('公众号支付配置成功！');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -45,8 +45,8 @@ class Fans extends Controller
|
||||
public function index()
|
||||
{
|
||||
$this->title = '微信粉丝管理';
|
||||
$this->_query($this->table)->like('nickname')->equal('subscribe,is_black')
|
||||
->dateBetween('subscribe_at')->order('subscribe_time desc')->page();
|
||||
$query = $this->_query($this->table)->like('nickname')->equal('subscribe,is_black');
|
||||
$query->dateBetween('subscribe_at')->order('subscribe_time desc')->page();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -18,7 +18,6 @@ use app\wechat\service\Wechat;
|
||||
use library\Controller;
|
||||
use think\Db;
|
||||
|
||||
|
||||
/**
|
||||
* 回复规则管理
|
||||
* Class Keys
|
||||
@ -66,7 +65,8 @@ class Keys extends Controller
|
||||
}
|
||||
// 关键字列表显示
|
||||
$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
|
||||
*/
|
||||
public function subscribe()
|
||||
@ -147,7 +147,7 @@ class Keys extends Controller
|
||||
|
||||
|
||||
/**
|
||||
* 无配置默认回复
|
||||
* 配置默认回复
|
||||
* @return array|string
|
||||
*/
|
||||
public function defaults()
|
||||
@ -176,8 +176,8 @@ class Keys extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑结果处理
|
||||
* @param $result
|
||||
* 表单结果处理
|
||||
* @param boolean $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');
|
||||
}
|
||||
$this->success('恭喜, 关键字保存成功!', $url);
|
||||
}
|
||||
} else {
|
||||
$this->error('关键字保存失败, 请稍候再试!');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -44,7 +44,6 @@ class Menu extends Controller
|
||||
|
||||
/**
|
||||
* 微信菜单管理
|
||||
* @return array
|
||||
* @throws \think\Exception
|
||||
* @throws \think\db\exception\DataNotFoundException
|
||||
* @throws \think\db\exception\ModelNotFoundException
|
||||
@ -57,10 +56,11 @@ class Menu extends Controller
|
||||
$where = [['keys', 'notin', ['subscribe', 'default']], ['status', 'eq', '1']];
|
||||
$keys = Db::name('WechatKeys')->where($where)->order('sort asc,id desc')->select();
|
||||
$this->success('获取数据成功!', ['menudata' => sysdata('menudata'), 'keysdata' => $keys]);
|
||||
}
|
||||
} else {
|
||||
$this->title = '微信菜单定制';
|
||||
$this->menuTypes = $this->menuType;
|
||||
return $this->fetch();
|
||||
$this->fetch();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -74,9 +74,9 @@ class Menu extends Controller
|
||||
try {
|
||||
Wechat::WeChatMenu()->delete();
|
||||
} catch (\Exception $e) {
|
||||
$this->error('删除取消微信菜单失败，请稍候再试！' . $e->getMessage());
|
||||
$this->error('删除微信菜单失败，请稍候再试！' . $e->getMessage());
|
||||
}
|
||||
$this->success('删除并取消微信菜单成功！', '');
|
||||
$this->success('删除微信菜单成功！', '');
|
||||
}
|
||||
try {
|
||||
sysdata('menudata', $this->buildMenu($menudata = json_decode($data, true)));
|
||||
@ -132,10 +132,7 @@ class Menu extends Controller
|
||||
case 'view':
|
||||
return ['name' => $item['name'], 'type' => $item['type'], 'url' => $item['url']];
|
||||
case 'miniprogram':
|
||||
return [
|
||||
'name' => $item['name'], 'type' => $item['type'], 'url' => $item['url'],
|
||||
'appid' => $item['appid'], 'pagepath' => $item['pagepath'],
|
||||
];
|
||||
return ['name' => $item['name'], 'type' => $item['type'], 'url' => $item['url'], 'appid' => $item['appid'], 'pagepath' => $item['pagepath']];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -35,12 +35,16 @@ class News extends Controller
|
||||
/**
|
||||
* 微信图文管理
|
||||
* @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()
|
||||
{
|
||||
$this->title = '微信图文列表';
|
||||
$db = Db::name($this->table)->where(['is_deleted' => '0']);
|
||||
return parent::_page($db->order('id desc'));
|
||||
$this->_query($this->table)->where(['is_deleted' => '0'])->order('id desc')->page();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -58,6 +62,11 @@ class News extends Controller
|
||||
/**
|
||||
* 图文选择器
|
||||
* @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()
|
||||
{
|
||||
@ -78,7 +87,6 @@ class News extends Controller
|
||||
|
||||
/**
|
||||
* 添加微信图文
|
||||
* @return string
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
@ -86,8 +94,8 @@ class News extends Controller
|
||||
{
|
||||
if ($this->request->isGet()) {
|
||||
$this->title = '新建图文';
|
||||
return $this->fetch('form');
|
||||
}
|
||||
$this->fetch('form');
|
||||
} else {
|
||||
$data = $this->request->post();
|
||||
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) {
|
||||
@ -97,10 +105,10 @@ class News extends Controller
|
||||
}
|
||||
$this->error('图文添加失败，请稍候再试！');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑微信图文
|
||||
* @return string
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
@ -112,8 +120,8 @@ class News extends Controller
|
||||
if ($this->request->get('output') === 'json') {
|
||||
$this->success('获取数据成功！', Media::news($id));
|
||||
}
|
||||
return $this->fetch('form', ['title' => '编辑图文']);
|
||||
}
|
||||
$this->fetch('form', ['title' => '编辑图文']);
|
||||
} else {
|
||||
$post = $this->request->post();
|
||||
if (isset($post['data']) && ($ids = $this->_apply_news_article($post['data']))) {
|
||||
if (data_save('wechat_news', ['id' => $id, 'article_id' => $ids], 'id')) {
|
||||
@ -122,6 +130,7 @@ class News extends Controller
|
||||
}
|
||||
$this->error('图文更新失败，请稍候再试！');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 图文更新操作
|
||||
|
||||
@ -36,7 +36,7 @@ class Review extends Controller
|
||||
public function news($id = 0)
|
||||
{
|
||||
$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];
|
||||
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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -119,8 +119,9 @@ class Wechat extends \We
|
||||
* 接口对象实例化
|
||||
* @param string $name 接口名称
|
||||
* @param string $type 接口类型
|
||||
* @param array $config
|
||||
* @param array $config 微信配置
|
||||
* @return mixed
|
||||
* @throws \SoapFault
|
||||
* @throws \think\Exception
|
||||
* @throws \think\exception\PDOException
|
||||
*/
|
||||
@ -147,7 +148,7 @@ class Wechat extends \We
|
||||
|
||||
/**
|
||||
* 获取微信网页JSSDK
|
||||
* @param null|string $url JS签名地址
|
||||
* @param string $url JS签名地址
|
||||
* @return array
|
||||
* @throws \WeChat\Exceptions\InvalidResponseException
|
||||
* @throws \WeChat\Exceptions\LocalCacheException
|
||||
|
||||
@ -2,8 +2,9 @@
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div style="max-width:1000px">
|
||||
<form class="layui-card layui-form">
|
||||
<div class="layui-card-body">
|
||||
<div class="layui-card-body think-box-shadow padding-bottom-5">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">Type<br><span class="nowrap color-desc">对接方式</span></label>
|
||||
<div class="layui-input-block">
|
||||
@ -15,10 +16,12 @@
|
||||
</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>
|
||||
|
||||
{/block}
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<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">
|
||||
使用API直接对接时，需要在微信公众号平台配置授权IP及网页授权域名，另外再将获取到的参数填写到下面！
|
||||
@ -56,13 +56,9 @@
|
||||
<div class="hr-line-dashed"></div>
|
||||
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<input type="hidden" name="wechat_type" value="api">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<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-elem-quote border-0" style="max-width:630px">
|
||||
<div class="layui-elem-quote border-0">
|
||||
<p class="font-s14 margin-bottom-10 color-text">
|
||||
<strong>第三方平台授权</strong><br>
|
||||
JSSDK签名测试需要在开放平台配置当前的授权域名：<a data-copy="{:request()->host()}">{:request()->host()}</a>
|
||||
@ -15,6 +15,7 @@
|
||||
JSAPI支付测试需要在微信商户平台配置支付目录：<a data-copy="{:url('@wechat/api.tools/','','',true)}">{:url('@wechat/api.tools/','','',true)}</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="layui-clear">
|
||||
<div class="pull-left padding-right-15 notselect">
|
||||
<img class="notselect" data-tips-image src="{:url('@wechat/api.tools/oauth_qrc')}" style="width:120px">
|
||||
<p class="text-center">网页授权</p>
|
||||
@ -36,4 +37,5 @@
|
||||
<p class="text-center">扫码支付②</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@ -1,6 +1,6 @@
|
||||
<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">
|
||||
使用第三方授权时，需要单独搭建 SERVICE 服务并将域名配置到 WECHAT 文件，二者需要使用 Yar 或 Soap 通信！
|
||||
@ -59,13 +59,9 @@
|
||||
<div class="hr-line-dashed"></div>
|
||||
|
||||
<div class="layui-form-item text-center">
|
||||
<div class="layui-row">
|
||||
<div class="layui-col-sm8 layui-col-md6">
|
||||
<input type="hidden" name="wechat_type" value="thr">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{extend name="admin@main"}
|
||||
|
||||
{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>
|
||||
<div class="layui-input-block">
|
||||
<input name="wechat_mch_id" required placeholder="请输入微信商户ID（必填）" value="{:sysconf('wechat_mch_id')}" class="layui-input">
|
||||
@ -53,12 +53,9 @@
|
||||
|
||||
<div class="hr-line-dashed"></div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"></label>
|
||||
<div class="layui-input-block text-center" style="max-width:300px">
|
||||
<div class="layui-form-item text-center">
|
||||
<button class="layui-btn" type="submit">保存配置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
|
||||
<div class="think-box-shadow">
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='fans/index_search'}</caption>
|
||||
<!--{notempty name='list'}-->
|
||||
@ -89,7 +89,6 @@
|
||||
<!--{/foreach}-->
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
{/block}
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
{block name="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 [data-tips-image]{width:112px;height:auto}
|
||||
.keys-container .layui-card{width:580px;height:578px;position:absolute;border:1px solid #ccc}
|
||||
@ -11,7 +10,7 @@
|
||||
{/block}
|
||||
|
||||
{block name="content"}
|
||||
<div class="nowrap">
|
||||
<div class="nowrap think-box-shadow" style="width:910px">
|
||||
<div class='mobile-preview inline-block'>
|
||||
<div class='mobile-header'>公众号</div>
|
||||
<div class='mobile-body'>
|
||||
|
||||
@ -13,6 +13,7 @@
|
||||
{/block}
|
||||
|
||||
{block name='content'}
|
||||
<div class="think-box-shadow">
|
||||
<table class="layui-table" lay-skin="line">
|
||||
<caption class="margin-bottom-10 text-left">{include file='keys/index_search'}</caption>
|
||||
<!--{notempty name='list'}-->
|
||||
@ -87,9 +88,8 @@
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
{block name="script"}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{extend name="admin@main"}
|
||||
|
||||
{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-header'>公众号</div>
|
||||
<div class='mobile-body'></div>
|
||||
@ -29,7 +29,7 @@
|
||||
</ul>
|
||||
</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-body" ng-if="list.length<1">
|
||||
<blockquote class="layui-elem-quote border-0 text-center">请在左侧创建菜单...</blockquote>
|
||||
|
||||
@ -33,17 +33,17 @@
|
||||
<form class="layui-form" role="form" name="news" onsubmit="return false">
|
||||
|
||||
<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">
|
||||
</label>
|
||||
|
||||
<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">
|
||||
</label>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<span class="help-block">图文封面大图片<sup class="color-red padding-left-5">*</sup></span>
|
||||
<div class="layui-form-item label-required-prev">
|
||||
<span class="color-green">图文封面大图片</span>
|
||||
<div class="layui-clear">
|
||||
<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">
|
||||
@ -59,8 +59,8 @@
|
||||
<p class="color-desc">封面大图片建议尺寸 900像素 * 500像素</p>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<span class="help-block">图文文章内容<sup class="color-red padding-left-5">*</sup></span>
|
||||
<div class="layui-form-item label-required-prev">
|
||||
<span class="color-green">图文文章内容</span>
|
||||
<textarea ng-model="item.content" name='content'></textarea>
|
||||
</div>
|
||||
|
||||
@ -225,21 +225,4 @@
|
||||
</script>
|
||||
{/block}
|
||||
|
||||
{block name="style"}
|
||||
<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}
|
||||
{block name="style"}{include file='wechat@news/form_style'}{/block}
|
||||
99
application/wechat/view/news/form_style.html
Normal file
99
application/wechat/view/news/form_style.html
Normal 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>
|
||||
@ -5,7 +5,7 @@
|
||||
{/block}
|
||||
|
||||
{block name='content'}
|
||||
|
||||
<div class="think-box-shadow">
|
||||
<div id="news-box" class="layui-clear">
|
||||
{foreach $list as $vo}
|
||||
<div class="news-item">
|
||||
@ -31,9 +31,8 @@
|
||||
</div>
|
||||
{/foreach}
|
||||
</div>
|
||||
|
||||
{empty name='list'}<span class="notdata">没有记录哦</span>{else}{$pagehtml|raw|default=''}{/empty}
|
||||
|
||||
</div>
|
||||
{/block}
|
||||
|
||||
{block name='script'}
|
||||
|
||||
@ -10,20 +10,20 @@
|
||||
// | github开源项目：https://github.com/zoujingli/framework
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
// IE兼容提示
|
||||
// 浏览器兼容提示
|
||||
(function (w) {
|
||||
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>';
|
||||
}
|
||||
}(window));
|
||||
|
||||
// Layui及jQuery兼容处理
|
||||
// Layui & jQuery
|
||||
if (typeof jQuery === 'undefined') window.$ = window.jQuery = layui.$;
|
||||
window.form = layui.form, window.layer = layui.layer, window.laydate = layui.laydate;
|
||||
|
||||
// 当前资源URL目录
|
||||
window.baseRoot = (function () {
|
||||
var src = document.scripts[document.scripts.length - 1].src;
|
||||
window.baseRoot = (function (src) {
|
||||
src = document.scripts[document.scripts.length - 1].src;
|
||||
return src.substring(0, src.lastIndexOf("/") + 1);
|
||||
})();
|
||||
|
||||
@ -63,8 +63,8 @@ define('jquery', [], function () {
|
||||
$(function () {
|
||||
window.$body = $('body');
|
||||
/*! 消息组件实例 */
|
||||
$.msg = new function () {
|
||||
var that = this;
|
||||
$.msg = new function (that) {
|
||||
that = this;
|
||||
this.indexs = [];
|
||||
this.shade = [0.02, '#000'];
|
||||
// 关闭消息框
|
||||
@ -124,8 +124,8 @@ $(function () {
|
||||
};
|
||||
|
||||
/*! 表单自动化组件 */
|
||||
$.form = new function () {
|
||||
var that = this;
|
||||
$.form = new function (that) {
|
||||
that = this;
|
||||
// 内容区选择器
|
||||
this.selecter = '.layui-layout-admin>.layui-body';
|
||||
// 刷新当前页面
|
||||
@ -138,14 +138,18 @@ $(function () {
|
||||
$dom = $dom || $(this.selecter);
|
||||
$dom.find('[required]').map(function ($parent) {
|
||||
if (($parent = $(this).parent()) && $parent.is('label')) {
|
||||
$parent.addClass('label-required-prev')
|
||||
$parent.addClass('label-required-prev');
|
||||
} else {
|
||||
$parent.prevAll('label').addClass('label-required-next')
|
||||
$parent.prevAll('label').addClass('label-required-next');
|
||||
}
|
||||
});
|
||||
$dom.find('[data-date-range]').map(function () {
|
||||
laydate.render({range: true, elem: this});
|
||||
$dom.find('input[data-date-range]').map(function () {
|
||||
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) {
|
||||
$this = $(elem), field = $this.attr('data-field') || 'file';
|
||||
@ -163,12 +167,11 @@ $(function () {
|
||||
that.reInit($(that.selecter));
|
||||
}, 500);
|
||||
};
|
||||
// 以hash打开网页
|
||||
// 以HASH打开新网页
|
||||
this.href = function (url, obj) {
|
||||
if (url !== '#') window.location.href = '#' + $.menu.parseUri(url, obj);
|
||||
else if (obj && obj.getAttribute('data-menu-node')) {
|
||||
var node = obj.getAttribute('data-menu-node');
|
||||
$('[data-menu-node^="' + node + '-"][data-open!="#"]:first').trigger('click');
|
||||
$('[data-menu-node^="' + obj.getAttribute('data-menu-node') + '-"][data-open!="#"]:first').trigger('click');
|
||||
}
|
||||
};
|
||||
// 异步加载的数据
|
||||
@ -197,17 +200,17 @@ $(function () {
|
||||
// 加载HTML到目标位置
|
||||
this.open = function (url, data, callback, loading, tips) {
|
||||
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);
|
||||
};
|
||||
// 打开一个iframe窗口
|
||||
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到弹出层
|
||||
this.modal = function (url, data, title, callback, loading, tips) {
|
||||
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({
|
||||
type: 1, btn: false, area: "800px", content: res, title: title || '', success: function (dom, index) {
|
||||
$(dom).find('[data-close]').off('click').on('click', function () {
|
||||
@ -220,14 +223,14 @@ $(function () {
|
||||
}
|
||||
});
|
||||
$.msg.indexs.push(index);
|
||||
return (typeof callback === 'function') && callback.call(this);
|
||||
return (typeof callback === 'function') && callback.call(that);
|
||||
}, loading, tips);
|
||||
};
|
||||
};
|
||||
|
||||
/*! 后台菜单辅助插件 */
|
||||
$.menu = new function () {
|
||||
var self = this;
|
||||
$.menu = new function (that) {
|
||||
that = this;
|
||||
// 计算URL地址中有效的URI
|
||||
this.getUri = function (uri) {
|
||||
uri = uri || window.location.href;
|
||||
@ -250,7 +253,7 @@ $(function () {
|
||||
var attrs = uri.split('?')[1].split('&');
|
||||
for (var i in attrs) if (attrs[i].indexOf('=') > -1) {
|
||||
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[""];
|
||||
@ -282,7 +285,7 @@ $(function () {
|
||||
})($('.layui-layout-admin'), 'layui-layout-left-mini');
|
||||
// 左则二级菜单展示
|
||||
$('[data-submenu-layout]>a').on('click', function () {
|
||||
self.syncOpenStatus(1);
|
||||
that.syncOpenStatus(1);
|
||||
});
|
||||
// 同步二级菜单展示状态
|
||||
this.syncOpenStatus = function (mode) {
|
||||
@ -295,9 +298,9 @@ $(function () {
|
||||
window.onhashchange = function () {
|
||||
var hash = window.location.hash || '';
|
||||
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)) {
|
||||
var $all = $('a[data-menu-node]').parent(), tmp = node.split('-'), tmpNode = tmp.shift();
|
||||
while (tmp.length > 0) {
|
||||
@ -312,7 +315,7 @@ $(function () {
|
||||
$('[data-menu-node="' + node + '"]').parent().parent().parent().addClass('layui-nav-itemed');
|
||||
$('.layui-layout-admin').removeClass('layui-layout-left-hide');
|
||||
} else $('.layui-layout-admin').addClass('layui-layout-left-hide');
|
||||
self.syncOpenStatus(1);
|
||||
that.syncOpenStatus(1);
|
||||
}
|
||||
};
|
||||
// URI初始化动作
|
||||
@ -322,8 +325,8 @@ $(function () {
|
||||
|
||||
/*! 注册对象到Jq */
|
||||
$.vali = function (form, callback, options) {
|
||||
return (new function () {
|
||||
var that = this;
|
||||
return (new function (that) {
|
||||
that = this;
|
||||
// 表单元素
|
||||
this.tags = 'input,textarea,select';
|
||||
// 检测元素事件
|
||||
@ -344,17 +347,16 @@ $(function () {
|
||||
};
|
||||
// 判断表单元素是否为空
|
||||
this.isEmpty = function (ele, value) {
|
||||
var trimValue = this.trim(ele.value);
|
||||
var trim = this.trim(ele.value);
|
||||
value = value || ele.getAttribute('placeholder');
|
||||
return (trimValue === "" || trimValue === value);
|
||||
return (trim === "" || trim === value);
|
||||
};
|
||||
// 正则验证表单元素
|
||||
this.isRegex = function (ele, regex, params) {
|
||||
var inputValue = $(ele).val();
|
||||
var realValue = this.trim(inputValue);
|
||||
var input = $(ele).val(), real = this.trim(input);
|
||||
regex = regex || ele.getAttribute('pattern');
|
||||
if (realValue === "" || !regex) return true;
|
||||
return new RegExp(regex, params || 'i').test(realValue);
|
||||
if (real === "" || !regex) return true;
|
||||
return new RegExp(regex, params || 'i').test(real);
|
||||
};
|
||||
// 检侧所的表单元素
|
||||
this.checkAllInput = function () {
|
||||
@ -584,8 +586,7 @@ $(function () {
|
||||
|
||||
/*! 注册 data-action 事件行为 */
|
||||
$body.on('click', '[data-action]', function () {
|
||||
var $this = $(this), data = {};
|
||||
var time = $this.attr('data-time'), action = $this.attr('data-action');
|
||||
var $this = $(this), data = {}, time = $this.attr('data-time'), action = $this.attr('data-action');
|
||||
var loading = $this.attr('data-loading'), method = $this.attr('data-method') || 'post';
|
||||
var rule = $this.attr('data-value') || (function (rule, ids) {
|
||||
$($this.attr('data-target') || 'input[type=checkbox].list-check-box').map(function () {
|
||||
@ -662,6 +663,13 @@ $(function () {
|
||||
}, 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 事件行为 */
|
||||
$body.on('click', '[data-tips-image]', function () {
|
||||
$.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'});
|
||||
};
|
||||
|
||||
/*! 注册 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 () {
|
||||
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();
|
||||
$.vali.listen();
|
||||
|
||||
@ -21,7 +21,7 @@ CKEDITOR.plugins.add("uimage", {
|
||||
init: function (editor) {
|
||||
editor.ui.addButton("UploadImage", {label: "上传本地图片", command: 'uimage', icon: 'image', toolbar: 'insert,10'});
|
||||
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) {
|
||||
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) {
|
||||
editor.ui.addButton("UploadMusic", {label: "上传MP3文件", command: 'umusic', icon: 'specialchar', toolbar: 'insert,10'});
|
||||
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) {
|
||||
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) {
|
||||
editor.ui.addButton("UploadVideo", {label: "上传MP4文件", command: 'uvideo', icon: 'flash', toolbar: 'insert,10'});
|
||||
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) {
|
||||
editor.insertElement(CKEDITOR.dom.element.createFromHtml('<video width="100%" controls="controls"><source src="' + url + '" type="audio/mp4"></video>'));
|
||||
});
|
||||
@ -72,4 +72,3 @@ CKEDITOR.plugins.add('uhtml', {
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
30
public/static/plugs/jquery/area/area.js
vendored
Normal file
30
public/static/plugs/jquery/area/area.js
vendored
Normal 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
6191
public/static/plugs/jquery/area/area.json
Normal file
File diff suppressed because it is too large
Load Diff
18
public/static/plugs/jquery/area/area.php
Normal file
18
public/static/plugs/jquery/area/area.php
Normal 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';
|
||||
}
|
||||
4
public/static/plugs/jquery/pcasunzips.js
vendored
4
public/static/plugs/jquery/pcasunzips.js
vendored
File diff suppressed because one or more lines are too long
@ -23,9 +23,10 @@ body{color:#333;font-size:12px;font-family:'\5FAE\8F6F\96C5\9ED1','Microsoft YaH
|
||||
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}
|
||||
/* 页面布局 - 全局 */
|
||||
.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>.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 .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-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-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-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-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:5px;color:red;content:'*';display:inline-block;position:relative;text-align:left;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-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: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-null:before,.label-required-null:before{content:none!important}
|
||||
/* 通用分页 */
|
||||
.pagination-container{line-height:40px}
|
||||
.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:hover{color:#fff;text-decoration:none}
|
||||
/** 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-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: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 .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 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}
|
||||
/** 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}
|
||||
.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}
|
||||
|
||||
@ -20,7 +20,7 @@ use think\route\Dispatch;
|
||||
*/
|
||||
class App extends Container
|
||||
{
|
||||
const VERSION = '5.1.36 LTS';
|
||||
const VERSION = '5.1.37 LTS';
|
||||
|
||||
/**
|
||||
* 当前模块路径
|
||||
|
||||
@ -487,7 +487,10 @@ class Console
|
||||
public function getNamespaces()
|
||||
{
|
||||
$namespaces = [];
|
||||
foreach ($this->commands as $command) {
|
||||
foreach ($this->commands as $name => $command) {
|
||||
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) {
|
||||
@ -495,6 +498,8 @@ class Console
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return array_values(array_unique(array_filter($namespaces)));
|
||||
}
|
||||
|
||||
|
||||
@ -571,7 +571,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
|
||||
$this->autoRelationUpdate();
|
||||
}
|
||||
|
||||
return false;
|
||||
return true;
|
||||
} elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
|
||||
// 自动写入更新时间
|
||||
$data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
|
||||
|
||||
@ -519,7 +519,7 @@ class Validate
|
||||
|
||||
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;
|
||||
|
||||
2
thinkphp/library/think/cache/Driver.php
vendored
2
thinkphp/library/think/cache/Driver.php
vendored
@ -249,7 +249,6 @@ abstract class Driver
|
||||
{
|
||||
if ($this->tag) {
|
||||
$key = $this->getTagkey($this->tag);
|
||||
$prev = $this->tag;
|
||||
$this->tag = null;
|
||||
|
||||
if ($this->has($key)) {
|
||||
@ -266,7 +265,6 @@ abstract class Driver
|
||||
}
|
||||
|
||||
$this->set($key, $value, 0);
|
||||
$this->tag = $prev;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -267,10 +267,6 @@ class Redis extends Driver
|
||||
protected function getTagItem($tag)
|
||||
{
|
||||
$tagName = $this->getTagKey($tag);
|
||||
$keys = $this->handler->sMembers($tagName);
|
||||
|
||||
return array_map(function ($key) {
|
||||
return $this->getCacheKey($key);
|
||||
}, $keys);
|
||||
return $this->handler->sMembers($tagName);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1512,6 +1512,7 @@ class Query
|
||||
{
|
||||
if ($field instanceof $this) {
|
||||
$this->options['where'] = $field->getOptions('where');
|
||||
$this->bind($field->getBind(false));
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -2197,12 +2198,12 @@ class Query
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置需要追加输出的属性
|
||||
* 设置需要附加的输出属性
|
||||
* @access public
|
||||
* @param array $append 需要追加的属性
|
||||
* @param array $append 属性列表
|
||||
* @return $this
|
||||
*/
|
||||
public function append(array $append)
|
||||
public function append(array $append = [])
|
||||
{
|
||||
$this->options['append'] = $append;
|
||||
return $this;
|
||||
@ -3355,13 +3356,13 @@ class Query
|
||||
|
||||
// 输出属性控制
|
||||
if (!empty($options['visible'])) {
|
||||
$result->visible($options['visible']);
|
||||
$result->visible($options['visible'], true);
|
||||
} elseif (!empty($options['hidden'])) {
|
||||
$result->hidden($options['hidden']);
|
||||
$result->hidden($options['hidden'], true);
|
||||
}
|
||||
|
||||
if (!empty($options['append'])) {
|
||||
$result->append($options['append']);
|
||||
$result->append($options['append'], true);
|
||||
}
|
||||
|
||||
// 关联查询
|
||||
|
||||
@ -24,8 +24,10 @@ class Collection extends BaseCollection
|
||||
*/
|
||||
public function load($relation)
|
||||
{
|
||||
if (!$this->isEmpty()) {
|
||||
$item = current($this->items);
|
||||
$item->eagerlyResultSet($this->items, $relation);
|
||||
}
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
@ -58,6 +58,16 @@ abstract class Relation
|
||||
return $this->query->getModel();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取当前的关联模型类的实例
|
||||
* @access public
|
||||
* @return Query
|
||||
*/
|
||||
public function getQuery()
|
||||
{
|
||||
return $this->query;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置当前关联为自关联
|
||||
* @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
|
||||
|
||||
@ -327,9 +327,13 @@ trait Attribute
|
||||
$method = 'set' . Loader::parseName($name, 1) . 'Attr';
|
||||
|
||||
if (method_exists($this, $method)) {
|
||||
$origin = $this->data;
|
||||
$value = $this->$method($value, array_merge($this->data, $data));
|
||||
|
||||
$this->set[$name] = true;
|
||||
if (is_null($value) && $origin !== $this->data) {
|
||||
return;
|
||||
}
|
||||
} elseif (isset($this->type[$name])) {
|
||||
// 类型转换
|
||||
$value = $this->writeTransform($value, $this->type[$name]);
|
||||
|
||||
@ -164,13 +164,15 @@ trait Conversion
|
||||
foreach ($data as $key => $val) {
|
||||
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]);
|
||||
} elseif (isset($this->hidden[$key])) {
|
||||
} elseif (isset($this->hidden[$key]) && is_array($this->hidden[$key])) {
|
||||
$val->hidden($this->hidden[$key]);
|
||||
}
|
||||
// 关联模型对象
|
||||
if (!isset($this->hidden[$key]) || true !== $this->hidden[$key]) {
|
||||
$item[$key] = $val->toArray();
|
||||
}
|
||||
} elseif (isset($this->visible[$key])) {
|
||||
$item[$key] = $this->getAttr($key);
|
||||
} elseif (!isset($this->hidden[$key]) && !$hasVisible) {
|
||||
|
||||
@ -204,7 +204,7 @@ trait RelationShip
|
||||
$relationResult = $this->$method();
|
||||
|
||||
if (isset($withRelationAttr[$relationName])) {
|
||||
$relationResult->withAttr($withRelationAttr[$relationName]);
|
||||
$relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
|
||||
}
|
||||
|
||||
$this->relation[$relation] = $relationResult->getRelation($subRelation, $closure);
|
||||
@ -248,7 +248,7 @@ trait RelationShip
|
||||
$relationResult = $this->$relation();
|
||||
|
||||
if (isset($withRelationAttr[$relationName])) {
|
||||
$relationResult->withAttr($withRelationAttr[$relationName]);
|
||||
$relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
|
||||
}
|
||||
|
||||
$relationResult->eagerlyResultSet($resultSet, $relation, $subRelation, $closure, $join);
|
||||
@ -290,7 +290,7 @@ trait RelationShip
|
||||
$relationResult = $this->$relation();
|
||||
|
||||
if (isset($withRelationAttr[$relationName])) {
|
||||
$relationResult->withAttr($withRelationAttr[$relationName]);
|
||||
$relationResult->getQuery()->withAttr($withRelationAttr[$relationName]);
|
||||
}
|
||||
|
||||
$relationResult->eagerlyResult($result, $relation, $subRelation, $closure, $join);
|
||||
|
||||
@ -642,9 +642,8 @@ abstract class Rule
|
||||
protected function checkCrossDomain($request)
|
||||
{
|
||||
if (!empty($this->option['cross_domain'])) {
|
||||
|
||||
$header = [
|
||||
'Access-Control-Allow-Origin' => '*',
|
||||
'Access-Control-Allow-Credentials' => 'true',
|
||||
'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',
|
||||
];
|
||||
@ -653,6 +652,16 @@ abstract class Rule
|
||||
$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;
|
||||
|
||||
if ($request->method(true) == 'OPTIONS') {
|
||||
|
||||
@ -118,8 +118,8 @@ class RuleGroup extends Rule
|
||||
*/
|
||||
public function check($request, $url, $completeMatch = false)
|
||||
{
|
||||
if ($dispatch = $this->checkCrossDomain($request)) {
|
||||
// 跨域OPTIONS请求
|
||||
if ($dispatch = $this->checkCrossDomain($request)) {
|
||||
return $dispatch;
|
||||
}
|
||||
|
||||
|
||||
@ -149,11 +149,6 @@ class RuleItem extends Rule
|
||||
*/
|
||||
public function checkRule($request, $url, $match = null, $completeMatch = false)
|
||||
{
|
||||
if ($dispatch = $this->checkCrossDomain($request)) {
|
||||
// 允许跨域
|
||||
return $dispatch;
|
||||
}
|
||||
|
||||
// 检查参数有效性
|
||||
if (!$this->checkOption($this->option, $request)) {
|
||||
return false;
|
||||
@ -169,6 +164,15 @@ class RuleItem extends Rule
|
||||
}
|
||||
|
||||
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'])) {
|
||||
return false;
|
||||
|
||||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -4,4 +4,4 @@
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderIniteec25c7bb7e8a3ad5cc9d508adb65132::getLoader();
|
||||
return ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0::getLoader();
|
||||
|
||||
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderIniteec25c7bb7e8a3ad5cc9d508adb65132
|
||||
class ComposerAutoloaderInit0572b4f33e87472ba8ec9af0ef3293f0
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -19,15 +19,15 @@ class ComposerAutoloaderIniteec25c7bb7e8a3ad5cc9d508adb65132
|
||||
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();
|
||||
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());
|
||||
if ($useStaticLoader) {
|
||||
require_once __DIR__ . '/autoload_static.php';
|
||||
|
||||
call_user_func(\Composer\Autoload\ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::getInitializer($loader));
|
||||
} else {
|
||||
$map = require __DIR__ . '/autoload_namespaces.php';
|
||||
foreach ($map as $namespace => $path) {
|
||||
@ -48,19 +48,19 @@ class ComposerAutoloaderIniteec25c7bb7e8a3ad5cc9d508adb65132
|
||||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequireeec25c7bb7e8a3ad5cc9d508adb65132($fileIdentifier, $file);
|
||||
composerRequire0572b4f33e87472ba8ec9af0ef3293f0($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequireeec25c7bb7e8a3ad5cc9d508adb65132($fileIdentifier, $file)
|
||||
function composerRequire0572b4f33e87472ba8ec9af0ef3293f0($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
||||
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132
|
||||
class ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0
|
||||
{
|
||||
public static $files = array (
|
||||
'841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
|
||||
@ -346,9 +346,9 @@ class ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticIniteec25c7bb7e8a3ad5cc9d508adb65132::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit0572b4f33e87472ba8ec9af0ef3293f0::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
||||
56
vendor/composer/installed.json
vendored
56
vendor/composer/installed.json
vendored
@ -177,8 +177,8 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/options-resolver",
|
||||
"version": "v3.4.26",
|
||||
"version_normalized": "3.4.26.0",
|
||||
"version": "v3.4.28",
|
||||
"version_normalized": "3.4.28.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/options-resolver.git",
|
||||
@ -239,17 +239,17 @@
|
||||
},
|
||||
{
|
||||
"name": "topthink/framework",
|
||||
"version": "v5.1.36",
|
||||
"version_normalized": "5.1.36.0",
|
||||
"version": "v5.1.37.1",
|
||||
"version_normalized": "5.1.37.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/framework.git",
|
||||
"reference": "135eee67ce9ee0b07da201f743d7dd88ec431abb"
|
||||
"reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/framework/zipball/135eee67ce9ee0b07da201f743d7dd88ec431abb",
|
||||
"reference": "135eee67ce9ee0b07da201f743d7dd88ec431abb",
|
||||
"url": "https://api.github.com/repos/top-think/framework/zipball/05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
|
||||
"reference": "05eecd121d18d6705aaa10aa44fcdf7c14da4d0b",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -271,7 +271,7 @@
|
||||
"sebastian/phpcpd": "2.*",
|
||||
"squizlabs/php_codesniffer": "2.*"
|
||||
},
|
||||
"time": "2019-04-28T08:56:58+00:00",
|
||||
"time": "2019-05-28T06:57:29+00:00",
|
||||
"type": "think-framework",
|
||||
"installation-source": "dist",
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
@ -445,17 +445,17 @@
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/ip2region",
|
||||
"version": "v1.0.5",
|
||||
"version_normalized": "1.0.5.0",
|
||||
"version": "v1.0.6",
|
||||
"version_normalized": "1.0.6.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ip2region.git",
|
||||
"reference": "944dc687304133027c4586a35ff78b57e56dd659"
|
||||
"reference": "054b6580f4e1f441ca700939fbddd6c0b8488f7a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ip2region/zipball/944dc687304133027c4586a35ff78b57e56dd659",
|
||||
"reference": "944dc687304133027c4586a35ff78b57e56dd659",
|
||||
"url": "https://api.github.com/repos/zoujingli/ip2region/zipball/054b6580f4e1f441ca700939fbddd6c0b8488f7a",
|
||||
"reference": "054b6580f4e1f441ca700939fbddd6c0b8488f7a",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -467,7 +467,7 @@
|
||||
"require": {
|
||||
"php": ">=5.3"
|
||||
},
|
||||
"time": "2019-01-23T06:23:53+00:00",
|
||||
"time": "2019-05-18T06:44:34+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -499,12 +499,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "00585bd6214a0539165de8cf4bfefff798e49787"
|
||||
"reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/00585bd6214a0539165de8cf4bfefff798e49787",
|
||||
"reference": "00585bd6214a0539165de8cf4bfefff798e49787",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/706b33fa3d9c9106b61e5c2949a279dc4009f066",
|
||||
"reference": "706b33fa3d9c9106b61e5c2949a279dc4009f066",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -523,7 +523,7 @@
|
||||
"qiniu/php-sdk": "^7.2",
|
||||
"topthink/framework": "5.1.*"
|
||||
},
|
||||
"time": "2019-04-30T05:59:26+00:00",
|
||||
"time": "2019-06-04T02:50:32+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -543,17 +543,17 @@
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/wechat-developer",
|
||||
"version": "v1.2.11",
|
||||
"version_normalized": "1.2.11.0",
|
||||
"version": "v1.2.12",
|
||||
"version_normalized": "1.2.12.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/WeChatDeveloper.git",
|
||||
"reference": "b4a905a6188807f7d5e51c9e2ea7622c97db476b"
|
||||
"reference": "9464d20af40b24bc06fd146509ad003c17240116"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/b4a905a6188807f7d5e51c9e2ea7622c97db476b",
|
||||
"reference": "b4a905a6188807f7d5e51c9e2ea7622c97db476b",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeChatDeveloper/zipball/9464d20af40b24bc06fd146509ad003c17240116",
|
||||
"reference": "9464d20af40b24bc06fd146509ad003c17240116",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -571,7 +571,7 @@
|
||||
"ext-simplexml": "*",
|
||||
"php": ">=5.4"
|
||||
},
|
||||
"time": "2019-04-23T07:52:27+00:00",
|
||||
"time": "2019-05-16T02:17:20+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -614,12 +614,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/WeOpenDeveloper.git",
|
||||
"reference": "8bd3fe34a25c267e22415a4d6526e16bf10d6b61"
|
||||
"reference": "ce6e66eb2531da89a4463f595797258ad2bae385"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/8bd3fe34a25c267e22415a4d6526e16bf10d6b61",
|
||||
"reference": "8bd3fe34a25c267e22415a4d6526e16bf10d6b61",
|
||||
"url": "https://api.github.com/repos/zoujingli/WeOpenDeveloper/zipball/ce6e66eb2531da89a4463f595797258ad2bae385",
|
||||
"reference": "ce6e66eb2531da89a4463f595797258ad2bae385",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -635,7 +635,7 @@
|
||||
"php": ">=5.4",
|
||||
"zoujingli/wechat-developer": "^1.0"
|
||||
},
|
||||
"time": "2019-04-28T09:38:09+00:00",
|
||||
"time": "2019-05-09T03:34:57+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
||||
109
vendor/zoujingli/ip2region/Ip2Region.php
vendored
109
vendor/zoujingli/ip2region/Ip2Region.php
vendored
@ -14,13 +14,13 @@ class Ip2Region
|
||||
/**
|
||||
* db file handler
|
||||
*/
|
||||
private $dbFileHandler = NULL;
|
||||
private $dbFileHandler = null;
|
||||
|
||||
/**
|
||||
* header block info
|
||||
*/
|
||||
private $HeaderSip = NULL;
|
||||
private $HeaderPtr = NULL;
|
||||
private $HeaderSip = null;
|
||||
private $HeaderPtr = null;
|
||||
private $headerLen = 0;
|
||||
|
||||
/**
|
||||
@ -34,8 +34,8 @@ class Ip2Region
|
||||
* for memory mode only
|
||||
* the original db binary string
|
||||
*/
|
||||
private $dbBinStr = NULL;
|
||||
private $dbFile = NULL;
|
||||
private $dbBinStr = null;
|
||||
private $dbFile = null;
|
||||
|
||||
/**
|
||||
* construct method
|
||||
@ -53,24 +53,23 @@ class Ip2Region
|
||||
* @Note:
|
||||
* 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)
|
||||
{
|
||||
//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);
|
||||
if ($this->dbBinStr == false) {
|
||||
throw new Exception("Fail to open the db file {$this->dbFile}");
|
||||
}
|
||||
|
||||
$this->firstIndexPtr = self::getLong($this->dbBinStr, 0);
|
||||
$this->lastIndexPtr = self::getLong($this->dbBinStr, 4);
|
||||
$this->totalBlocks = ($this->lastIndexPtr - $this->firstIndexPtr) / INDEX_BLOCK_LENGTH + 1;
|
||||
}
|
||||
|
||||
if (is_string($ip)) $ip = self::safeIp2long($ip);
|
||||
|
||||
//binary search to define the data
|
||||
$l = 0;
|
||||
$h = $this->totalBlocks;
|
||||
@ -91,25 +90,23 @@ class Ip2Region
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched just stop it here
|
||||
if ( $dataPtr == 0 ) return NULL;
|
||||
|
||||
if ($dataPtr == 0) return null;
|
||||
//get the data
|
||||
$dataLen = (($dataPtr >> 24) & 0xFF);
|
||||
$dataPtr = ($dataPtr & 0x00FFFFFF);
|
||||
|
||||
return array(
|
||||
'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
|
||||
*
|
||||
* @param ip
|
||||
* @param string ip
|
||||
* @return mixed Array or NULL for any error
|
||||
* @throws Exception
|
||||
*/
|
||||
public function binarySearch($ip)
|
||||
{
|
||||
@ -117,21 +114,18 @@ class Ip2Region
|
||||
if (is_string($ip)) $ip = self::safeIp2long($ip);
|
||||
if ($this->totalBlocks == 0) {
|
||||
//check and open the original db file
|
||||
if ( $this->dbFileHandler == NULL ) {
|
||||
if ($this->dbFileHandler == null) {
|
||||
$this->dbFileHandler = fopen($this->dbFile, 'r');
|
||||
if ($this->dbFileHandler == false) {
|
||||
throw new Exception("Fail to open the db file {$this->dbFile}");
|
||||
}
|
||||
}
|
||||
|
||||
fseek($this->dbFileHandler, 0);
|
||||
$superBlock = fread($this->dbFileHandler, 8);
|
||||
|
||||
$this->firstIndexPtr = self::getLong($superBlock, 0);
|
||||
$this->lastIndexPtr = self::getLong($superBlock, 4);
|
||||
$this->totalBlocks = ($this->lastIndexPtr - $this->firstIndexPtr) / INDEX_BLOCK_LENGTH + 1;
|
||||
}
|
||||
|
||||
//binary search to define the data
|
||||
$l = 0;
|
||||
$h = $this->totalBlocks;
|
||||
@ -139,7 +133,6 @@ class Ip2Region
|
||||
while ($l <= $h) {
|
||||
$m = (($l + $h) >> 1);
|
||||
$p = $m * INDEX_BLOCK_LENGTH;
|
||||
|
||||
fseek($this->dbFileHandler, $this->firstIndexPtr + $p);
|
||||
$buffer = fread($this->dbFileHandler, INDEX_BLOCK_LENGTH);
|
||||
$sip = self::getLong($buffer, 0);
|
||||
@ -155,48 +148,38 @@ class Ip2Region
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched just stop it here
|
||||
if ( $dataPtr == 0 ) return NULL;
|
||||
|
||||
|
||||
if ($dataPtr == 0) return null;
|
||||
//get the data
|
||||
$dataLen = (($dataPtr >> 24) & 0xFF);
|
||||
$dataPtr = ($dataPtr & 0x00FFFFFF);
|
||||
|
||||
fseek($this->dbFileHandler, $dataPtr);
|
||||
$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
|
||||
* @Note: not thread safe
|
||||
*
|
||||
* @param ip
|
||||
* @param string ip
|
||||
* @return Mixed Array for NULL for any error
|
||||
* @throws Exception
|
||||
*/
|
||||
public function btreeSearch($ip)
|
||||
{
|
||||
if (is_string($ip)) $ip = self::safeIp2long($ip);
|
||||
|
||||
//check and load the header
|
||||
if ( $this->HeaderSip == NULL ) {
|
||||
if ($this->HeaderSip == null) {
|
||||
//check and open the original db file
|
||||
if ( $this->dbFileHandler == NULL ) {
|
||||
if ($this->dbFileHandler == null) {
|
||||
$this->dbFileHandler = fopen($this->dbFile, 'r');
|
||||
if ($this->dbFileHandler == false) {
|
||||
throw new Exception("Fail to open the db file {$this->dbFile}");
|
||||
}
|
||||
}
|
||||
|
||||
fseek($this->dbFileHandler, 8);
|
||||
$buffer = fread($this->dbFileHandler, TOTAL_HEADER_LENGTH);
|
||||
|
||||
//fill the header
|
||||
$idx = 0;
|
||||
$this->HeaderSip = array();
|
||||
@ -210,15 +193,15 @@ class Ip2Region
|
||||
$this->HeaderPtr[] = $dataPtr;
|
||||
$idx++;
|
||||
}
|
||||
|
||||
$this->headerLen = $idx;
|
||||
}
|
||||
|
||||
//1. define the index block with the binary search
|
||||
$l = 0; $h = $this->headerLen; $sptr = 0; $eptr = 0;
|
||||
$l = 0;
|
||||
$h = $this->headerLen;
|
||||
$sptr = 0;
|
||||
$eptr = 0;
|
||||
while ($l <= $h) {
|
||||
$m = (($l + $h) >> 1);
|
||||
|
||||
//perfetc matched, just return it
|
||||
if ($ip == $this->HeaderSip[$m]) {
|
||||
if ($m > 0) {
|
||||
@ -231,7 +214,6 @@ class Ip2Region
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
//less then the middle value
|
||||
if ($ip < $this->HeaderSip[$m]) {
|
||||
if ($m == 0) {
|
||||
@ -257,17 +239,15 @@ class Ip2Region
|
||||
$l = $m + 1;
|
||||
}
|
||||
}
|
||||
|
||||
//match nothing just stop it
|
||||
if ( $sptr == 0 ) return NULL;
|
||||
|
||||
if ($sptr == 0) return null;
|
||||
//2. search the index blocks to define the data
|
||||
$blockLen = $eptr - $sptr;
|
||||
fseek($this->dbFileHandler, $sptr);
|
||||
$index = fread($this->dbFileHandler, $blockLen + INDEX_BLOCK_LENGTH);
|
||||
|
||||
$dataptr = 0;
|
||||
$l = 0; $h = $blockLen / INDEX_BLOCK_LENGTH;
|
||||
$l = 0;
|
||||
$h = $blockLen / INDEX_BLOCK_LENGTH;
|
||||
while ($l <= $h) {
|
||||
$m = (($l + $h) >> 1);
|
||||
$p = (int)($m * INDEX_BLOCK_LENGTH);
|
||||
@ -284,33 +264,26 @@ class Ip2Region
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//not matched
|
||||
if ( $dataptr == 0 ) return NULL;
|
||||
|
||||
if ($dataptr == 0) return null;
|
||||
//3. get the data
|
||||
$dataLen = (($dataptr >> 24) & 0xFF);
|
||||
$dataPtr = ($dataptr & 0x00FFFFFF);
|
||||
|
||||
fseek($this->dbFileHandler, $dataPtr);
|
||||
$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
|
||||
*
|
||||
* @param ip
|
||||
* */
|
||||
* @param string ip
|
||||
* @return string
|
||||
*/
|
||||
public static function safeIp2long($ip)
|
||||
{
|
||||
$ip = ip2long($ip);
|
||||
|
||||
// convert signed int to unsigned int if on 32 bit operating system
|
||||
if ($ip < 0 && PHP_INT_SIZE == 4) {
|
||||
$ip = sprintf("%u", $ip);
|
||||
@ -320,12 +293,12 @@ class Ip2Region
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* read a long from a byte buffer
|
||||
*
|
||||
* @param b
|
||||
* @param offset
|
||||
* @param integer b
|
||||
* @param integer offset
|
||||
* @return string
|
||||
*/
|
||||
public static function getLong($b, $offset)
|
||||
{
|
||||
@ -335,12 +308,10 @@ class Ip2Region
|
||||
(ord($b[$offset++]) << 16) |
|
||||
(ord($b[$offset]) << 24)
|
||||
);
|
||||
|
||||
// convert signed int to unsigned int if on 32 bit operating system
|
||||
if ($val < 0 && PHP_INT_SIZE == 4) {
|
||||
$val = sprintf("%u", $val);
|
||||
}
|
||||
|
||||
return $val;
|
||||
}
|
||||
|
||||
@ -349,13 +320,11 @@ class Ip2Region
|
||||
*/
|
||||
public function __destruct()
|
||||
{
|
||||
if ( $this->dbFileHandler != NULL ) {
|
||||
if ($this->dbFileHandler != null) {
|
||||
fclose($this->dbFileHandler);
|
||||
}
|
||||
|
||||
$this->dbBinStr = NULL;
|
||||
$this->HeaderSip = NULL;
|
||||
$this->HeaderPtr = NULL;
|
||||
$this->dbBinStr = null;
|
||||
$this->HeaderSip = null;
|
||||
$this->HeaderPtr = null;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
BIN
vendor/zoujingli/ip2region/ip2region.db
vendored
BIN
vendor/zoujingli/ip2region/ip2region.db
vendored
Binary file not shown.
21
vendor/zoujingli/think-library/src/common.php
vendored
21
vendor/zoujingli/think-library/src/common.php
vendored
@ -36,7 +36,7 @@ if (!function_exists('format_datetime')) {
|
||||
*/
|
||||
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);
|
||||
return date($format, strtotime($datetime));
|
||||
}
|
||||
@ -55,16 +55,17 @@ if (!function_exists('sysconf')) {
|
||||
{
|
||||
static $data = [];
|
||||
list($field, $raw) = explode('|', "{$name}|");
|
||||
$key = md5(config('database.hostname') . '#' . config('database.database'));
|
||||
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], []];
|
||||
return \library\tools\Data::save('SystemConfig', $row, 'name');
|
||||
}
|
||||
if (empty($data)) {
|
||||
$data = \think\facade\Cache::tag('system')->get('_sysconf_', []);
|
||||
$data = \think\facade\Cache::tag('system')->get("_sysconfig_{$key}", []);
|
||||
if (empty($data)) {
|
||||
$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])) : '';
|
||||
@ -224,11 +225,15 @@ if (!function_exists('emoji_clear')) {
|
||||
// 注册系统常用指令
|
||||
\think\Console::addDefaultCommands([
|
||||
'library\command\Sess',
|
||||
'library\command\task\Stop', 'library\command\task\State',
|
||||
'library\command\task\Start', 'library\command\task\Reset',
|
||||
'library\command\task\Stop',
|
||||
'library\command\task\State',
|
||||
'library\command\task\Start',
|
||||
'library\command\task\Reset',
|
||||
'library\command\sync\Admin',
|
||||
'library\command\sync\Plugs', 'library\command\sync\Config',
|
||||
'library\command\sync\Wechat', 'library\command\sync\Service',
|
||||
'library\command\sync\Plugs',
|
||||
'library\command\sync\Config',
|
||||
'library\command\sync\Wechat',
|
||||
'library\command\sync\Service',
|
||||
]);
|
||||
|
||||
// 动态加载模块配置
|
||||
|
||||
@ -126,7 +126,7 @@ class Data
|
||||
}
|
||||
|
||||
/**
|
||||
* 数据唯一数字编码
|
||||
* 唯一数字编码
|
||||
* @param integer $length
|
||||
* @return string
|
||||
*/
|
||||
@ -139,6 +139,19 @@ class Data
|
||||
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
|
||||
|
||||
1
vendor/zoujingli/wechat-developer/.gitignore
vendored
1
vendor/zoujingli/wechat-developer/.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/Test/cert
|
||||
/nbproject
|
||||
/composer.lock
|
||||
/_test/cert
|
||||
2
vendor/zoujingli/wechat-developer/We.php
vendored
2
vendor/zoujingli/wechat-developer/We.php
vendored
@ -74,7 +74,7 @@ class We
|
||||
* 定义当前版本
|
||||
* @var string
|
||||
*/
|
||||
const VERSION = '1.2.9';
|
||||
const VERSION = '1.2.12';
|
||||
|
||||
/**
|
||||
* 静态配置
|
||||
|
||||
@ -40,19 +40,19 @@ class BasicWeChat
|
||||
* 当前请求方法参数
|
||||
* @var array
|
||||
*/
|
||||
private $currentMethod = [];
|
||||
protected $currentMethod = [];
|
||||
|
||||
/**
|
||||
* 当前模式
|
||||
* @var bool
|
||||
*/
|
||||
private $isTry = false;
|
||||
protected $isTry = false;
|
||||
|
||||
/**
|
||||
* 注册代替函数
|
||||
* @var string
|
||||
*/
|
||||
private $GetAccessTokenCallback;
|
||||
protected $GetAccessTokenCallback;
|
||||
|
||||
/**
|
||||
* BasicWeChat constructor.
|
||||
@ -128,7 +128,7 @@ class BasicWeChat
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理删除accessToken
|
||||
* 清理删除 AccessToken
|
||||
* @return bool
|
||||
*/
|
||||
public function delAccessToken()
|
||||
|
||||
@ -79,7 +79,7 @@ class Custom extends BasicWeChat
|
||||
* @throws Exceptions\InvalidResponseException
|
||||
* @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';
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
|
||||
@ -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}";
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
$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 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";
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
$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 is_null($outType) ? $result : $outType($result);
|
||||
|
||||
@ -160,6 +160,7 @@ class Pay extends BasicWePay
|
||||
* @param array $options 静音参数
|
||||
* @param null|string $outType 输出类型
|
||||
* @return bool|string
|
||||
* @throws Exceptions\LocalCacheException
|
||||
* @throws InvalidResponseException
|
||||
*/
|
||||
public function billDownload(array $options, $outType = null)
|
||||
|
||||
@ -16,6 +16,7 @@ namespace WeMini;
|
||||
|
||||
use WeChat\Contracts\BasicWeChat;
|
||||
use WeChat\Contracts\Tools;
|
||||
use WeChat\Exceptions\InvalidResponseException;
|
||||
|
||||
/**
|
||||
* 微信小程序二维码管理
|
||||
@ -44,7 +45,11 @@ class Qrcode extends BasicWeChat
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
$data = ['path' => $path, 'width' => $width, 'auto_color' => $auto_color, 'line_color' => $line_color, 'is_hyaline' => $is_hyaline];
|
||||
$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 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];
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
$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 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';
|
||||
$this->registerApi($url, __FUNCTION__, func_get_args());
|
||||
$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 is_null($outType) ? $result : $outType($result);
|
||||
|
||||
21
vendor/zoujingli/weopen-developer/LICENSE
vendored
Normal file
21
vendor/zoujingli/weopen-developer/LICENSE
vendored
Normal 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.
|
||||
Loading…
x
Reference in New Issue
Block a user