From 0c340143ca0d8a3914b0ff2dc8e769ac6e6d8241 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 12 Dec 2020 14:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/command/Fans.php          |  6 +++---
 app/wechat/controller/api/Js.php     |  2 +-
 app/wechat/service/MediaService.php  |  6 +++---
 app/wechat/service/WechatService.php | 12 +++++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/wechat/command/Fans.php b/app/wechat/command/Fans.php
index 9f9d58ada..2083fff95 100644
--- a/app/wechat/command/Fans.php
+++ b/app/wechat/command/Fans.php
@@ -72,7 +72,7 @@ class Fans extends Command
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    protected function _list(string $next = '', int $done = 0)
+    protected function _list(string $next = '', int $done = 0): string
     {
         $appid = WechatService::instance()->getAppid();
         $this->output->comment('开始获取微信用户数据');
@@ -112,7 +112,7 @@ class Fans extends Command
      * @throws \WeChat\Exceptions\LocalCacheException
      * @throws \think\db\exception\DbException
      */
-    public function _black(string $next = '', int $done = 0)
+    public function _black(string $next = '', int $done = 0): string
     {
         $wechat = WechatService::WeChatUser();
         $this->output->comment('开始更新黑名单的微信用户');
@@ -148,7 +148,7 @@ class Fans extends Command
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function _tags(int $done = 0)
+    public function _tags(int $done = 0): string
     {
         $appid = WechatService::instance()->getAppid();
         $this->output->comment('开始获取微信用户标签数据');
diff --git a/app/wechat/controller/api/Js.php b/app/wechat/controller/api/Js.php
index 4d3a8c12e..739f6deb6 100644
--- a/app/wechat/controller/api/Js.php
+++ b/app/wechat/controller/api/Js.php
@@ -79,7 +79,7 @@ class Js extends Controller
      * 生成授权内容
      * @return string
      */
-    private function _buildContent()
+    private function _buildContent(): string
     {
         return <<<EOF
 if(typeof wx === 'object'){
diff --git a/app/wechat/service/MediaService.php b/app/wechat/service/MediaService.php
index ff6b8ccac..52f247be4 100644
--- a/app/wechat/service/MediaService.php
+++ b/app/wechat/service/MediaService.php
@@ -29,16 +29,16 @@ class MediaService extends Service
     /**
      * 通过图文ID读取图文信息
      * @param mixed $id 本地图文ID
-     * @param array $where 额外的查询条件
+     * @param array $map 额外的查询条件
      * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function news($id, $where = []): array
+    public function news($id, $map = []): array
     {
         // 文章主体数据
-        $data = $this->app->db->name('WechatNews')->where(['id' => $id])->where($where)->find();
+        $data = $this->app->db->name('WechatNews')->where(['id' => $id])->where($map)->find();
         if (empty($data)) return [];
         [$data['articles'], $articleIds] = [[], explode(',', $data['article_id'])];
         if (empty($data['article_id']) || empty($articleIds)) return $data;
diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php
index d639cadcc..78c964932 100644
--- a/app/wechat/service/WechatService.php
+++ b/app/wechat/service/WechatService.php
@@ -122,7 +122,9 @@ class WechatService extends Service
             } catch (\Exception  $exception) {
                 $exception = null;
             }
-            if ($exception instanceof \Exception) throw $exception;
+            if ($exception instanceof \Exception) {
+                throw $exception;
+            }
             return $client;
         }
     }
@@ -145,13 +147,13 @@ class WechatService extends Service
 
     /**
      * 获取当前微信APPID
-     * @return bool|string
+     * @return string
      * @throws \think\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getAppid()
+    public function getAppid(): string
     {
         if ($this->getType() === 'api') {
             return sysconf('wechat.appid');
@@ -187,8 +189,8 @@ class WechatService extends Service
     public function getConfig(): array
     {
         $options = [
-            'token'          => sysconf('wechat.token'),
             'appid'          => $this->getAppid(),
+            'token'          => sysconf('wechat.token'),
             'appsecret'      => sysconf('wechat.appsecret'),
             'encodingaeskey' => sysconf('wechat.encodingaeskey'),
             'mch_id'         => sysconf('wechat.mch_id'),
@@ -268,7 +270,7 @@ class WechatService extends Service
     }
 
     /**
-     * 获取微信网页JSSDK
+     * 获取微信网页JSSDK签名参数
      * @param null|string $location 签名地址
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException