[更新]增加又模式网页授权兼容

application/wechat/controller/api/Tools.php

@@ -53,12 +53,14 @@ class Tools extends BasicAdmin
     /**
      * JSSDK测试
      * @return string
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
      */
     public function jssdk()
     {
-        $wechat = WechatService::wechat();
+        return $this->fetch('', ['options' => WechatService::webJsSDK()]);
-        $options = $wechat->jsSign($this->request->url(true));
-        return $this->fetch('', ['options' => $options]);
     }
 
     /**

extend/service/WechatService.php

@@ -84,6 +84,25 @@ class WechatService
         }
     }
 
+    /**
+     * 获取微信网页JSSDK
+     * @return array
+     * @throws \think\Exception
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @throws \WeChat\Exceptions\LocalCacheException
+     * @throws \think\exception\PDOException
+     */
+    public static function webJsSDK()
+    {
+        switch (strtolower(sysconf('wechat_type'))) {
+            case 'api':
+                return WechatService::script()->getJsSign(request()->url(true));
+            case 'thr':
+            default:
+                return WechatService::wechat()->jsSign(request()->url(true));
+        }
+    }
+
     /**
      * 初始化进入授权
      * @param int $fullMode 授权公众号模式