From b46aa9809b3eb3ad4b233f96899952972276b9aa Mon Sep 17 00:00:00 2001 From: Anyon Date: Tue, 27 Aug 2019 11:45:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=B2=89?= =?UTF-8?q?=E4=B8=9D=E5=90=8C=E6=AD=A5=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/wechat/command/Fans.php | 38 +++++++++++------------- application/wechat/queue/WechatQueue.php | 33 ++++++++++---------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/application/wechat/command/Fans.php b/application/wechat/command/Fans.php index 55733a207..ef54d63c8 100644 --- a/application/wechat/command/Fans.php +++ b/application/wechat/command/Fans.php @@ -1,15 +1,16 @@ output->comment('preparing synchronize fans list ...'); - while (true) if (is_array($result = $wechat->getUserList($next)) && !empty($result['data']['openid'])) { + while ($next !== null && is_array($result = $wechat->getUserList($next)) && !empty($result['data']['openid'])) { foreach (array_chunk($result['data']['openid'], 100) as $chunk) { if (is_array($list = $wechat->getBatchUserInfo($chunk)) && !empty($list['user_info_list'])) { foreach ($list['user_info_list'] as $user) { - $indexString = str_pad(++$index, strlen($result['total']), '0', STR_PAD_LEFT); + $indexString = str_pad(++$done, strlen($result['total']), '0', STR_PAD_LEFT); $this->output->writeln("({$indexString}/{$result['total']}) updating wechat user {$user['openid']} {$user['nickname']}"); \app\wechat\service\FansService::set($user, $appid); } } } - if (in_array($result['next_openid'], $result['data']['openid'])) break; - else $next = $result['next_openid']; + $next = $result['total'] > $done ? $result['next_openid'] : null; } $this->output->comment('synchronized fans list successful.'); } @@ -83,27 +83,25 @@ class Fans extends Command /** * 同步粉丝黑名单列表 * @param string $next - * @param integer $index + * @param integer $done * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException * @throws \think\Exception * @throws \think\exception\PDOException */ - public function _black($next = '', $index = 0) + public function _black($next = '', $done = 0) { $wechat = WechatService::WeChatUser(); $this->output->comment('prepare synchronize fans black ...'); - while (true) if (is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) { + while ($next !== null && is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) { foreach (array_chunk($result['data']['openid'], 100) as $chunk) { foreach ($chunk as $openid) { - $indexString = str_pad(++$index, strlen($result['total']), '0', STR_PAD_LEFT); + $indexString = str_pad(++$done, strlen($result['total']), '0', STR_PAD_LEFT); $this->output->writeln("({$indexString}/{$result['total']}) updating wechat black {$openid}"); } - $where = [['is_black', 'eq', '0'], ['openid', 'in', $chunk]]; - Db::name('WechatFans')->where($where)->update(['is_black' => '1']); + Db::name('WechatFans')->where(['is_black' => '0'])->whereIn('openid', $chunk)->update(['is_black' => '1']); } - if (in_array($result['next_openid'], $result['data']['openid'])) break; - else $next = $result['next_openid']; + $next = $result['total'] > $done ? $result['next_openid'] : null; } $this->output->comment('synchronized fans black successful.'); } @@ -134,4 +132,4 @@ class Fans extends Command $this->output->comment('synchronized fans tags successful.'); } -} \ No newline at end of file +} diff --git a/application/wechat/queue/WechatQueue.php b/application/wechat/queue/WechatQueue.php index e82635ae9..912b76a1d 100644 --- a/application/wechat/queue/WechatQueue.php +++ b/application/wechat/queue/WechatQueue.php @@ -39,24 +39,27 @@ class WechatQueue extends JobsQueue try { $appid = WechatService::getAppid(); $wechat = WechatService::WeChatUser(); - $next = ''; // 获取远程粉丝 + // 获取远程粉丝 + list($next, $done) = ['', 0]; $this->output->writeln('Start synchronizing fans from the Wechat server'); - while (is_array($result = $wechat->getUserList($next)) && !empty($result['data']['openid'])) { - foreach (array_chunk($result['data']['openid'], 100) as $chunk) - if (is_array($list = $wechat->getBatchUserInfo($chunk)) && !empty($list['user_info_list'])) - foreach ($list['user_info_list'] as $user) FansService::set($user, $appid); - if (in_array($result['next_openid'], $result['data']['openid'])) break; - $next = $result['next_openid']; - } - $next = ''; // 同步粉丝黑名单 - $this->output->writeln('Start synchronizing black from the Wechat server'); - while (is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) { + while ($next !== null && is_array($result = $wechat->getUserList($next)) && !empty($result['data']['openid'])) { + $done += $result['count']; foreach (array_chunk($result['data']['openid'], 100) as $chunk) { - $where = [['is_black', 'eq', '0'], ['openid', 'in', $chunk]]; - Db::name('WechatFans')->where($where)->update(['is_black' => '1']); + if (is_array($list = $wechat->getBatchUserInfo($chunk)) && !empty($list['user_info_list'])) { + foreach ($list['user_info_list'] as $user) FansService::set($user, $appid); + } } - if (in_array($result['next_openid'], $result['data']['openid'])) break; - $next = $result['next_openid']; + $next = $result['total'] > $done ? $result['next_openid'] : null; + } + // 同步粉丝黑名单 + list($next, $done) = ['', 0]; + $this->output->writeln('Start synchronizing black from the Wechat server'); + while ($next !== null && is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) { + $done += $result['count']; + foreach (array_chunk($result['data']['openid'], 100) as $chunk) { + Db::name('WechatFans')->where(['is_black' => '0'])->whereIn('openid', $chunk)->update(['is_black' => '1']); + } + $next = $result['total'] > $done ? $result['next_openid'] : null; } // 同步粉丝标签列表 $this->output->writeln('Start synchronizing tags from the Wechat server');