From a6c05c859b160cf66c9dbd7379b3b31573214fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Mon, 12 Apr 2021 10:21:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=9B=9E=E5=A4=8D=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/wechat/command/Auto.php | 12 ++++++------ app/wechat/service/AutoService.php | 4 ++-- app/wechat/view/auto/index.html | 6 +++++- vendor/composer/autoload_classmap.php | 3 +++ vendor/composer/autoload_static.php | 3 +++ vendor/services.php | 2 +- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/wechat/command/Auto.php b/app/wechat/command/Auto.php index 88e0da04e..aa9951b06 100644 --- a/app/wechat/command/Auto.php +++ b/app/wechat/command/Auto.php @@ -24,7 +24,7 @@ class Auto extends Command */ protected function configure() { - $this->setName('xadmin:fanauto'); + $this->setName('xadmin:fansmsg'); $this->addArgument('openid', Argument::OPTIONAL, 'wechat user openid', ''); $this->addArgument('autocode', Argument::OPTIONAL, 'wechat auto message', ''); $this->setDescription('Wechat Users Push AutoMessage for ThinkAdmin'); @@ -71,7 +71,7 @@ class Auto extends Command private function _buildMessage(array $data) { $type = strtolower($data['type']); - $result = [0, '待发货的消息不符合规则']; + $result = [0, '待发送的消息不符合规则']; if ($type === 'text' && !empty($data['content'])) { $result = $this->_sendMessage('text', ['content' => $data['content']]); } @@ -87,9 +87,9 @@ class Auto extends Command } if ($type === 'news') { [$item, $news] = [MediaService::instance()->news($data['news_id']), []]; - if (!empty($item['articles'])) { - $host = sysconf('base.site_host'); - foreach ($item['articles'] as $vo) array_push($news, [ + if (isset($item['articles']) && is_array($item['articles'])) { + $host = sysconf('base.site_host') ?: true; + foreach ($item['articles'] as $vo) if (empty($news)) array_push($news, [ 'url' => url("@wechat/api.view/item/id/{$vo['id']}", [], false, $host)->build(), 'title' => $vo['title'], 'picurl' => $vo['local_url'], 'description' => $vo['digest'], ]); @@ -128,7 +128,7 @@ class Auto extends Command WechatService::WeChatCustom()->send([ $type => $data, 'touser' => $this->openid, 'msgtype' => $type, ]); - return [1, '微信消息推送成功']; + return [1, '向微信用户推送消息成功']; } catch (\Exception $exception) { return [0, $exception->getMessage()]; } diff --git a/app/wechat/service/AutoService.php b/app/wechat/service/AutoService.php index e2e9d4770..828a3fab9 100644 --- a/app/wechat/service/AutoService.php +++ b/app/wechat/service/AutoService.php @@ -24,8 +24,8 @@ class AutoService extends Service { foreach ($this->app->db->name('WechatAuto')->where(['status' => 1])->order('time asc')->cursor() as $vo) { $time = $this->parseTimeString($vo['time']); - $name = "延迟向 {$openid} 推送 {$vo['code']} 客服消息"; - QueueService::instance()->register($name, "xadmin:fanauto {$openid} {$vo['code']}", $time); + $name = "延迟向用户 {$openid} 推送 {$vo['code']} 客服消息"; + QueueService::instance()->register($name, "xadmin:fansmsg {$openid} {$vo['code']}", $time); } } diff --git a/app/wechat/view/auto/index.html b/app/wechat/view/auto/index.html index 3c36d75fb..871295dfe 100644 --- a/app/wechat/view/auto/index.html +++ b/app/wechat/view/auto/index.html @@ -11,7 +11,11 @@ {/block} {block name='content'} -
+
+ 特别注意：关注自动回复使用微信客服消息接口发送，因此多图文只能发送每一篇文章，另外还需要开启系统任务功能。 +
+ +
{include file='auto/index_search'} {notempty name='list'} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 84b626499..0c2002977 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -258,7 +258,9 @@ return array( 'app\\data\\service\\payment\\VoucherPaymentService' => $baseDir . '/app/data/service/payment/VoucherPaymentService.php', 'app\\data\\service\\payment\\WechatPaymentService' => $baseDir . '/app/data/service/payment/WechatPaymentService.php', 'app\\index\\controller\\Index' => $baseDir . '/app/index/controller/Index.php', + 'app\\wechat\\command\\Auto' => $baseDir . '/app/wechat/command/Auto.php', 'app\\wechat\\command\\Fans' => $baseDir . '/app/wechat/command/Fans.php', + 'app\\wechat\\controller\\Auto' => $baseDir . '/app/wechat/controller/Auto.php', 'app\\wechat\\controller\\Config' => $baseDir . '/app/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => $baseDir . '/app/wechat/controller/Fans.php', 'app\\wechat\\controller\\Keys' => $baseDir . '/app/wechat/controller/Keys.php', @@ -269,6 +271,7 @@ return array( 'app\\wechat\\controller\\api\\Push' => $baseDir . '/app/wechat/controller/api/Push.php', 'app\\wechat\\controller\\api\\Test' => $baseDir . '/app/wechat/controller/api/Test.php', 'app\\wechat\\controller\\api\\View' => $baseDir . '/app/wechat/controller/api/View.php', + 'app\\wechat\\service\\AutoService' => $baseDir . '/app/wechat/service/AutoService.php', 'app\\wechat\\service\\FansService' => $baseDir . '/app/wechat/service/FansService.php', 'app\\wechat\\service\\MediaService' => $baseDir . '/app/wechat/service/MediaService.php', 'app\\wechat\\service\\WechatService' => $baseDir . '/app/wechat/service/WechatService.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ca8f7de40..07e2e50ba 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -387,7 +387,9 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53 'app\\data\\service\\payment\\VoucherPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/VoucherPaymentService.php', 'app\\data\\service\\payment\\WechatPaymentService' => __DIR__ . '/../..' . '/app/data/service/payment/WechatPaymentService.php', 'app\\index\\controller\\Index' => __DIR__ . '/../..' . '/app/index/controller/Index.php', + 'app\\wechat\\command\\Auto' => __DIR__ . '/../..' . '/app/wechat/command/Auto.php', 'app\\wechat\\command\\Fans' => __DIR__ . '/../..' . '/app/wechat/command/Fans.php', + 'app\\wechat\\controller\\Auto' => __DIR__ . '/../..' . '/app/wechat/controller/Auto.php', 'app\\wechat\\controller\\Config' => __DIR__ . '/../..' . '/app/wechat/controller/Config.php', 'app\\wechat\\controller\\Fans' => __DIR__ . '/../..' . '/app/wechat/controller/Fans.php', 'app\\wechat\\controller\\Keys' => __DIR__ . '/../..' . '/app/wechat/controller/Keys.php', @@ -398,6 +400,7 @@ class ComposerStaticInit6dcb8a18f830adceacf76408fbd14a53 'app\\wechat\\controller\\api\\Push' => __DIR__ . '/../..' . '/app/wechat/controller/api/Push.php', 'app\\wechat\\controller\\api\\Test' => __DIR__ . '/../..' . '/app/wechat/controller/api/Test.php', 'app\\wechat\\controller\\api\\View' => __DIR__ . '/../..' . '/app/wechat/controller/api/View.php', + 'app\\wechat\\service\\AutoService' => __DIR__ . '/../..' . '/app/wechat/service/AutoService.php', 'app\\wechat\\service\\FansService' => __DIR__ . '/../..' . '/app/wechat/service/FansService.php', 'app\\wechat\\service\\MediaService' => __DIR__ . '/../..' . '/app/wechat/service/MediaService.php', 'app\\wechat\\service\\WechatService' => __DIR__ . '/../..' . '/app/wechat/service/WechatService.php', diff --git a/vendor/services.php b/vendor/services.php index 7923d3d7c..0666c124b 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library',