修复自动登录的跳转

shirne · Oct 16, 2024 · 0e1f1e1 · 0e1f1e1
1 parent 378ae6d
commit 0e1f1e1
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/application/index/controller/BaseController.php b/src/application/index/controller/BaseController.php
@@ -297,7 +297,7 @@ protected function checkLogin()
             }
         }
 
-        if ($this->wechatLogin() && $this->config['wechat_autologin'] == '1') {
+        if ($this->canRedirectLogin()) {
             redirect()->remember();
             $this->wechat = $this->getWechatAccount('wechat');
             $callbackurl = url('index/login/callback', ['type' => 'wechat_' . $this->wechat['id']], true, true);
@@ -310,6 +310,20 @@ protected function checkLogin()
         $this->assign('wechatUser', $this->wechatUser);
     }
 
+    protected function canRedirectLogin()
+    {
+        if ($this->request->isAjax()) {
+            return false;
+        }
+        if (strpos($this->request->header('accept'), 'image') !== false) {
+            return false;
+        }
+        if ($this->wechatLogin() && $this->config['wechat_autologin'] == '1') {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 检测并自动登录微信
      * @return bool