From e4dd0efbe959afc93b0129a7aaf4e78d741ca337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Sat, 14 Dec 2019 22:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wechat/controller/Config.php     | 6 +++---
 app/wechat/service/WechatService.php | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/wechat/controller/Config.php b/app/wechat/controller/Config.php
index 64a267511..b2b823fdf 100644
--- a/app/wechat/controller/Config.php
+++ b/app/wechat/controller/Config.php
@@ -46,9 +46,9 @@ class Config extends Controller
                     sysconf('wechat.type', 'thr');
                     sysconf('wechat.thr_appid', input('appid'));
                     sysconf('wechat.thr_appkey', input('appkey'));
-                    WechatService::ThinkAdminConfig()->setApiNotifyUri($this->thrNotify);
+                    WechatService::ThinkServiceConfig()->setApiNotifyUri($this->thrNotify);
                 }
-                $this->wechat = WechatService::ThinkAdminConfig()->getConfig();
+                $this->wechat = WechatService::ThinkServiceConfig()->getConfig();
             } catch (\Exception $e) {
                 $this->message = $e->getMessage();
                 $this->wechat = [];
@@ -64,7 +64,7 @@ class Config extends Controller
             foreach ($this->request->post() as $k => $v) sysconf($k, $v);
             if ($this->request->post('wechat.type') === 'thr') {
                 try {
-                    WechatService::ThinkAdminConfig()->setApiNotifyUri($this->thrNotify);
+                    WechatService::ThinkServiceConfig()->setApiNotifyUri($this->thrNotify);
                 } catch (\Exception $exception) {
                     $this->error($exception->getMessage());
                 }
diff --git a/app/wechat/service/WechatService.php b/app/wechat/service/WechatService.php
index 80849fb36..e885e3566 100644
--- a/app/wechat/service/WechatService.php
+++ b/app/wechat/service/WechatService.php
@@ -76,7 +76,7 @@ use think\exception\HttpResponseException;
  * @method \WeOpen\Service WeOpenService() static 第三方服务
  *
  * ----- ThinkService -----
- * @method mixed ThinkAdminConfig() static 平台服务配置
+ * @method mixed ThinkServiceConfig() static 平台服务配置
  */
 class WechatService extends Service
 {
@@ -131,7 +131,7 @@ class WechatService extends Service
      */
     private static function paraseName($name)
     {
-        foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkAdmin'] as $type) {
+        foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkService'] as $type) {
             if (strpos($name, $type) === 0) {
                 list(, $class) = explode($type, $name);
                 return [$type, $class, "\\{$type}\\{$class}"];
@@ -235,7 +235,7 @@ class WechatService extends Service
             }
             throw new HttpResponseException(redirect(enbase64url(input('rcode')), 301));
         } else {
-            $result = self::ThinkAdminConfig()->oauth($this->app->session->getId(), $source, $isfull);
+            $result = self::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
             $this->app->session->set("{$appid}_openid", $openid = $result['openid']);
             $this->app->session->set("{$appid}_fansinfo", $fansinfo = $result['fans']);
             if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($fansinfo))) {
@@ -266,7 +266,7 @@ class WechatService extends Service
         if ($this->getType() === 'api') {
             return self::WeChatScript()->getJsSign($url);
         } else {
-            return self::ThinkAdminConfig()->jsSign($url);
+            return self::ThinkServiceConfig()->jsSign($url);
         }
     }
 }
\ No newline at end of file