From 986da27207b6717b209186ed8e70c5bce34352d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Thu, 12 Dec 2019 21:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BE=AE=E4=BF=A1=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/wechat/command/Fans.php | 20 +++++++++++++++- app/wechat/command/fans/FansAll.php | 32 -------------------------- app/wechat/command/fans/FansBlack.php | 32 -------------------------- app/wechat/command/fans/FansList.php | 33 --------------------------- app/wechat/command/fans/FansTags.php | 32 -------------------------- app/wechat/controller/Fans.php | 2 +- app/wechat/sys.php | 7 +----- 7 files changed, 21 insertions(+), 137 deletions(-) delete mode 100644 app/wechat/command/fans/FansAll.php delete mode 100644 app/wechat/command/fans/FansBlack.php delete mode 100644 app/wechat/command/fans/FansList.php delete mode 100644 app/wechat/command/fans/FansTags.php diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index 01a9f4240..9236810fc 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -33,6 +33,11 @@ class Fans extends Command */ protected $module = ['list', 'tags', 'black']; + protected function configure() + { + $this->setName('xadmin:fansall')->setDescription('[获取]同步远程的微信用户'); + } + /** * 执行指令 * @param Input $input @@ -41,8 +46,11 @@ class Fans extends Command */ protected function execute(Input $input, Output $output) { + $message = ''; foreach ($this->module as $m) { - if (method_exists($this, $fun = "_{$m}")) $this->$fun(); + if (method_exists($this, $fun = "_{$m}")) { + $message .= $this->$fun(); + } } } @@ -50,6 +58,7 @@ class Fans extends Command * 同步微信粉丝列表 * @param string $next * @param integer $done + * @return string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\Exception @@ -75,12 +84,14 @@ class Fans extends Command } $this->output->comment('微信粉丝数据同步完成！'); $this->output->newLine(); + return ''; } /** * 同步粉丝黑名单列表 * @param string $next * @param integer $done + * @return string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\db\exception\DbException @@ -99,11 +110,17 @@ class Fans extends Command } $this->output->comment('微信黑名单数据同步完成！'); $this->output->newLine(); + if (empty($result['total'])) { + return '同步微信用户0人'; + } else { + return "同步微信用户{$result['total']}人"; + } } /** * 同步粉丝标签列表 * @param integer $index + * @return string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\Exception @@ -128,6 +145,7 @@ class Fans extends Command } $this->output->comment('微信粉丝标签数据同步完成！'); $this->output->newLine(); + return ''; } } \ No newline at end of file diff --git a/app/wechat/command/fans/FansAll.php b/app/wechat/command/fans/FansAll.php deleted file mode 100644 index 608f1928e..000000000 --- a/app/wechat/command/fans/FansAll.php +++ /dev/null @@ -1,32 +0,0 @@ -module = ['list', 'black', 'tags']; - $this->setName('xsync:fansall')->setDescription('[同步]所有微信粉丝的数据'); - } -} diff --git a/app/wechat/command/fans/FansBlack.php b/app/wechat/command/fans/FansBlack.php deleted file mode 100644 index 54608c921..000000000 --- a/app/wechat/command/fans/FansBlack.php +++ /dev/null @@ -1,32 +0,0 @@ -module = ['black']; - $this->setName('xsync:fansblack')->setDescription('[同步]微信黑名单粉丝数据'); - } -} diff --git a/app/wechat/command/fans/FansList.php b/app/wechat/command/fans/FansList.php deleted file mode 100644 index 0290f5f31..000000000 --- a/app/wechat/command/fans/FansList.php +++ /dev/null @@ -1,33 +0,0 @@ -module = ['list']; - $this->setName('xsync:fanslist')->setDescription('[同步]微信粉丝的全部列表'); - } - -} diff --git a/app/wechat/command/fans/FansTags.php b/app/wechat/command/fans/FansTags.php deleted file mode 100644 index e01a562ac..000000000 --- a/app/wechat/command/fans/FansTags.php +++ /dev/null @@ -1,32 +0,0 @@ -module = ['tags']; - $this->setName('xsync:fanstags')->setDescription('[同步]粉丝的标签记录数据'); - } -} diff --git a/app/wechat/controller/Fans.php b/app/wechat/controller/Fans.php index d16b87cf9..db190f465 100644 --- a/app/wechat/controller/Fans.php +++ b/app/wechat/controller/Fans.php @@ -71,7 +71,7 @@ class Fans extends Controller public function sync() { try { - sysqueue('同步用户数据', "xsync:fansall", 1, [], 0); + sysqueue('同步用户数据', "xadmin:fansall", 1, [], 0); $this->success('创建任务成功，请等待完成！'); } catch (HttpResponseException $exception) { throw $exception; diff --git a/app/wechat/sys.php b/app/wechat/sys.php index e5d3993d1..34759a9fb 100644 --- a/app/wechat/sys.php +++ b/app/wechat/sys.php @@ -3,10 +3,5 @@ use think\Console; Console::starting(function (Console $console) { - $console->addCommands([ - 'app\wechat\command\fans\fansAll', - 'app\wechat\command\fans\fansBlack', - 'app\wechat\command\fans\fansList', - 'app\wechat\command\fans\fansTags', - ]); + $console->addCommand('app\wechat\command\Fans'); }); \ No newline at end of file