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

同步更新代码

Browse Source
This commit is contained in:
邹景立 2023-10-02 18:18:04 +08:00
parent ae2bd376ea
commit 30bf01a44a
21 changed files with 136 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/admin/controller/Config.php
View File

@ -61,6 +61,10 @@ class Config extends Controller
$this->systemid = ModuleService::getRunVar('uni');
$this->framework = ModuleService::getLibrarys('topthink/framework');
$this->thinkadmin = ModuleService::getLibrarys('zoujingli/think-library');
if (AdminService::isSuper() && $this->app->session->get('user.password') === md5('admin')) {
$url = url('admin/index/pass', ['id' => AdminService::getUserId()]);
$this->showErrorMessage = "超级管理员账号的密码未修改，建议立即<a data-modal='{$url}'>修改密码</a>！";
}
uasort($this->plugins, static function ($a, $b) {
if ($a['space'] === $b['space']) return 0;
return $a['space'] > $b['space'] ? 1 : -1;

12
app/admin/view/config/index.html
View File

@ -170,12 +170,6 @@
<th class="nowrap text-center">{:lang('平台框架')}</th>
<td><a target="_blank" href="https://thinkadmin.top">ThinkAdmin Version {$thinkadmin.version|default='6.0.0'}</a></td>
</tr>
<!-- {notempty name='systemid'} -->
<tr>
<th class="nowrap text-center">{:lang('安装编码')}</th>
<td>{$systemid}</td>
</tr>
<!-- {/notempty} -->
<tr>
<th class="nowrap text-center">{:lang('操作系统')}</th>
<td>{:php_uname()}</td>
@ -184,6 +178,12 @@
<th class="nowrap text-center">{:lang('运行环境')}</th>
<td>{:ucfirst($request->server('SERVER_SOFTWARE',php_sapi_name()))} & PHP {$Think.const.PHP_VERSION} & {:ucfirst(app()->db->connect()->getConfig('type'))}</td>
</tr>
<!-- {notempty name='systemid'} -->
<tr>
<th class="nowrap text-center">{:lang('系统序号')}</th>
<td>{$systemid|default=''}</td>
</tr>
<!-- {/notempty} -->
</tbody>
</table>
</div>

7
app/admin/view/main.html
View File

@ -3,7 +3,7 @@
{block name='header'}
{notempty name='title'}
<div class="layui-card-header">
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''|lang}
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|lang}
<div class="pull-right">{block name='button'}{/block}</div>
</div>
{/notempty}
@ -11,6 +11,11 @@
<div class="layui-card-line"></div>
<div class="layui-card-body">
<div class="layui-card-html">
{notempty name='showErrorMessage'}
<div class="think-box-notify" type="error">
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
</div>
{/notempty}
{block name='content'}{/block}
</div>
</div>

7
app/admin/view/table.html
View File

@ -3,7 +3,7 @@
{block name='header'}
{notempty name='title'}
<div class="layui-card-header">
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''|lang}
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|lang}
<div class="pull-right">{block name='button'}{/block}</div>
</div>
{/notempty}
@ -11,6 +11,11 @@
<div class="layui-card-line"></div>
<div class="layui-card-body">
<div class="layui-card-table">
{notempty name='showErrorMessage'}
<div class="think-box-notify" type="error">
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
</div>
{/notempty}
{block name='content'}{/block}
</div>
</div>

6
app/wechat/command/Auto.php
View File

