majiameng / OAuth2

example/wx_proxy.php

Braces +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
             if($_GET['scope'] == 'snsapi_login'){
                 //扫码登录
                 $AuthorizeURL = $this->AuthorizeURL . '/connect/qrconnect';
-            }else{
+            } else{
                 $AuthorizeURL = $this->AuthorizeURL . '/connect/oauth2/authorize';
             }
 

Spacing +10 added lines, -10 removed lines

@@ -12,12 +12,12 @@ 
     /**
      * @Author: TinyMeng <666@majiameng.com>
      */
-    public function run(){
+    public function run() {
         if (isset($_GET['code'])) {
             $state = isset($_GET['state']) ? $_GET['state'] : "";
-            header('Location: ' . $_COOKIE['redirect_uri'] . '?code=' . $_GET['code'] . '&state=' . $state);
+            header('Location: '.$_COOKIE['redirect_uri'].'?code='.$_GET['code'].'&state='.$state);
         } else {
-            if(!isset($_GET['appid']) || !isset($_GET['response_type']) || !isset($_GET['scope'])){
+            if (!isset($_GET['appid']) || !isset($_GET['response_type']) || !isset($_GET['scope'])) {
                 echo "参数缺失";
                 return;
             }
@@ -26,20 +26,20 @@ 
             $protocol = $this->is_HTTPS() ? 'https://' : 'http://';
             $params   = array(
                 'appid'         => $_GET['appid'],
-                'redirect_uri'  => $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['DOCUMENT_URI'],
+                'redirect_uri'  => $protocol.$_SERVER['HTTP_HOST'].$_SERVER['DOCUMENT_URI'],
                 'response_type' => $_GET['response_type'],
                 'scope'         => $_GET['scope'],
                 'state'         => $state,
             );
-            if($_GET['scope'] == 'snsapi_login'){
+            if ($_GET['scope'] == 'snsapi_login') {
                 //扫码登录
-                $AuthorizeURL = $this->AuthorizeURL . '/connect/qrconnect';
-            }else{
-                $AuthorizeURL = $this->AuthorizeURL . '/connect/oauth2/authorize';
+                $AuthorizeURL = $this->AuthorizeURL.'/connect/qrconnect';
+            } else {
+                $AuthorizeURL = $this->AuthorizeURL.'/connect/oauth2/authorize';
             }
 
             setcookie('redirect_uri', urldecode($_GET['redirect_uri']), $_SERVER['REQUEST_TIME'] + 60, '/');
-            header('Location: ' . $AuthorizeURL . '?' . http_build_query($params) . '#wechat_redirect');
+            header('Location: '.$AuthorizeURL.'?'.http_build_query($params).'#wechat_redirect');
         }
     }
 
@@ -48,7 +48,7 @@ 
      * @Author: TinyMeng <666@majiameng.com>
      * @return bool
      */
-    protected function is_HTTPS(){
+    protected function is_HTTPS() {
         if (!isset($_SERVER['HTTPS'])) {
             return false;
         }

src/Gateways/Github.php

Spacing +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
             'scope'        => $this->config['scope'],
             'state'        => $this->config['state'],
             'display'      => $this->display,
-            'allow_signup' => true,//是否会在OAuth流程中为未经身份验证的用户提供注册GitHub的选项。默认是true。false在策略禁止注册的情况下使用。
+            'allow_signup' => true, //是否会在OAuth流程中为未经身份验证的用户提供注册GitHub的选项。默认是true。false在策略禁止注册的情况下使用。
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -98,11 +98,11 @@ 
     {
         $this->getToken();
 
-        $url = self::API_BASE . "user";
+        $url = self::API_BASE."user";
         $headers = [
             'User-Agent: '.$this->config['application_name'],
             'UserModel-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36 ',
-            'Authorization: token ' . $this->token['access_token'],
+            'Authorization: token '.$this->token['access_token'],
             'Accept: application/json'
         ];
         $response = $this->get($url, [], $headers);

src/Gateways/Facebook.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'] ?: Str::random(),
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -77,12 +77,12 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("Facebook APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $fields = isset($this->config['fields']) ? $this->config['fields'] : 'id,name,gender,picture.width(400)';
@@ -102,7 +102,7 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
         $data = $this->$method($request['uri'], $params);

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
                 throw new \Exception("Facebook APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $fields = isset($this->config['fields']) ? $this->config['fields'] : 'id,name,gender,picture.width(400)';

src/Gateways/Qq.php

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                 throw new \Exception("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else{
             /** 获取token */
             $this->getToken();
         }

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
             'scope'         => $this->config['scope'],
             'display'       => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -63,7 +63,7 @@ 
             'nickname'=> $result['nickname'],
             'gender'  => isset($result['gender']) ? $this->getGender($result['gender']) : ConstCode::GENDER,
             'avatar'  => $result['figureurl_qq_2'] ? $result['figureurl_qq_2'] : $result['figureurl_qq_1'],
-            'birthday'=> date('Y-m-d',strtotime($result['year'])),
+            'birthday'=> date('Y-m-d', strtotime($result['year'])),
         ];
         return $userInfo;
     }
@@ -84,7 +84,7 @@ 
             'access_token'=>$this->token['access_token'],
             'format'=>'json',
         ];
-        $data = $this->get(self::API_BASE . 'user/get_user_info', $params);
+        $data = $this->get(self::API_BASE.'user/get_user_info', $params);
         return json_decode($data, true);
     }
 
@@ -97,12 +97,12 @@ 
      */
     public function openid()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token'])){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("腾讯QQ,APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else{
+        } else {
             /** 获取token */
             $this->getToken();
         }
@@ -128,7 +128,7 @@ 
         if (isset($data['access_token'])) {
             return $data;
         } else {
-            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：" . $token);
+            throw new \Exception("获取腾讯QQ ACCESS_TOKEN 出错：".$token);
         }
     }
 
@@ -139,7 +139,7 @@ 
      * @return mixed|string
      * @throws \Exception
      */
-    private function getOpenID(){
+    private function getOpenID() {
         $query = [
             'access_token' => $this->token['access_token']
         ];
@@ -148,12 +148,12 @@ 
             $query['unionid'] = 1;
         }
 
-        $data = $this->get(self::API_BASE . 'oauth2.0/me',$query);
-        $data     = json_decode(trim(substr($data, 9), " );\n"), true);
+        $data = $this->get(self::API_BASE.'oauth2.0/me', $query);
+        $data = json_decode(trim(substr($data, 9), " );\n"), true);
         if (isset($data['openid'])) {
             return $data;
         } else {
-            throw new \Exception("获取用户openid出错：" . $data['error_description']);
+            throw new \Exception("获取用户openid出错：".$data['error_description']);
         }
     }
 
@@ -162,7 +162,7 @@ 
      * M代表男性,F代表女性
      * @param $gender
      */
-    public function getGender($gender){
+    public function getGender($gender) {
         return $gender == '男' ? ConstCode::GENDER_MAN : ConstCode::GENDER_WOMEN;
     }
 

src/Gateways/Douyin.php

Braces +10 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
              * https://developer.open-douyin.com/docs/resource/zh-CN/dop/develop/openapi/account-permission/douyin-default-get-permission-code
              */
             return $this->AuthorizeSilenceURL . '?' . http_build_query($params);
-        }else{
+        } else{
             return $this->AuthorizeURL . '?' . http_build_query($params);
         }
     }
@@ -127,10 +127,10 @@ 
                 throw new \Exception("Douyin APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        } elseif ($this->type == 'applets'){
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -207,8 +207,12 @@ 
             'appid'      => $this->config['app_id'],
             'secret'     => $this->config['app_secret'],
         ];
-        if(isset($_REQUEST['code'])) $params['code'] = $_REQUEST['code'];
-        if(isset($_REQUEST['anonymous_code'])) $params['anonymous_code'] = $_REQUEST['anonymous_code'];
+        if(isset($_REQUEST['code'])) {
+            $params['code'] = $_REQUEST['code'];
+        }
+        if(isset($_REQUEST['anonymous_code'])) {
+            $params['anonymous_code'] = $_REQUEST['anonymous_code'];
+        }
 
         return $params;
     }
