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-09-14 21:10:10 +08:00
parent 8d3db1a6ff
commit 2e24e77995
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/wechat/Service.php
View File

@ -56,12 +56,12 @@ class Service extends Plugin
$this->commands([Fans::class, Auto::class, Clear::class]);
// 注册粉丝关注事件
$this->app->event->listen('WechatFansSubscribe', function ($openid) {
$this->app->event->listen('WechatFansSubscribe', static function ($openid) {
AutoService::register($openid);
});
// 注册支付通知路由
$this->app->route->any('/plugin-wxpay-notify/:vars', function (Request $request) {
$this->app->route->any('/plugin-wxpay-notify/:vars', static function (Request $request) {
try {
$data = json_decode(CodeExtend::deSafe64($request->param('vars')), true);
return PaymentService::notify($data);

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

@ -236,7 +236,6 @@ class WechatService extends Service
{
$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))) {
@ -258,16 +257,26 @@ class WechatService extends Service
$oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base');
throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("location.href='{$oauthurl}'"));
} elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
Library::$sapp->session->set("{$appid}_openid", $openid = $token['openid']);
$openid = $token['openid'];
// 如果是虚拟账号，不保存会话信息，下次重新授权
if (empty($token['is_snapshotuser'])) {
Library::$sapp->session->set("{$appid}_openid", $openid);
}
if ($isfull && isset($token['access_token'])) {
$userinfo = $wechat->getUserInfo($token['access_token'], $openid);
Library::$sapp->session->set("{$appid}_fansinfo", $userinfo);
empty($userinfo) || FansService::set($userinfo, $appid);
// 如果是虚拟账号，不保存会话信息，下次重新授权
if (empty($token['is_snapshotuser'])) {
$userinfo['is_snapshotuser'] = 0;
Library::$sapp->session->set("{$appid}_fansinfo", $userinfo);
empty($userinfo) || FansService::set($userinfo, $appid);
} else {
$userinfo['is_snapshotuser'] = 1;
}
}
}
if ($getVars['rcode']) {
$location = debase64url($getVars['rcode']);
throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.href='{$location}';localStorage.setItem('wechat.session','{$sessid}');"));
throw new HttpResponseException($redirect ? redirect($location, 301) : response("location.replace('{$location}');sessionStorage.setItem('wechat.session','{$sessid}');"));
} elseif ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
return ['openid' => $openid, 'fansinfo' => $userinfo];
} else {
@ -275,16 +284,20 @@ class WechatService extends Service
}
} else {
$result = static::ThinkServiceConfig()->oauth(Library::$sapp->session->getId(), $source, $isfull);
Library::$sapp->session->set("{$appid}_openid", $openid = $result['openid']);
Library::$sapp->session->set("{$appid}_fansinfo", $userinfo = $result['fans']);
[$openid, $userinfo] = [$result['openid'] ?? '', $result['fans'] ?? []];
// 如果是虚拟账号，不保存会话信息，下次重新授权
if (empty($result['token']['is_snapshotuser'])) {
Library::$sapp->session->set("{$appid}_openid", $openid);
Library::$sapp->session->set("{$appid}_fansinfo", $userinfo);
}
if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
empty($userinfo) || FansService::set($userinfo, $appid);
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.href='{$result['url']}';localStorage.setItem('wechat.session','{$sessid}');"));
throw new HttpResponseException(response("location.replace('{$result['url']}');localStorage.setItem('wechat.session','{$sessid}');"));
}
}
}

7
app/wechat/view/fans/index.html
View File

@ -37,14 +37,13 @@
{field: 'sex', title: '性别', align: 'center', minWidth: 80, templet: '<div>{{d.sex==1 ? "男" : (d.sex==2 ? "女" : "未知")}}</div>'},
{field: 'language', title: '使用语言', align: 'center', minWidth: 100, templet: '<div>{{d.language}}</div>'},
{
field: 'subscribe', title: '订阅状态', align: "center", minWidth: 80, templet: function (d) {
if (d.subscribe > 0) return '<span class="layui-badge layui-bg-green">已订阅</span>';
else return '<span class="layui-badge">未订阅</span>';
field: 'subscribe', title: '订阅状态', align: "center", minWidth: 90, templet: function (d) {
return d.subscribe > 0 ? '<span class="layui-badge layui-bg-green">已订阅</span>' : '<span class="layui-badge">未订阅</span>';
}
},
{field: 'subscribe_time', title: '订阅时间', minWidth: 170, align: 'center', sort: true, templet: '<div>{{d.subscribe_at}}</div>'},
{field: 'is_black', title: '是否黑名单', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'},
{toolbar: '#toolbar', title: '操作面板', align: 'center', fixed: 'right'}
{toolbar: '#toolbar', title: '操作面板', align: 'center', fixed: 'right', minWidth: 80}
]]
});

9
app/wechat/view/payment/refund/index.html
View File

@ -15,9 +15,14 @@
sort: {field: 'id', type: 'desc'},
cols: [[
{field: 'id', hide: true},
{field: 'headimg', title: '头像', width: 95, align: 'center', templet: '<div>{{-showTableImage(d.record.fans_headimg,true,"md")}}</div>'},
{
field: 'headimg', title: '头像', width: 95, align: 'center', templet: function (d) {
return d.record ? laytpl('{{-showTableImage(d.record.fans_headimg,true,"md")}}').render(d) : '-';
}
},
{
field: '', title: '用户账号', minWidth: 170, templet: function (d) {
if (!d.record) return '-';
let tpls = [];
tpls.push('<div class="padding-top-10"></div>用户昵称：{{d.record.fans_nickname||"-"}}');
tpls.push('用户标识：<span class="font-code">{{d.record.openid||"-"}}</span>');
@ -26,6 +31,7 @@
},
{
field: '', title: '订单内容', minWidth: 180, width: '18%', templet: function (d) {
if (!d.record) return '-';
let tpls = [];
tpls.push('<b class="color-blue font-code">{{d.record.order_code}}</b>');
tpls.push('{{d.record.order_name||"-"}}');
@ -35,6 +41,7 @@
},
{
field: '', title: '支付交易', minWidth: 180, width: '20%', templet: function (d) {
if (!d.record) return '-';
let lines = [];
lines.push('<b class="color-blue font-code">{{d.record.code||"-"}}</b>');
lines.push('<b class="color-blue font-code">{{d.record.payment_trade||"-"}}</b>');