@ -61,13 +61,13 @@ class Auto extends Command
{
$code = $input->getArgument('autocode');
$this->openid = $input->getArgument('openid');
if (empty($code)) $this->setQueueError("Message Code cannot be empty");
if (empty($this->openid)) $this->setQueueError("Wechat Openid cannot be empty");
if (empty($code)) $this->setQueueError('Message Code cannot be empty');
if (empty($this->openid)) $this->setQueueError('Wechat Openid cannot be empty');
// 查询微信消息对象
$map = ['code' => $code, 'status' => 1];
$data = WechatAuto::mk()->where($map)->find();
if (empty($data)) $this->setQueueError("Message Data Query failed");
if (empty($data)) $this->setQueueError('Message Data Query failed');
// 发送微信客服消息
$this->buildMessage($data->toArray());

6
app/wechat/command/Clear.php
View File

@ -49,12 +49,12 @@ class Clear extends Command
$query->where(['payment_status' => 0]);
$query->whereTime('create_time', '<', strtotime('-24 hours'));
[$total, $count] = [(clone $query)->count(), 0];
if (empty($total)) $this->setQueueSuccess("没有需要清理的24小时未支付数据！");
if (empty($total)) $this->setQueueSuccess('无需清理24小时未支付！');
/** @var \think\Model $item */
foreach ($query->cursor() as $item) {
$this->setQueueMessage($total, ++$count, "开始清理 {$item->getAttr('code')} 支付单...");
$this->setQueueMessage($total, ++$count, sprintf('开始清理 %s 支付单...', $item->getAttr('code')));
$item->delete();
$this->setQueueMessage($total, $count, "完成清理 {$item->getAttr('code')} 支付单!!!", 1);
$this->setQueueMessage($total, $count, sprintf('完成清理 %s 支付单！', $item->getAttr('code')), 1);
}
}
}

10
app/wechat/command/Fans.php
View File