@@ -226,7 +230,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['data']['access_token'])) {
             return $data['data'];
-        }elseif (isset($data['session_key'])){
+        } elseif (isset($data['session_key'])){
             //小程序登录
             return $data;
         } else {

Spacing +27 added lines, -27 removed lines

@@ -21,21 +21,21 @@ 
  */
 class Douyin extends Gateway
 {
-    protected $ApiBase            = 'https://open.douyin.com';
+    protected $ApiBase = 'https://open.douyin.com';
     protected $AuthorizeURL   = 'https://open.douyin.com/platform/oauth/connect/';
-    protected $AuthorizeSilenceURL   = 'https://open.douyin.com/oauth/authorize/v2/';//抖音静默授权
+    protected $AuthorizeSilenceURL = 'https://open.douyin.com/oauth/authorize/v2/'; //抖音静默授权
     protected $AccessTokenURL = 'oauth/access_token/';
     protected $UserInfoURL = 'oauth/userinfo/';
 
     protected $jsCode2Session = 'https://minigame.zijieapi.com/mgplatform/api/apps/jscode2session';
 
     protected $API_BASE_ARRAY = [
-        'douyin'=>'https://open.douyin.com/',//抖音
-        'toutiao'=>'https://open.snssdk.com/',//头条
-        'xigua'=>'https://open-api.ixigua.com/',//西瓜
+        'douyin'=>'https://open.douyin.com/', //抖音
+        'toutiao'=>'https://open.snssdk.com/', //头条
+        'xigua'=>'https://open-api.ixigua.com/', //西瓜
     ];
 
-    public $oauth_type = ConstCode::TYPE_DOUYIN;//抖音
+    public $oauth_type = ConstCode::TYPE_DOUYIN; //抖音
 
     /**
      * Description:  得到跳转地址
@@ -55,17 +55,17 @@ 
             'redirect_uri'  => $this->config['callback'],
             'response_type' => $this->config['response_type'],
             'scope'         => $this->config['scope'],
-            'optionalScope' => $this->config['optionalScope']??'',
+            'optionalScope' => $this->config['optionalScope'] ?? '',
             'state'         => $this->config['state'],
         ];
-        if($params['state'] == 'login_id'){
+        if ($params['state'] == 'login_id') {
             /**
              * 抖音静默获取授权码
              * https://developer.open-douyin.com/docs/resource/zh-CN/dop/develop/openapi/account-permission/douyin-default-get-permission-code
              */
-            return $this->AuthorizeSilenceURL . '?' . http_build_query($params);
-        }else{
-            return $this->AuthorizeURL . '?' . http_build_query($params);
+            return $this->AuthorizeSilenceURL.'?'.http_build_query($params);
+        } else {
+            return $this->AuthorizeURL.'?'.http_build_query($params);
         }
     }
 
