From 30bf01a44a1e5e907c664be98110efefffabea4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Mon, 2 Oct 2023 18:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Config.php | 4 ++ app/admin/view/config/index.html | 12 +++--- app/admin/view/main.html | 7 +++- app/admin/view/table.html | 7 +++- app/wechat/command/Auto.php | 6 +-- app/wechat/command/Clear.php | 6 +-- app/wechat/command/Fans.php | 10 ++--- app/wechat/controller/Config.php | 4 +- app/wechat/controller/api/Push.php | 1 - app/wechat/controller/api/View.php | 18 ++++---- app/wechat/service/WechatService.php | 28 +++++++++---- app/wechat/view/config/options_form_api.html | 2 +- app/wechat/view/config/options_form_thr.html | 2 +- app/wechat/view/keys/form.html | 44 +++++++++++--------- app/wechat/view/main.html | 7 +++- app/wechat/view/news/form.html | 26 ++++++------ app/wechat/view/table.html | 7 +++- composer.json | 4 +- public/static/theme/css/_custom.less | 22 +++++++++- public/static/theme/css/console.css | 2 +- public/static/theme/css/console.css.map | 2 +- 21 files changed, 136 insertions(+), 85 deletions(-) diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index 92f25043f..69dc2c82a 100644 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -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 = "超级管理员账号的密码未修改，建议立即修改密码！"; + } uasort($this->plugins, static function ($a, $b) { if ($a['space'] === $b['space']) return 0; return $a['space'] > $b['space'] ? 1 : -1; diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html index f5f1abb2d..002b490b2 100644 --- a/app/admin/view/config/index.html +++ b/app/admin/view/config/index.html @@ -170,12 +170,6 @@ {:lang('平台框架')} ThinkAdmin Version {$thinkadmin.version|default='6.0.0'} - - - {:lang('安装编码')} - {$systemid} - - {:lang('操作系统')} {:php_uname()} @@ -184,6 +178,12 @@ {:lang('运行环境')} {:ucfirst($request->server('SERVER_SOFTWARE',php_sapi_name()))} & PHP {$Think.const.PHP_VERSION} & {:ucfirst(app()->db->connect()->getConfig('type'))} + + + {:lang('系统序号')} + {$systemid|default=''} + + diff --git a/app/admin/view/main.html b/app/admin/view/main.html index 46cd79a49..bc3b8a62d 100644 --- a/app/admin/view/main.html +++ b/app/admin/view/main.html @@ -3,7 +3,7 @@ {block name='header'} {notempty name='title'}
- {$title|default=''|lang} + {$title|lang}
{block name='button'}{/block}
{/notempty} @@ -11,6 +11,11 @@
+ {notempty name='showErrorMessage'} +
+ 系统提示：{$showErrorMessage|raw} +
+ {/notempty} {block name='content'}{/block}
diff --git a/app/admin/view/table.html b/app/admin/view/table.html index 47c21aaad..83fdb3566 100644 --- a/app/admin/view/table.html +++ b/app/admin/view/table.html @@ -3,7 +3,7 @@ {block name='header'} {notempty name='title'}
- {$title|default=''|lang} + {$title|lang}
{block name='button'}{/block}
{/notempty} @@ -11,6 +11,11 @@
+ {notempty name='showErrorMessage'} +
+ 系统提示：{$showErrorMessage|raw} +
+ {/notempty} {block name='content'}{/block}
diff --git a/app/wechat/command/Auto.php b/app/wechat/command/Auto.php index aa923c618..0fe89a4b1 100644 --- a/app/wechat/command/Auto.php +++ b/app/wechat/command/Auto.php @@ -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()); diff --git a/app/wechat/command/Clear.php b/app/wechat/command/Clear.php index 1392f2d3b..b9e6a20ed 100644 --- a/app/wechat/command/Clear.php +++ b/app/wechat/command/Clear.php @@ -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); } } } \ No newline at end of file diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index e8e077208..81843ef58 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -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); } } diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php index b5858c320..ce6aa534e 100644 --- a/app/wechat/controller/Config.php +++ b/app/wechat/controller/Config.php @@ -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¬_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, '由应用插件 ThinkPlugsWechatService 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?token=TOKEN') ->addSubmitButton('保存参数')->addCancelButton() ->fetch(['vo' => ['auth_url' => $auth, 'json_rpc' => $jsonRpc]]); } else { diff --git a/app/wechat/controller/api/Push.php b/app/wechat/controller/api/Push.php index 0de69892d..ed50b068e 100644 --- a/app/wechat/controller/api/Push.php +++ b/app/wechat/controller/api/Push.php @@ -328,5 +328,4 @@ class Push extends Controller } return $data; } - } diff --git a/app/wechat/controller/api/View.php b/app/wechat/controller/api/View.php index 76559dfa6..d4ba9f6fa 100644 --- a/app/wechat/controller/api/View.php +++ b/app/wechat/controller/api/View.php @@ -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', ''), ''); - $this->fetch(); + $text = strip_tags(input('content', ''), ''); + $this->fetch('text', ['content' => $text]); } /** @@ -73,8 +69,8 @@ class View extends Controller */ public function image() { - $this->content = strip_tags(input('content', ''), ''); - $this->fetch(); + $text = strip_tags(input('content', ''), ''); + $this->fetch('image', ['content' => $text]); } /** diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php index 39280cc3b..7ce1085b0 100644 --- a/app/wechat/service/WechatService.php +++ b/app/wechat/service/WechatService.php @@ -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 签名地址 diff --git a/app/wechat/view/config/options_form_api.html b/app/wechat/view/config/options_form_api.html index 21296bb7d..ab953204a 100644 --- a/app/wechat/view/config/options_form_api.html +++ b/app/wechat/view/config/options_form_api.html @@ -1,7 +1,7 @@
-
+
{:lang('使用微信公众平台直接模式时，需要在微信公众号平台配置授权IP及网页授权域名，将公众号平台获取到的参数填写到下面。')}
diff --git a/app/wechat/view/config/options_form_thr.html b/app/wechat/view/config/options_form_thr.html index b034a0a2d..cf9e29014 100644 --- a/app/wechat/view/config/options_form_thr.html +++ b/app/wechat/view/config/options_form_thr.html @@ -1,7 +1,7 @@
-
+
{:lang('使用微信开放平台授权模式时，微信将授权给第三方服务平台托管系统，消息数据使用 %s 通信协议转发。',['JsonRpc'])}
diff --git a/app/wechat/view/keys/form.html b/app/wechat/view/keys/form.html index 5f119fa2b..00ff2ebeb 100644 --- a/app/wechat/view/keys/form.html +++ b/app/wechat/view/keys/form.html @@ -24,7 +24,7 @@ } -
+
公众号
@@ -47,30 +47,34 @@
- {foreach ['1'=>'启用','0'=>'禁用'] as $k=>$v} - - {/foreach} +
+ {foreach ['1'=>'启用','0'=>'禁用'] as $k=>$v} + + {/foreach} +
-
- {foreach $types as $k=>$v} - - {/foreach} +
+
+ {foreach $types as $k=>$v} + + {/foreach} +
diff --git a/app/wechat/view/main.html b/app/wechat/view/main.html index c46b38d3b..bc3b8a62d 100644 --- a/app/wechat/view/main.html +++ b/app/wechat/view/main.html @@ -3,7 +3,7 @@ {block name='header'} {notempty name='title'}
- {$title|default=''} + {$title|lang}
{block name='button'}{/block}
{/notempty} @@ -11,6 +11,11 @@
+ {notempty name='showErrorMessage'} +
+ 系统提示：{$showErrorMessage|raw} +
+ {/notempty} {block name='content'}{/block}
diff --git a/app/wechat/view/news/form.html b/app/wechat/view/news/form.html index 723b7c1d3..7fcd11330 100644 --- a/app/wechat/view/news/form.html +++ b/app/wechat/view/news/form.html @@ -80,9 +80,9 @@