diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php index 48e3c8937..ad5f4e87a 100644 --- a/app/wechat/command/Fans.php +++ b/app/wechat/command/Fans.php @@ -74,23 +74,32 @@ class Fans extends Command protected function _list($next = '', $done = 0) { $appid = WechatService::instance()->getAppid(); - $this->output->comment('--> Start to synchronize wechat user data'); - while (!is_null($next) && is_array($result = WechatService::WeChatUser()->getUserList($next)) && !empty($result['data']['openid'])) { - foreach (array_chunk($result['data']['openid'], 100) as $openids) { - if (is_array($list = WechatService::WeChatUser()->getBatchUserInfo($openids)) && !empty($list['user_info_list'])) { - foreach ($list['user_info_list'] as $user) { - $string = str_pad(++$done, strlen($result['total']), '0', STR_PAD_LEFT); - $message = "({$string}/{$result['total']}) -> {$user['openid']} {$user['nickname']}"; - $this->setQueueProgress($message, $done * 100 / $result['total']); - FansService::instance()->set($user, $appid); + $this->output->comment('开始获取微信用户数据'); + while (is_string($next)) { + $result = WechatService::WeChatUser()->getUserList($next); + if (is_array($result) && !empty($result['data']['openid'])) { + $total = intval($result['total']); + foreach (array_chunk($result['data']['openid'], 100) as $openids) { + $list = WechatService::WeChatUser()->getBatchUserInfo($openids); + if (is_array($list) && !empty($list['user_info_list'])) { + foreach ($list['user_info_list'] as $user) { + $this->queue->message($total, ++$done, "-> {$user['openid']} {$user['nickname']}"); + FansService::instance()->set($user, $appid); + } } } + $next = $total > $done ? $result['next_openid'] : null; + } else { + $next = null; } - $next = $result['total'] > $done ? $result['next_openid'] : null; } - $this->output->comment('--> Wechat user data synchronization completed'); + if ($done > 0) { + $this->output->comment('微信用户数据获取完成'); + } else { + $this->output->comment('未获取到微信用户数据'); + } $this->output->newLine(); - return "同步{$done}个用户数据"; + return "共获取{$done}个用户数据"; } /** @@ -105,16 +114,20 @@ class Fans extends Command public function _black($next = '', $done = 0) { $wechat = WechatService::WeChatUser(); - $this->output->comment('--> Start to synchronize wechat blacklist data'); + $this->output->comment('开始更新黑名单的微信用户'); while (!is_null($next) && is_array($result = $wechat->getBlackList($next)) && !empty($result['data']['openid'])) { $done += $result['count']; foreach (array_chunk($result['data']['openid'], 100) as $chunk) { $this->app->db->name('WechatFans')->where(['is_black' => '0'])->whereIn('openid', $chunk)->update(['is_black' => '1']); } - $this->setQueueProgress("共计同步微信黑名单{$result['total']}人"); + $this->setQueueProgress("--> 共计同步微信黑名单{$result['total']}人"); $next = $result['total'] > $done ? $result['next_openid'] : null; } - $this->output->comment('--> Wechat blacklist data synchronization completed'); + if ($done > 0) { + $this->output->comment('黑名单的微信用户更新成功'); + } else { + $this->output->comment('未获取到黑名单微信用户哦'); + } $this->output->newLine(); if (empty($result['total'])) { return '，其中黑名单0人'; @@ -125,7 +138,7 @@ class Fans extends Command /** * 同步粉丝标签列表 - * @param integer $index + * @param integer $done * @return string * @throws \WeChat\Exceptions\InvalidResponseException * @throws \WeChat\Exceptions\LocalCacheException @@ -134,23 +147,26 @@ class Fans extends Command * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function _tags($index = 0) + public function _tags($done = 0) { $appid = WechatService::instance()->getAppid(); - $this->output->comment('--> Start to synchronize wechat tag data'); + $this->output->comment('开始获取微信用户标签数据'); if (is_array($list = WechatService::WeChatTags()->getTags()) && !empty($list['tags'])) { $count = count($list['tags']); foreach ($list['tags'] as &$tag) { $tag['appid'] = $appid; - $progress = str_pad(++$index, strlen($count), '0', STR_PAD_LEFT); - $this->setQueueProgress("({$progress}/{$count}) -> {$tag['name']}"); + $this->queue->message($count, ++$done, "-> {$tag['name']}"); } $this->app->db->name('WechatFansTags')->where(['appid' => $appid])->delete(); $this->app->db->name('WechatFansTags')->insertAll($list['tags']); } - $this->output->comment('--> Wechat tag data synchronization completed'); + if ($done > 0) { + $this->output->comment('微信用户标签数据获取完成'); + } else { + $this->output->comment('未获取到微信用户标签数据'); + } $this->output->newLine(); - return "，同步{$index}个标签。"; + return "，获取到{$done}个标签。"; } } \ No newline at end of file diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 79a593b10..63e2c0e10 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -963,12 +963,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "3eb8593446d09583fd3bb431b48b861a2676409a" + "reference": "08ab65c4044435fda2db2484bd3a92ead39ffaa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3eb8593446d09583fd3bb431b48b861a2676409a", - "reference": "3eb8593446d09583fd3bb431b48b861a2676409a", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/08ab65c4044435fda2db2484bd3a92ead39ffaa4", + "reference": "08ab65c4044435fda2db2484bd3a92ead39ffaa4", "shasum": "", "mirrors": [ { @@ -985,7 +985,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2020-09-24T08:42:51+00:00", + "time": "2020-09-24T08:51:05+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index d580b7176..fa58cdbf6 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/command/Queue.php b/vendor/zoujingli/think-library/src/command/Queue.php index 70b44c15c..247247502 100644 --- a/vendor/zoujingli/think-library/src/command/Queue.php +++ b/vendor/zoujingli/think-library/src/command/Queue.php @@ -306,8 +306,8 @@ class Queue extends Command /** * 修改当前任务状态 - * @param int $status 任务状态 - * @param mixed $message 消息内容 + * @param integer $status 任务状态 + * @param string $message 消息内容 * @param boolean $isSplit 是否分隔 * @throws \think\db\exception\DbException */