@@ -106,11 +106,11 @@ 
             'access_token'=> $this->token['access_token'] ?? '',
             'union_id'=> $this->token['unionid'] ?? '',
             'channel' => $this->oauth_type,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => $result['gender'] ?? ConstCode::GENDER,
-            'avatar'  => $result['avatar']??'',
+            'avatar'  => $result['avatar'] ?? '',
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -123,15 +123,15 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("Douyin APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        }elseif ($this->type == 'applets') {
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -150,12 +150,12 @@ 
      * @return array|mixed|null
      * @throws \Exception
      */
-    public function applets(){
+    public function applets() {
         /** 获取参数 */
         $params = $this->jscode2sessionParams();
 
         /** 获取access_token */
-        $token =  $this->get($this->jsCode2Session, $params);
+        $token = $this->get($this->jsCode2Session, $params);
         /** 解析token值(子类实现此方法) */
         $this->token = $this->parseToken($token);
         return $this->token;
@@ -168,10 +168,10 @@ 
      */
     private function switchAccessTokenURL()
     {
-        switch ($this->oauth_type){
-            case ConstCode::TYPE_DOUYIN:$this->ApiBase = $this->API_BASE_ARRAY['douyin'];break;
-            case ConstCode::TYPE_TOUTIAO:$this->ApiBase = $this->API_BASE_ARRAY['toutiao'];break;
-            case ConstCode::TYPE_XIGUA:$this->ApiBase = $this->API_BASE_ARRAY['xigua'];break;
+        switch ($this->oauth_type) {
+            case ConstCode::TYPE_DOUYIN:$this->ApiBase = $this->API_BASE_ARRAY['douyin']; break;
+            case ConstCode::TYPE_TOUTIAO:$this->ApiBase = $this->API_BASE_ARRAY['toutiao']; break;
+            case ConstCode::TYPE_XIGUA:$this->ApiBase = $this->API_BASE_ARRAY['xigua']; break;
             default:throw new \Exception("获取抖音 OAUTH_TYPE 参数出错：{$this->oauth_type}");
         }
         $this->AccessTokenURL = $this->ApiBase.$this->AccessTokenURL;
@@ -208,8 +208,8 @@ 
             'appid'      => $this->config['app_id'],
             'secret'     => $this->config['app_secret'],
         ];
-        if(isset($_REQUEST['code'])) $params['code'] = $_REQUEST['code'];
-        if(isset($_REQUEST['anonymous_code'])) $params['anonymous_code'] = $_REQUEST['anonymous_code'];
+        if (isset($_REQUEST['code'])) $params['code'] = $_REQUEST['code'];
+        if (isset($_REQUEST['anonymous_code'])) $params['anonymous_code'] = $_REQUEST['anonymous_code'];
 
         return $params;
     }
@@ -227,7 +227,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['data']['access_token'])) {
             return $data['data'];
-        }elseif (isset($data['session_key'])){
+        }elseif (isset($data['session_key'])) {
             //小程序登录
             return $data;
         } else {

src/Gateways/Naver.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'] ?: Str::random(),
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -74,13 +74,13 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("Naver APP登录 需要传输access_token参数! ");
             }
             $this->token['token_type'] = 'Bearer';
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $data = $this->call('nid/me', $this->token, 'GET');
@@ -103,10 +103,10 @@ 
         $method  = strtoupper($method);
         $request = [
             'method' => $method,
-            'uri'    => self::API_BASE . $api,
+            'uri'    => self::API_BASE.$api,
         ];
 
-        $headers = ['Authorization' => $this->token['token_type'] . ' ' . $this->token['access_token']];
+        $headers = ['Authorization' => $this->token['token_type'].' '.$this->token['access_token']];
 
         $data = $this->$method($request['uri'], $params, $headers);
 

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
             }
             $this->token['token_type'] = 'Bearer';
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }else {
+        } else {
             $this->getToken();
         }
         $data = $this->call('nid/me', $this->token, 'GET');

