Merge branch 'feature/mzl-dev'

2026-02-27 22:14:23 +08:00
parent 5f255fb91f 40234a1d90
commit 17623042ee
1 changed files with 3 additions and 3 deletions
@@ -286,9 +286,9 @@ class AuthController extends BaseController
                'expires_at' => date('Y-m-d H:i:s', time() + 300), // 5分钟过期
            ]);

-            // 构建扫码登录 URL
-            $baseUrl = config('feishu_notification.base_url') ?? request()->scheme() . '://' . request()->host();
-            $redirectUri = urlencode($baseUrl . '/login/callback');
+            // 构建扫码登录 URL（使用数据库中配置的回调地址）
+            $callbackUrl = $feishuApp->mobile_callback_url ?? request()->scheme() . '://' . request()->host() . '/login/callback';
+            $redirectUri = urlencode($callbackUrl);
            $authUrl = "https://passport.feishu.cn/suite/passport/oauth/authorize?client_id={$feishuApp->app_id}&redirect_uri={$redirectUri}&response_type=code&state={$loginSession->id}";

            error_log("✅ 生成二维码会话: session_id={$loginSession->id}");