From bf528436e2cdc38dae6bb16ec4ac9e70dc989022 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 17 Jul 2019 11:34:42 +0800
Subject: [PATCH] Update WechatService.php

---
 application/wechat/service/WechatService.php | 36 +++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/application/wechat/service/WechatService.php b/application/wechat/service/WechatService.php
index e96b64bc1..52bbb3e44 100644
--- a/application/wechat/service/WechatService.php
+++ b/application/wechat/service/WechatService.php
@@ -128,22 +128,26 @@ class WechatService extends \We
     public static function instance($name, $type = 'WeChat', $config = [])
     {
         if (!in_array($type, ['WeChat', 'WeMini', 'WePay', 'AliPay'])) $type = self::$type;
-        if (self::getType() === 'api' || in_array($type, ['WePay', 'AliPay'])) {
-            $class = "\\{$type}\\" . ucfirst(strtolower($name));
-            if (class_exists($class)) return new $class(empty($config) ? self::config() : $config);
-            throw new \think\Exception("Class '{$class}' not found");
+        if (self::getType() === 'api' || in_array($type, ['WePay', 'AliPay']) || "{$type}{$name}" === 'WeChatPay') {
+            if (class_exists($class = "\\{$type}\\" . ucfirst(strtolower($name)))) {
+                return new $class(empty($config) ? self::config() : $config);
+            } else {
+                throw new \think\Exception("Class '{$class}' not found");
+            }
+        } else {
+            set_time_limit(3600);
+            list($appid, $appkey) = [sysconf('wechat_thr_appid'), sysconf('wechat_thr_appkey')];
+            $token = strtolower("{$name}-{$appid}-{$appkey}-{$type}");
+            if (class_exists('Yar_Client')) {
+                return new \Yar_Client(config('wechat.service_url') . "/service/api.client/yar/{$token}");
+            }
+            if (class_exists('SoapClient')) {
+                $location = config('wechat.service_url') . "/service/api.client/soap/{$token}";
+                return new \SoapClient(null, ['uri' => strtolower($name), 'location' => $location]);
+            } else {
+                throw new \think\Exception("Yar or soap extensions are not installed.");
+            }
         }
-        set_time_limit(3600);
-        list($appid, $appkey) = [sysconf('wechat_thr_appid'), sysconf('wechat_thr_appkey')];
-        $token = strtolower("{$name}-{$appid}-{$appkey}-{$type}");
-        if (class_exists('Yar_Client')) {
-            return new \Yar_Client(config('wechat.service_url') . "/service/api.client/yar/{$token}");
-        }
-        if (class_exists('SoapClient')) {
-            $location = config('wechat.service_url') . "/service/api.client/soap/{$token}";
-            return new \SoapClient(null, ['uri' => strtolower($name), 'location' => $location]);
-        }
-        throw new \think\Exception("Yar or soap extensions are not installed.");
     }
 
     /**
@@ -245,4 +249,4 @@ class WechatService extends \We
         throw new \think\Exception('请在后台配置微信对接授权模式');
     }
 
-}
\ No newline at end of file
+}