up fix

Author: kiss291323003

src/OfficialAccount/JsApi.php

@@ -20,15 +20,15 @@ class JsApi extends OfficialAccountBase
     function auth()
     {
         if (!isset($this->auth)) {
-            $this->auth = new Auth($this);
+            $this->auth = new Auth($this->getOfficialAccount());
         }
         return $this->auth;
     }
 
     function sdk()
     {
         if (!isset($this->sdk)) {
-            $this->sdk = new JsSdk($this);
+            $this->sdk = new JsSdk($this->getOfficialAccount());
         }
         return $this->sdk;
     }

src/OfficialAccount/JsSdk/Auth.php

@@ -25,7 +25,7 @@ class Auth extends JsApiBase
      */
     function generateURL(JsAuthRequest $request)
     {
-        $officialAccountConfig = $this->getJsApi()->getOfficialAccount()->getConfig();
+        $officialAccountConfig = $this->getOfficialAccount()->getConfig();
         $appid = $officialAccountConfig->getAppId();
         $scope = $request->getType();
         $state = $request->getState();
@@ -47,7 +47,7 @@ function generateURL(JsAuthRequest $request)
      */
     function codeToToken($authCode): ?SnsAuthBean
     {
-        $officialAccountConfig = $this->getJsApi()->getOfficialAccount()->getConfig();
+        $officialAccountConfig = $this->getOfficialAccount()->getConfig();
         $appid = $officialAccountConfig->getAppId();
         $secret = $officialAccountConfig->getAppSecret();
         $response = NetWork::getForJson(ApiUrl::generateURL(ApiUrl::JSAPI_CODE_TO_TOKEN, [
@@ -106,7 +106,7 @@ function codeToUser($authCode): ?User
      */
     function refreshToken($refreshToken)
     {
-        $officialAccountConfig = $this->getJsApi()->getOfficialAccount()->getConfig();
+        $officialAccountConfig = $this->getOfficialAccount()->getConfig();
         $appid = $officialAccountConfig->getAppId();
         $response = NetWork::getForJson(ApiUrl::generateURL(ApiUrl::JSAPI_REFRESH_TOKEN, [
             'APPID' => $appid,

src/OfficialAccount/JsSdk/JsApiBase.php

@@ -9,22 +9,22 @@
 namespace EasySwoole\WeChat\OfficialAccount\JsSdk;
 
 
-use EasySwoole\WeChat\OfficialAccount\JsApi;
+use EasySwoole\WeChat\OfficialAccount\OfficialAccount;
 
 class JsApiBase
 {
-    private $jsApi;
+    private $officialAccount;
 
-    function __construct(JsApi $jsApi)
+    function __construct(OfficialAccount $account)
     {
-        $this->jsApi = $jsApi;
+        $this->officialAccount = $account;
     }
 
     /**
-     * @return JsApi
+     * @return OfficialAccount
      */
-    protected function getJsApi(): JsApi
+    protected function getOfficialAccount(): OfficialAccount
     {
-        return $this->jsApi;
+        return $this->officialAccount;
     }
 }

src/OfficialAccount/JsSdk/JsSdk.php

@@ -19,7 +19,7 @@ class JsSdk extends JsApiBase
     function jsTicket():JsTicketInterface
     {
         if(!isset($this->ticket)){
-            $this->ticket = new JsTicket($this->getJsApi());
+            $this->ticket = new JsTicket($this->getOfficialAccount());
         }
         return $this->ticket;
     }
@@ -32,7 +32,7 @@ function jsTicket():JsTicketInterface
      */
     function signature(string $url)
     {
-        $officialAccountConfig = $this->getJsApi()->getOfficialAccount()->getConfig();
+        $officialAccountConfig = $this->getOfficialAccount()->getConfig();
         // 组装签名参数包
         $pack = [
             'noncestr' => $this->generateNonce(16),