From b8eab9f337fafb196fb76c13f5d93d9fc47dc048 Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 18 Jul 2019 10:49:10 +0800 Subject: [PATCH] Update Push.php --- application/wechat/controller/api/Push.php | 57 +++++++++++++--------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/application/wechat/controller/api/Push.php b/application/wechat/controller/api/Push.php index b84fefcc4..4349284b2 100644 --- a/application/wechat/controller/api/Push.php +++ b/application/wechat/controller/api/Push.php @@ -1,15 +1,16 @@ wechat = WechatService::WeChatReceive(); if ($this->request->has('receive', 'post') && WechatService::getType() === 'thr') { - $this->forceCustom = true; + $this->forceJson = true; // 强制返回JSON到Service转发 + $this->forceCustom = false; // 强制使用客服消息模式推送 $this->appid = $this->request->post('appid', '', null); $this->openid = $this->request->post('openid', '', null); $this->encrypt = boolval($this->request->post('encrypt', 0)); @@ -98,7 +106,9 @@ class Push extends Controller throw new \think\Exception('微信API实例缺失必要参数[appid,openid,receive]'); } } else { - $this->forceCustom = false; + $this->forceJson = false; // 暂停返回JSON消息对象 + $this->forceCustom = false; // 暂停使用客户消息模式 + $this->wechat = WechatService::WeChatReceive(); $this->appid = WechatService::getAppid(); $this->openid = $this->wechat->getOpenid(); $this->encrypt = $this->wechat->isEncrypt(); @@ -110,7 +120,7 @@ class Push extends Controller if (is_string(($result = $this->$method()))) return $result; } } catch (\Exception $e) { - \think\facade\Log::error(__METHOD__ . ":{$e->getLine()} [{$e->getCode()}] {$e->getMessage()}"); + Log::error("{$e->getFile()}:{$e->getLine()} [{$e->getCode()}] {$e->getMessage()}"); } return 'success'; } @@ -248,7 +258,7 @@ class Push extends Controller } /** - * 发送消息到公众号 + * 发送消息到微信 * @param string $type 消息类型（text|image|voice|video|music|news|mpnews|wxcard） * @param array $data 消息内容数据对象 * @param boolean $isCustom 是否使用客服消息发送 @@ -265,7 +275,8 @@ class Push extends Controller WechatService::WeChatCustom()->send(['touser' => $this->openid, 'msgtype' => $type, "{$type}" => $data]); } else switch (strtolower($type)) { case 'text': // 发送文本消息 - return $this->wechat->reply(['CreateTime' => time(), 'MsgType' => 'text', 'ToUserName' => $this->openid, 'FromUserName' => $this->fromOpenid, 'Content' => $data['content']], true, $this->encrypt); + $reply = ['CreateTime' => time(), 'MsgType' => 'text', 'ToUserName' => $this->openid, 'FromUserName' => $this->fromOpenid, 'Content' => $data['content']]; + return $this->forceJson ? json_encode($reply, JSON_UNESCAPED_UNICODE) : WechatService::WeChatReceive()->reply($reply, true, $this->encrypt); case 'image': // 发送图片消息 return $this->buildMessage($type, ['MediaId' => $data['media_id']]); case 'voice': // 发送语言消息 @@ -280,7 +291,8 @@ class Push extends Controller case 'news': // 发送图文消息 $articles = []; foreach ($data['articles'] as $article) array_push($articles, ['PicUrl' => $article['picurl'], 'Title' => $article['title'], 'Description' => $article['description'], 'Url' => $article['url']]); - return $this->wechat->reply(['CreateTime' => time(), 'MsgType' => 'news', 'ToUserName' => $this->openid, 'FromUserName' => $this->fromOpenid, 'Articles' => $articles, 'ArticleCount' => count($articles)], true, $this->encrypt); + $reply = ['CreateTime' => time(), 'MsgType' => 'news', 'ToUserName' => $this->openid, 'FromUserName' => $this->fromOpenid, 'Articles' => $articles, 'ArticleCount' => count($articles)]; + return $this->forceJson ? json_encode($reply, JSON_UNESCAPED_UNICODE) : WechatService::WeChatReceive()->reply($reply, true, $this->encrypt); default: return 'success'; } @@ -288,8 +300,8 @@ class Push extends Controller /** * 消息数据生成 - * @param string $type - * @param string|array $data + * @param string $type 消息类型 + * @param string|array $data 消息数据 * @return string * @throws \WeChat\Exceptions\InvalidDecryptException */ @@ -297,7 +309,7 @@ class Push extends Controller { $reply = ['CreateTime' => time(), 'MsgType' => strtolower($type), 'ToUserName' => $this->openid, 'FromUserName' => $this->fromOpenid]; if (!empty($data)) $reply[ucfirst(strtolower($type))] = $data; - return $this->wechat->reply($reply, true, $this->encrypt); + return $this->forceJson ? json_encode($reply, JSON_UNESCAPED_UNICODE) : WechatService::WeChatReceive()->reply($reply, true, $this->encrypt); } /** @@ -312,14 +324,15 @@ class Push extends Controller if ($subscribe) { try { $user = WechatService::WeChatUser()->getUserInfo($this->openid); - return FansService::set(array_merge($user, ['subscribe' => '1'])); + return FansService::set(array_merge($user, ['subscribe' => '1', 'appid' => $this->appid])); } catch (\Exception $e) { - \think\facade\Log::error(__METHOD__ . " {$this->openid} 粉丝信息获取失败，{$e->getMessage()}"); + Log::error(__METHOD__ . " {$this->openid} get userinfo faild. {$e->getMessage()}"); return false; } + } else { + $user = ['subscribe' => '0', 'openid' => $this->openid, 'appid' => $this->appid]; + return data_save('WechatFans', $user, 'openid', ['appid' => $this->appid]); } - $user = ['subscribe' => '0', 'openid' => $this->openid, 'appid' => $this->appid]; - return data_save('WechatFans', $user, 'openid', ['appid' => $this->appid]); } -} \ No newline at end of file +}