mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
同步更新
This commit is contained in:
邹景立
parent
9d231c7a53
commit
c385201fdf
@ -31,7 +31,7 @@ class Service extends Plugin
|
||||
* 定义插件名称
|
||||
* @var string
|
||||
*/
|
||||
protected $appName = '系统管理';
|
||||
protected $appName = '系统配置管理';
|
||||
|
||||
/**
|
||||
* 定义安装包名
|
||||
|
||||
@ -20,6 +20,7 @@ use think\admin\Controller;
|
||||
use think\admin\helper\QueryHelper;
|
||||
use think\admin\model\SystemAuth;
|
||||
use think\admin\model\SystemNode;
|
||||
use think\admin\Plugin;
|
||||
use think\admin\service\AdminService;
|
||||
|
||||
/**
|
||||
@ -95,8 +96,16 @@ class Auth extends Controller
|
||||
$map = $this->_vali(['auth.require#id' => '权限ID不能为空！']);
|
||||
if (input('action') === 'get') {
|
||||
if ($this->app->isDebug()) AdminService::clear();
|
||||
$nodes = SystemNode::mk()->where($map)->column('node');
|
||||
$this->success('获取权限节点成功！', AdminService::getTree($nodes));
|
||||
$nodes = AdminService::getTree(SystemNode::mk()->where($map)->column('node'));
|
||||
usort($nodes, static function ($a, $b) {
|
||||
if (explode('-', $a['node'])[0] !== explode('-', $b['node'])[0]) {
|
||||
if (stripos($a['node'], 'plugin-') === 0) return 1;
|
||||
}
|
||||
return $a['node'] === $b['node'] ? 0 : ($a['node'] > $b['node'] ? 1 : -1);
|
||||
});
|
||||
[$ps, $cs] = [Plugin::get(), (array)$this->app->config->get('app.app_names', [])];
|
||||
foreach ($nodes as &$t) $t['title'] = $cs[$t['node']] ?? (($ps[$t['node']] ?? [])['name'] ?? $t['title']);
|
||||
$this->success('获取权限节点成功！', $nodes);
|
||||
} elseif (input('action') === 'save') {
|
||||
[$post, $data] = [$this->request->post(), []];
|
||||
foreach ($post['nodes'] ?? [] as $node) {
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use think\admin\Controller;
|
||||
use think\admin\Plugin;
|
||||
use think\admin\service\AdminService;
|
||||
use think\admin\service\ModuleService;
|
||||
use think\admin\service\RuntimeService;
|
||||
@ -57,6 +58,11 @@ class Config extends Controller
|
||||
$this->files = Storage::types();
|
||||
$this->super = AdminService::isSuper();
|
||||
$this->version = ModuleService::getVersion();
|
||||
$this->plugins = Plugin::get('', true);
|
||||
uasort($this->plugins, function ($a, $b) {
|
||||
if ($a['space'] === $b['space']) return 0;
|
||||
return $a['space'] > $b['space'] ? 1 : -1;
|
||||
});
|
||||
$this->fetch();
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
view: {showLine: false, showIcon: false, dblClickExpand: false},
|
||||
check: {enable: true, nocheck: false, chkboxType: {"Y": "ps", "N": "ps"}}, callback: {
|
||||
beforeClick: function (id, node) {
|
||||
node.children.length < 1 ? that.ztree.checkNode(node, !node.checked, null, true) : that.ztree.expandNode(node);
|
||||
node.children.length < 1 ? that.ztree.checkNode(node, !node.checked, true, true) : that.ztree.expandNode(node);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -67,6 +67,7 @@
|
||||
{block name="style"}
|
||||
<style>
|
||||
ul.ztree li {
|
||||
line-height: 24px;
|
||||
white-space: normal !important;
|
||||
}
|
||||
|
||||
@ -80,25 +81,43 @@
|
||||
}
|
||||
|
||||
ul.ztree > li {
|
||||
padding: 15px 25px 15px 15px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.10);
|
||||
padding: 15px;
|
||||
background: rgba(0, 0, 0, 0.05);
|
||||
border-radius: 3px;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
ul.ztree > li > ul {
|
||||
margin-top: 12px;
|
||||
border-top: 1px solid rgba(0, 0, 0, .1);
|
||||
padding: 10px;
|
||||
margin-top: 10px;
|
||||
background: rgba(0, 0, 0, 0.05);
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
ul.ztree > li > ul > li {
|
||||
padding: 5px;
|
||||
padding: 5px 0;
|
||||
}
|
||||
|
||||
ul.ztree > li > a > span {
|
||||
font-weight: 700;
|
||||
font-size: 15px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
ul.ztree .level2 .button.level2 {
|
||||
background: 0 0;
|
||||
width: 0;
|
||||
}
|
||||
|
||||
ul.ztree li span.button.noline_open {
|
||||
background-position-y: -73px;
|
||||
}
|
||||
|
||||
ul.ztree li span.button.noline_close {
|
||||
background-position-y: -73px;
|
||||
}
|
||||
|
||||
ul.ztree .level1 > .node_name {
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
{/block}
|
||||
@ -149,7 +149,7 @@
|
||||
<table class="layui-table" lay-even>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th class="nowrap text-center">核心框架</th>
|
||||
<th class="nowrap text-center" style="max-width:20%">核心框架</th>
|
||||
<td><a target="_blank" href="https://www.thinkphp.cn">ThinkPHP Version {$app->version()}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -168,5 +168,42 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-card padding-20 shadow">
|
||||
<div class="layui-card-header notselect">
|
||||
<b>插件信息</b><span class="color-desc font-s12 padding-left-5">Plugin Information</span>
|
||||
</div>
|
||||
<div class="layui-card-body">
|
||||
<table class="layui-table" lay-even>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="nowrap text-center">插件名称</th>
|
||||
<th class="nowrap text-left">插件ID</th>
|
||||
<th class="nowrap text-left">插件包名</th>
|
||||
<th class="nowrap text-center">插件版本</th>
|
||||
<th class="nowrap text-center">授权协议</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{foreach $plugins as $key=>$plugin}
|
||||
<tr>
|
||||
<td class="nowrap text-center">{$plugin.name}</td>
|
||||
<td class="nowrap text-left">{$key}</td>
|
||||
<td class="nowrap text-left">
|
||||
{if empty($plugin.install.document)}{$plugin.package}
|
||||
{else}<a target="_blank" href="{$plugin.install.document}">{$plugin.package}</a>{/if}
|
||||
</td>
|
||||
<td class="nowrap text-center">{$plugin.install.version|default='unknow'}</td>
|
||||
<td class="nowrap text-center">
|
||||
{if empty($plugin.install.license)} -
|
||||
{elseif is_array($plugin.install.license)}{$plugin.install.license|join='、',###}
|
||||
{else}{$plugin.install.license|default='-'}{/if}
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<!--{/if}-->
|
||||
{/block}
|
||||
@ -38,7 +38,7 @@ class Service extends Plugin
|
||||
* 定义插件名称
|
||||
* @var string
|
||||
*/
|
||||
protected $appName = '微信管理';
|
||||
protected $appName = '微信数据管理';
|
||||
|
||||
/**
|
||||
* 定义安装包名
|
||||
@ -66,7 +66,7 @@ class Service extends Plugin
|
||||
$data = json_decode(CodeExtend::deSafe64($request->param('vars')), true);
|
||||
return PaymentService::notify($data);
|
||||
} catch (\Exception|\Error $exception) {
|
||||
return 'Error: ' . $exception->getMessage();
|
||||
return "Error: {$exception->getMessage()}";
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -65,9 +65,9 @@ class Record extends Controller
|
||||
$recode = WechatPaymentRecord::mk()->where($data)->findOrEmpty();
|
||||
if ($recode->isEmpty()) $this->error('支付单不存在！');
|
||||
if ($recode->getAttr('payment_status') < 1) $this->error('支付单未完成支付！');
|
||||
$desc = "来自订单 {$recode['order_code']} 的退款！";
|
||||
$reason = "来自订单 {$recode['order_code']} 的退款！";
|
||||
sysoplog('微信支付退款', "支付单 {$data['code']} 发起退款！");
|
||||
[$state, $message] = PaymentService::refund($data['code'], $recode->getAttr('payment_amount'), $desc);
|
||||
[$state, $message] = PaymentService::refund($data['code'], $recode->getAttr('payment_amount'), $reason);
|
||||
$state ? $this->success($message) : $this->error($message);
|
||||
} catch (HttpResponseException $exception) {
|
||||
throw $exception;
|
||||
|
||||
@ -84,7 +84,7 @@ class PaymentService
|
||||
}
|
||||
$config = WechatService::getConfig();
|
||||
do $pCode = CodeExtend::uniqidNumber(16, 'P');
|
||||
while (WechatPaymentRecord::mk()->where(['code' => $pCode])->findOrEmpty()->isExists());
|
||||
while (WechatPaymentRecord::mk()->master()->where(['code' => $pCode])->findOrEmpty()->isExists());
|
||||
$data = [
|
||||
'appid' => $config['appid'],
|
||||
'mchid' => $config['mch_id'],
|
||||
@ -207,7 +207,7 @@ class PaymentService
|
||||
}
|
||||
// 创建支付退款申请
|
||||
do $rcode = CodeExtend::uniqidNumber(16, 'R');
|
||||
while (($model = WechatPaymentRefund::mk()->where(['code' => $rcode])->findOrEmpty())->isExists());
|
||||
while (($model = WechatPaymentRefund::mk()->master()->where(['code' => $rcode])->findOrEmpty())->isExists());
|
||||
// 初始化退款申请记录
|
||||
$model->save(['code' => $rcode, 'record_code' => $pcode, 'refund_amount' => $amount, 'refund_remark' => $reason]);
|
||||
$options = [
|
||||
@ -354,14 +354,14 @@ class PaymentService
|
||||
{
|
||||
// 检查是否已经支付
|
||||
if (static::withPayed($oCode, $oPayed) >= floatval($oAmount)) {
|
||||
throw new Exception("订单 {$oCode} 已经完成支付！", 1);
|
||||
throw new Exception("已经完成支付", 1);
|
||||
}
|
||||
if ($oPayed + floatval($pAmount) > floatval($oAmount)) {
|
||||
throw new Exception('总支付大于订单金额！', 0);
|
||||
throw new Exception('总支付超出金额', 0);
|
||||
}
|
||||
$map = ['order_code' => $oCode, 'payment_status' => 1];
|
||||
$model = WechatPaymentRecord::mk()->where($map)->findOrEmpty();
|
||||
if ($model->isExists()) throw new Exception("订单 {$oCode} 已经完成支付！", 1);
|
||||
if ($model->isExists()) throw new Exception("已经完成支付", 1);
|
||||
// 写入订单支付行为
|
||||
$model->save([
|
||||
'type' => $pType,
|
||||
|
||||
@ -166,13 +166,14 @@ class WechatService extends Service
|
||||
|
||||
/**
|
||||
* 获取公众号配置参数
|
||||
* @param string $appid
|
||||
* @return array
|
||||
* @throws \think\admin\Exception
|
||||
*/
|
||||
public static function getConfig(): array
|
||||
public static function getConfig(string $appid = ''): array
|
||||
{
|
||||
$config = [
|
||||
'appid' => static::getAppid(),
|
||||
return static::withWxpayCert([
|
||||
'appid' => $appid ?: static::getAppid(),
|
||||
'token' => sysconf('wechat.token'),
|
||||
'appsecret' => sysconf('wechat.appsecret'),
|
||||
'encodingaeskey' => sysconf('wechat.encodingaeskey'),
|
||||
@ -180,12 +181,7 @@ class WechatService extends Service
|
||||
'mch_key' => sysconf('wechat.mch_key'),
|
||||
'mch_v3_key' => sysconf('wechat.mch_v3_key'),
|
||||
'cache_path' => syspath('runtime/wechat'),
|
||||
];
|
||||
|
||||
|
||||
return static::withWxpayCert($config);
|
||||
|
||||
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -239,6 +235,8 @@ class WechatService extends Service
|
||||
public static function getWebOauthInfo(string $source, int $isfull = 0, bool $redirect = true): array
|
||||
{
|
||||
$appid = static::getAppid();
|
||||
$sessid = Library::$sapp->session->getId();
|
||||
$script =
|
||||
$openid = Library::$sapp->session->get("{$appid}_openid");
|
||||
$userinfo = Library::$sapp->session->get("{$appid}_fansinfo");
|
||||
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
|
||||
@ -269,7 +267,7 @@ class WechatService extends Service
|
||||
}
|
||||
if ($getVars['rcode']) {
|
||||
$location = debase64url($getVars['rcode']);
|
||||
throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.href='{$location}'"));
|
||||
throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.href='{$location}';localStorage.setItem('wechat.session','{$sessid}');"));
|
||||
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
|
||||
return ['openid' => $openid, 'fansinfo' => $userinfo];
|
||||
} else {
|
||||
@ -286,7 +284,7 @@ class WechatService extends Service
|
||||
if ($redirect) {
|
||||
throw new HttpResponseException(redirect($result['url'], 301));
|
||||
} else {
|
||||
throw new HttpResponseException(response("location.href='{$result['url']}'"));
|
||||
throw new HttpResponseException(response("location.href='{$result['url']}';localStorage.setItem('wechat.session','{$sessid}');"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -72,8 +72,13 @@
|
||||
item.is_black ? '已拉黑' : '未拉黑',
|
||||
];
|
||||
});
|
||||
|
||||
// 设置表头内容
|
||||
data.unshift(['OPENID', '微信昵称', '所在国家', '所在省份', '所在城市', '性别', '订阅状态', '订阅时间', '是否拉黑']);
|
||||
return data;
|
||||
}, '微信粉丝数据');
|
||||
|
||||
// 应用表格样式
|
||||
return this.withStyle(data, {A: 200, H: 120});
|
||||
|
||||
}, '微信粉丝数据' + layui.util.toDateString(Date.now(), '_yyyyMMdd_HHmmss'));
|
||||
});
|
||||
</script>
|
||||
@ -632,7 +632,9 @@ $(function () {
|
||||
}, this.render = function (tabldId) {
|
||||
return this.reload(tabldId, true);
|
||||
}, this.reload = function (tabldId, force) {
|
||||
return typeof tabldId === 'string' ? $('#' + tabldId).trigger(force ? 'render' : 'reload') : $.form.reload();
|
||||
return typeof tabldId === 'string' ? tabldId.split(',').map(function (tableid) {
|
||||
$('#' + tableid).trigger(force ? 'render' : 'reload')
|
||||
}) : $.form.reload();
|
||||
}, this.create = function (table, params) {
|
||||
// 动态初始化表格
|
||||
table.id = table.id || 't' + Math.random().toString().replace('.', '');
|
||||
@ -650,6 +652,8 @@ $(function () {
|
||||
if (option.height === 'full') if ($table.parents('.iframe-pagination').size()) {
|
||||
$table.parents('.iframe-pagination').addClass('not-footer');
|
||||
option.height = $(window).height() - $table.removeClass('layui-hide').offset().top - 20;
|
||||
} else if ($table.parents('.laytable-pagination').size()) {
|
||||
option.height = $table.parents('.laytable-pagination').height() - $table.removeClass('layui-hide').position().top - 20;
|
||||
} else {
|
||||
option.height = $(window).height() - $table.removeClass('layui-hide').offset().top - 35;
|
||||
}
|
||||
@ -684,13 +688,17 @@ $(function () {
|
||||
if (option.page === false) (opts || {}).page = false;
|
||||
data = $.extend({}, data, (opts || {}).where || {});
|
||||
opts = bindData($.extend({}, opts || {}, {loading: true}));
|
||||
table.id.split(',').map(function (tableid) {
|
||||
if (evt.type.indexOf('reload') > -1) {
|
||||
layui.table.reloadData(table.id, opts);
|
||||
layui.table.reloadData(tableid, opts);
|
||||
} else {
|
||||
layui.table.render(table.id, opts);
|
||||
layui.table.render(tableid, opts);
|
||||
}
|
||||
})
|
||||
}).bind('row sort tool edit radio toolbar checkbox rowDouble', function (evt, call) {
|
||||
layui.table.on(evt.type + '(' + table.dataset.id + ')', call)
|
||||
table.id.split(',').map(function (tableid) {
|
||||
layui.table.on(evt.type + '(' + tableid + ')', call)
|
||||
})
|
||||
}).bind('setFullHeight', function () {
|
||||
$table.trigger('render', {height: $(window).height() - $table.next().offset().top - 35})
|
||||
}).trigger('sort', function (rets) {
|
||||
@ -797,9 +805,12 @@ $(function () {
|
||||
|
||||
/*! 注册 data-search 表单搜索行为 */
|
||||
$.base.onEvent('submit', 'form.form-search', function () {
|
||||
if (this.dataset.tableId) return $('table#' + this.dataset.tableId).trigger('reload', {
|
||||
page: {curr: 1}, where: $(this).formToJson()
|
||||
if (this.dataset.tableId) {
|
||||
let data = $(this).formToJson();
|
||||
return this.dataset.tableId.split(',').map(function (tableid) {
|
||||
$('table#' + tableid).trigger('reload', {page: {curr: 1}, where: data});
|
||||
});
|
||||
}
|
||||
let url = $(this).attr('action').replace(/&?page=\d+/g, '');
|
||||
if ((this.method || 'get').toLowerCase() === 'get') {
|
||||
let split = url.indexOf('?') > -1 ? '&' : '?', stype = location.href.indexOf('spm=') > -1 ? '#' : '';
|
||||
|
||||
@ -32,6 +32,7 @@ define(function () {
|
||||
ip: '^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$',
|
||||
url: '^https?://([a-zA-Z0-9]+\\.)+[a-zA-Z0-9]+',
|
||||
phone: '^1[3-9][0-9]{9}$',
|
||||
mobile: '^1[3-9][0-9]{9}$',
|
||||
email: '^([a-zA-Z0-9_\\.\\-])+@(([a-zA-Z0-9\-])+\\.)+([a-zA-Z0-9]{2,4})+$',
|
||||
wechat: '^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$',
|
||||
cardid: '^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$',
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user