src/Gateways/Sina.php

Spacing +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
             'state'        => $this->config['state'],
             'display'      => $this->display,
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params);
+        return $this->AuthorizeURL.'?'.http_build_query($params);
     }
 
     /**
@@ -88,16 +88,16 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) || !isset($_REQUEST['uid'])){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token']) || !isset($_REQUEST['uid'])) {
                 throw new \Exception("Sina APP登录 需要传输access_token和uid参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
             $this->token['openid'] = $_REQUEST['uid'];
-        }else{
+        } else {
             /** 获取参数 */
             $params = $this->accessTokenParams();
-            $this->AccessTokenURL = $this->AccessTokenURL. '?' . http_build_query($params);//get传参
+            $this->AccessTokenURL = $this->AccessTokenURL.'?'.http_build_query($params); //get传参
             $this->getToken();
         }
 
@@ -117,11 +117,11 @@ 
     {
         $method = strtoupper($method);
 
-        if(isset($this->token['access_token'])){
+        if (isset($this->token['access_token'])) {
             $params['access_token'] = $this->token['access_token'];
         }
 
-        $data = $this->$method(self::API_BASE . $api, $params);
+        $data = $this->$method(self::API_BASE.$api, $params);
         return json_decode($data, true);
     }
 
@@ -162,8 +162,8 @@ 
      * @param $data
      * @return mixed
      */
-    public function statusesShare($data){
-        return $this->call('statuses/share.json', json_encode($data),'POST');
+    public function statusesShare($data) {
+        return $this->call('statuses/share.json', json_encode($data), 'POST');
     }
 
 }

Braces +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
             $this->token['openid'] = $_REQUEST['uid'];
-        }else{
+        } else{
             /** 获取参数 */
             $params = $this->accessTokenParams();
             $this->AccessTokenURL = $this->AccessTokenURL. '?' . http_build_query($params);//get传参

src/Gateways/Wechat.php

Braces +3 added lines, -3 removed lines

@@ -131,10 +131,10 @@ 
                 throw new \Exception("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        } elseif ($this->type == 'applets'){
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -215,7 +215,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        } elseif (isset($data['session_key'])){
             //小程序登录
             return $data;
         } else {

Spacing +15 added lines, -15 removed lines

@@ -41,7 +41,7 @@ 
         $this->saveState();
 
         //获取代理链接
-        if(isset($this->config['proxy_url'])){
+        if (isset($this->config['proxy_url'])) {
             return $this->getProxyURL();
         }
 
@@ -54,7 +54,7 @@ 
             'scope'         => $this->config['scope'],
             'state'         => $this->config['state'],
         ];
-        return $this->AuthorizeURL . '?' . http_build_query($params) . '#wechat_redirect';
+        return $this->AuthorizeURL.'?'.http_build_query($params).'#wechat_redirect';
     }
 
     /**
@@ -72,7 +72,7 @@ 
             'state'         => $this->config['state'],
             'redirect_uri'    => $this->config['callback'],
         ];
-        return $this->config['proxy_url'] . '?' . http_build_query($params);
+        return $this->config['proxy_url'].'?'.http_build_query($params);
     }
 
     /**
@@ -109,12 +109,12 @@ 
             'union_id'=> $this->token['unionid'] ?? '',
             'access_token'=> $this->token['access_token'] ?? '',
             'channel' => ConstCode::TYPE_WECHAT,
-            'nickname'=> $result['nickname']??'',
+            'nickname'=> $result['nickname'] ?? '',
             'gender'  => $result['sex'] ?? ConstCode::GENDER,
-            'avatar'  => $result['headimgurl']??'',
-            'session_key'  => $result['session_key']??'',
+            'avatar'  => $result['headimgurl'] ?? '',
+            'session_key'  => $result['session_key'] ?? '',
         ];
-        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'],$this->type);
+        $userInfo['type'] = ConstCode::getTypeConst($userInfo['channel'], $this->type);
         return $userInfo;
     }
 
@@ -127,15 +127,15 @@ 
      */
     public function getUserInfo()
     {
-        if($this->type == 'app'){//App登录
-            if(!isset($_REQUEST['access_token']) ){
+        if ($this->type == 'app') {//App登录
+            if (!isset($_REQUEST['access_token'])) {
                 throw new \Exception("Wechat APP登录 需要传输access_token参数! ");
             }
             $this->token['access_token'] = $_REQUEST['access_token'];
-        }elseif ($this->type == 'applets'){
+        }elseif ($this->type == 'applets') {
             //小程序
             return $this->applets();
-        }else {
+        } else {
             /** 获取token信息 */
             $this->getToken();
         }
@@ -146,7 +146,7 @@ 
             'openid'=>$this->openid(),
             'lang'=>'zh_CN',
         ];
-        $data = $this->get(self::API_BASE . 'userinfo', $params);
+        $data = $this->get(self::API_BASE.'userinfo', $params);
         return json_decode($data, true);
     }
 
@@ -154,13 +154,13 @@ 
      * @return array|mixed|null
      * @throws \Exception
      */
-    public function applets(){
+    public function applets() {
         /** 获取参数 */
         $params = $this->accessTokenParams();
         $params['js_code'] = $params['code'];
 
         /** 获取access_token */
-        $token =  $this->get($this->jsCode2Session, $params);
+        $token = $this->get($this->jsCode2Session, $params);
         /** 解析token值(子类实现此方法) */
         $this->token = $this->parseToken($token);
         return $this->token;
@@ -216,7 +216,7 @@ 
         $data = json_decode($token, true);
         if (isset($data['access_token'])) {
             return $data;
-        }elseif (isset($data['session_key'])){
+        }elseif (isset($data['session_key'])) {
             //小程序登录
             return $data;
         } else {

src/Helper/Str.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
             if (in_array($k, $except)) {
                 continue;
             }
-            $param_str .= $k . '=';
+            $param_str .= $k.'=';
             $param_str .= $urlencode ? rawurlencode($v) : $v;
             $param_str .= '&';
         }