Resolved overtrue#169

Author: overtrue

src/Middleware/OAuthAuthenticate.php

@@ -49,7 +49,7 @@ public function __construct(Application $wechat)
     public function handle($request, Closure $next, $scopes = null)
     {
         $isNewSession = false;
-        $onlyRedirectInWeChatBrowser = config('wechat.oauth.only_wechat_browser', false);
+        $onlyRedirectInWeChatBrowser = config('wechat.official_account.oauth.only_wechat_browser', false);
 
         if ($onlyRedirectInWeChatBrowser && !$this->isWeChatBrowser($request)) {
             if (config('wechat.debug')) {
@@ -59,7 +59,7 @@ public function handle($request, Closure $next, $scopes = null)
             return $next($request);
         }
 
-        $scopes = $scopes ?: config('wechat.oauth.scopes', ['snsapi_base']);
+        $scopes = $scopes ?: config('wechat.official_account.oauth.scopes', ['snsapi_base']);
 
         if (is_string($scopes)) {
             $scopes = array_map('trim', explode(',', $scopes));

src/config.php

@@ -116,7 +116,7 @@
     //     'sandbox'            => env('WECHAT_PAYMENT_SANDBOX', false),
     //     'app_id'             => env('WECHAT_PAYMENT_APPID', ''),
     //     'secret'             => env('WECHAT_PAYMENT_SECRET', ''),
-    //     'mch_id'             => env('WECHAT_PAYMENT_MERCHANT_ID', 'your-mch-id'),
+    //     'mch_id'             => env('WECHAT_PAYMENT_MCh_ID', 'your-mch-id'),
     //     'key'                => env('WECHAT_PAYMENT_KEY', 'key-for-signature'),
     //     'cert_path'          => env('WECHAT_PAYMENT_CERT_PATH', 'path/to/cert/apiclient_cert.pem'),    // XXX: 绝对路径！！！！
     //     'key_path'           => env('WECHAT_PAYMENT_KEY_PATH', 'path/to/cert/apiclient_key.pem'),      // XXX: 绝对路径！！！！