@ -84,7 +84,7 @@ class Fans extends Command
}
$this->process->message($done > 0 ? '微信用户数据获取完成' : '未获取到微信用户数据');
$this->process->message('');
return "共获取 {$done} 个用户数据";
return sprintf('共获取 %d 个用户数据', $done);
}
/**
@ -98,7 +98,7 @@ class Fans extends Command
public function _black(string $next = '', int $done = 0): string
{
$wechat = WechatService::WeChatUser();
$this->setQueueProgress("开始更新黑名单列表");
$this->setQueueProgress('开始更新黑名单列表');
// 清理原来的黑名单，重新批量更新黑名单列表
WechatFans::mk()->where(['is_black' => 1])->update(['is_black' => 0]);
@ -112,12 +112,12 @@ class Fans extends Command
}
$next = $result['total'] > $done ? $result['next_openid'] : null;
}
$this->setQueueProgress("完成更新 {$result['total']} 个黑名单", null, 1);
$this->setQueueProgress(sprintf('完成更新 %v 个黑名单', $result['total']), null, 1);
$this->output->newLine();
if (empty($result['total'])) {
return ', 其中黑名单 0 人';
} else {
return ", 其中黑名单 {$result['total']} 人";
return sprintf(', 其中黑名单 %v 人', $result['total']);
}
}
@ -144,6 +144,6 @@ class Fans extends Command
}
$this->output->comment($done > 0 ? '微信用户标签数据获取完成' : '未获取到微信用户标签数据');
$this->output->newLine();
return ", 获取到 {$done} 个标签";
return sprintf(', 获取到 %v 个标签', $done);
}
}

4
app/wechat/controller/Config.php
View File

@ -96,8 +96,8 @@ class Config extends Controller
$auth = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/service/api.push/auth?source=SOURCE";
$jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?token=TOKEN&not_init_session=1';
Builder::mk()
->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?(\?|\&)source=SOURCE')
->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件 ThinkPlugsWechatService 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?(\?|\&)token=TOKEN')
->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?source=SOURCE')
->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件 <a target="_blank" href="https://thinkadmin.top/plugin/think-plugs-wechat-service.html">ThinkPlugsWechatService</a> 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?token=TOKEN')
->addSubmitButton('保存参数')->addCancelButton()
->fetch(['vo' => ['auth_url' => $auth, 'json_rpc' => $jsonRpc]]);
} else {

1
app/wechat/controller/api/Push.php
View File

@ -328,5 +328,4 @@ class Push extends Controller
}
return $data;
}
}

18
app/wechat/controller/api/View.php
View File

@ -45,18 +45,14 @@ class View extends Controller
/**
* 文章内容展示
* @param string|integer $id 文章ID编号
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function item($id = 0)
{
$map = ['id' => $id ?: input('id', 0)];
WechatNewsArticle::mk()->where($map)->update([
'read_num' => $this->app->db->raw('read_num+1'),
]);
$this->info = WechatNewsArticle::mk()->where($map)->find();
$this->fetch();
$modal = WechatNewsArticle::mk()->where($map)->findOrEmpty();
$modal->isExists() && $modal->newQuery()->where($map)->setInc('read_num');
$this->fetch('item', ['info' => $modal->toArray()]);
}
/**
@ -64,8 +60,8 @@ class View extends Controller
*/
public function text()
{
$this->content = strip_tags(input('content', ''), '<a><img>');
$this->fetch();
$text = strip_tags(input('content', ''), '<a><img>');
$this->fetch('text', ['content' => $text]);
}
/**
@ -73,8 +69,8 @@ class View extends Controller
*/
public function image()
{
$this->content = strip_tags(input('content', ''), '<a><img>');
$this->fetch();
$text = strip_tags(input('content', ''), '<a><img>');
$this->fetch('image', ['content' => $text]);
}
/**

28
app/wechat/service/WechatService.php
View File

@ -22,6 +22,7 @@ use think\admin\Library;
use think\admin\Service;
use think\admin\storage\LocalStorage;
use think\exception\HttpResponseException;
use think\Response;
/**
* 微信接口调度服务
@ -235,7 +236,6 @@ 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();
$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))) {
@ -255,7 +255,7 @@ class WechatService extends Service
$params['rcode'] = enbase64url($source);
$location = strstr("{$source}?", '?', true) . '?' . http_build_query($params);
$oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base');
throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("location.href='{$oauthurl}'"));
throw new HttpResponseException(static::createRedirect($oauthurl, $redirect));
} elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
$openid = $token['openid'];
// 如果是虚拟账号，不保存会话信息，下次重新授权
@ -275,8 +275,7 @@ class WechatService extends Service
}
}
if ($getVars['rcode']) {
$location = debase64url($getVars['rcode']);
throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.replace('{$location}');sessionStorage.setItem('wechat.session','{$sessid}');"));
throw new HttpResponseException(static::createRedirect(debase64url($getVars['rcode']), $redirect));
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
return ['openid' => $openid, 'fansinfo' => $userinfo];
} else {
@ -294,14 +293,25 @@ class WechatService extends Service
empty($result['token']['is_snapshotuser']) && empty($userinfo) || FansService::set($userinfo, $appid);
return ['openid' => $openid, 'fansinfo' => $userinfo];
}
if ($redirect) {
throw new HttpResponseException(redirect($result['url'], 301));
} else {
throw new HttpResponseException(response("location.replace('{$result['url']}');localStorage.setItem('wechat.session','{$sessid}');"));
}
throw new HttpResponseException(static::createRedirect($result['url'], $redirect));
}
}
/**
* 网页授权链接跳转
* @param string $location 跳转链接
* @param boolean $redirect 强制跳转
* @return \think\Response
*/
private static function createRedirect(string $location, bool $redirect = true): Response
{
if ($redirect) return redirect($location, 301);
[$ssid, $scripts] = [Library::$sapp->session->getId(), []];
$scripts[] = sprintf("location.replace('%s')", $location);
$scripts[] = sprintf("sessionStorage.setItem('wechat.session','%s')", $ssid);
return response(join(";\n", $scripts) . ";\n");
}
/**
* 获取微信网页JSSDK签名参数
* @param null|string $location 签名地址

2
app/wechat/view/config/options_form_api.html
View File

@ -1,7 +1,7 @@
<form action="{:request()->url()}" method="post" data-auto="true" class="layui-form layui-card shadow-none">
<div class="layui-card-header border-0" style="height:auto">
<div class="layui-bg-gray padding-20 padding-top-0 border-radius-5" style="line-height:2em">
<div class="layui-bg-gray padding-20 border-radius-5" style="line-height:2em">
{:lang('使用微信公众平台直接模式时，需要在微信公众号平台配置授权IP及网页授权域名，将公众号平台获取到的参数填写到下面。')}
</div>
</div>

2
app/wechat/view/config/options_form_thr.html
View File

@ -1,7 +1,7 @@
<form action="{:request()->url()}" method="post" data-auto="true" class="layui-form layui-card shadow-none">
<div class="layui-card-header border-0" style="height:auto">
<div class="layui-bg-gray padding-20 padding-top-0 border-radius-5" style="line-height:2em">
<div class="layui-bg-gray padding-20 border-radius-5" style="line-height:2em">
{:lang('使用微信开放平台授权模式时，微信将授权给第三方服务平台托管系统，消息数据使用 %s 通信协议转发。',['<span>JsonRpc</span>'])}
</div>
</div>

44
app/wechat/view/keys/form.html
View File

@ -24,7 +24,7 @@
}
</style>
<div class="nowrap think-box-shadow" style="width:910px">
<div class="nowrap padding-10">
<div class='mobile-preview inline-block'>
<div class='mobile-header'>公众号</div>
<div class='mobile-body' data-iframe-box></div>
@ -47,30 +47,34 @@
<div class="layui-form-item">
<label class="layui-form-label label-required">规则状态</label>
<div class="layui-input-block">
{foreach ['1'=>'启用','0'=>'禁用'] as $k=>$v}
<label class="think-radio">
<!--{if (!isset($vo.status) and $k eq '1') or (isset($vo.status) and $vo.status eq $k)}-->
<input type="radio" checked name="status" value="{$k}" lay-ignore> {$v}
<!--{else}-->
<input type="radio" name="status" value="{$k}" lay-ignore> {$v}
<!--{/if}-->
</label>
{/foreach}
<div class="layui-input help-checks">
{foreach ['1'=>'启用','0'=>'禁用'] as $k=>$v}
<label class="think-radio">
<!--{if (!isset($vo.status) and $k eq '1') or (isset($vo.status) and $vo.status eq $k)}-->
<input type="radio" checked name="status" value="{$k}" lay-ignore> {$v}
<!--{else}-->
<input type="radio" name="status" value="{$k}" lay-ignore> {$v}
<!--{/if}-->
</label>
{/foreach}
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label label-required">消息类型</label>
<div class="layui-input-block">
{foreach $types as $k=>$v}
<label class="think-radio">
<!--{if (!isset($vo.type) and $k eq 'text') or (isset($vo.type) and$vo.type eq $k)}-->
<input name="type" checked type="radio" value="{$k}" lay-ignore> {$v}
<!--{else}-->
<input name="type" type="radio" value="{$k}" lay-ignore> {$v}
<!--{/if}-->
</label>
{/foreach}
<div class="layui-input-block" style="white-space:normal">
<div class="layui-textarea help-checks">
{foreach $types as $k=>$v}
<label class="think-radio">
<!--{if (!isset($vo.type) and $k eq 'text') or (isset($vo.type) and$vo.type eq $k)}-->
<input name="type" checked type="radio" value="{$k}" lay-ignore> {$v}
<!--{else}-->
<input name="type" type="radio" value="{$k}" lay-ignore> {$v}
<!--{/if}-->
</label>
{/foreach}
</div>
</div>
</div>

7
app/wechat/view/main.html
View File

@ -3,7 +3,7 @@
{block name='header'}
{notempty name='title'}
<div class="layui-card-header">
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''}
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|lang}
<div class="pull-right">{block name='button'}{/block}</div>
</div>
{/notempty}
@ -11,6 +11,11 @@
<div class="layui-card-line"></div>
<div class="layui-card-body">
<div class="layui-card-html">
{notempty name='showErrorMessage'}
<div class="think-box-notify" type="error">
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
</div>
{/notempty}
{block name='content'}{/block}
</div>
</div>

26
app/wechat/view/news/form.html
View File

@ -80,9 +80,9 @@
<script>
require(['angular', 'ckeditor'], function () {
var editor;
let editor;
$('form[name="news"]').vali(null, function () {
var vali = this, app = angular.module("NewsEditor", []).run(callback);
let vali = this, app = angular.module("NewsEditor", []).run(callback);
angular.bootstrap(document.getElementById(app.name), [app.name]);
function callback($rootScope) {
@ -101,7 +101,7 @@
title: '新建图文', author: '管理员', content: '文章内容',
read_num: 0, local_url: '__FULL__/static/theme/img/image.png',
});
for (var i in list) {
for (let i in list) {
list[i].active = false;
list[i].style = "background-image:url('" + list[i].local_url + "')";
}
@ -124,9 +124,9 @@
$rootScope.upItem = function (index, $event) {
$event.stopPropagation();
var tmp = [], cur = $rootScope.list[index];
let tmp = [], cur = $rootScope.list[index];
if (index < 1) return false;
for (var i in $rootScope.list) {
for (let i in $rootScope.list) {
(parseInt(i) === parseInt(index) - 1) && tmp.push(cur);
(parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]);
}
@ -134,9 +134,9 @@
};
$rootScope.dnItem = function (index, $event) {
$event.stopPropagation();
var tmp = [], cur = $rootScope.list[index];
let tmp = [], cur = $rootScope.list[index];
if (index > $rootScope.list.length - 2) return false;
for (var i in $rootScope.list) {
for (let i in $rootScope.list) {
(parseInt(i) !== parseInt(index)) && tmp.push($rootScope.list[i]);
(parseInt(i) === parseInt(index) + 1) && tmp.push(cur);
}
@ -144,8 +144,8 @@
};
$rootScope.delItem = function (index, $event) {
$event.stopPropagation();
var list = $rootScope.list, temp = [];
for (var i in list) (parseInt(i) !== parseInt(index)) && temp.push(list[i]);
let list = $rootScope.list, temp = [];
for (let i in list) (parseInt(i) !== parseInt(index)) && temp.push(list[i]);
apply(temp);
};
$rootScope.setItem = function (index, $event) {
@ -154,7 +154,7 @@
if (editor.getData().length < 1) {
return $.msg.notify('操作提示', '文章内容不能为空，请输入内容！', 3000, {type: 'error', width: '400px'})
}
for (var i in $rootScope.list) if (parseInt(i) !== parseInt(index)) {
for (let i in $rootScope.list) if (parseInt(i) !== parseInt(index)) {
$rootScope.list[i].active = false;
} else {
$rootScope.item.content = editor.getData();
@ -183,8 +183,8 @@
$rootScope.submit = function () {
if (!vali.checkAllInput()) return false;
$rootScope.item.content = editor.getData();
var data = [];
for (var i in $rootScope.list) data.push({
let data = [];
for (let i in $rootScope.list) data.push({
id: $rootScope.list[i].id,
title: $rootScope.list[i].title,
author: $rootScope.list[i].author,
@ -198,7 +198,7 @@
$.form.load('{:request()->url()}', {data: data}, "post");
};
$('[name="local_url"]').on('change', function () {
var value = this.value;
let value = this.value;
$rootScope.$apply(function () {
$rootScope.setItemValue('local_url', value);
});

7
app/wechat/view/table.html
View File

@ -3,7 +3,7 @@
{block name='header'}
{notempty name='title'}
<div class="layui-card-header">
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|default=''}
<span class="layui-icon font-s10 color-desc margin-right-5">&#xe65b;</span>{$title|lang}
<div class="pull-right">{block name='button'}{/block}</div>
</div>
{/notempty}
@ -11,6 +11,11 @@
<div class="layui-card-line"></div>
<div class="layui-card-body">
<div class="layui-card-table">
{notempty name='showErrorMessage'}
<div class="think-box-notify" type="error">
<b>系统提示：</b><span>{$showErrorMessage|raw}</span>
</div>
{/notempty}
{block name='content'}{/block}
</div>
</div>

4
composer.json
View File

@ -17,7 +17,7 @@
"require": {
"php": ">=7.1",
"ext-json": "*",
"zoujingli/think-library": "^6.0",
"zoujingli/think-library": "^6.1",
"zoujingli/think-plugs-admin": "^1.0",
"zoujingli/think-plugs-wechat": "^1.0"
},
@ -35,4 +35,4 @@
"zoujingli/think-install": true
}
}
}
}

22
public/static/theme/css/_custom.less
View File

@ -742,14 +742,32 @@ table[data-line='3'] + div tbody .layui-table-cell {
.think-box-notify {
display: block;
padding: 18px 20px;
padding: 15px 20px;
position: relative;
overflow: hidden;
font-size: 14px;
background: #FFF;
line-height: 1em;
line-height: 1.4em;
margin-bottom: 10px;
box-shadow: @ShadowOuterMax;
border-radius: @BoxBorderRadius;
&[type] {
border-left: 6px solid #16baaa;
}
&[type=info] {
border-left: 6px solid #31bdec;
}
&[type=error] {
border-left: 6px solid #ff5722;
}
&[type=success] {
border-left: 6px solid #16b777;
}
> b {
font-size: 15px;
}

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

File diff suppressed because one or more lines are too long

2
public/static/theme/css/console.css.map
View File

File diff suppressed because one or more lines are too long