xinyouhe/x-server-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge feature/mzl-dev: 修复Webman Request方法

Browse Source
This commit is contained in:
root
2026-02-28 14:16:03 +08:00
parent ea10bdb138 95e150b65f
commit d3b9bb0b72
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/app/controller/AuthController.php
+2 -1
View File
@@ -290,7 +290,8 @@ class AuthController extends BaseController
if ($feishuApp->mobile_callback_url) { if ($feishuApp->mobile_callback_url) {
$callbackUrl = $feishuApp->mobile_callback_url; $callbackUrl = $feishuApp->mobile_callback_url;
} else { } else {
$scheme = request()->isSecure() ? 'https' : 'http'; // 检查反向代理的协议头
$scheme = request()->header('x-forwarded-proto') ?? request()->header('x-scheme') ?? 'https';
$callbackUrl = $scheme . '://' . request()->host() . '/login/callback'; $callbackUrl = $scheme . '://' . request()->host() . '/login/callback';
} }
$redirectUri = urlencode($callbackUrl); $redirectUri = urlencode($callbackUrl);
backend/app/service/ApprovalService.php
+4 -2
View File
@@ -506,8 +506,10 @@ class ApprovalService
// 如果没有配置，使用当前请求构建 // 如果没有配置，使用当前请求构建
if (!$baseUrl) { if (!$baseUrl) {
$scheme = request()->isSecure() ? 'https' : 'http'; // 检查反向代理的协议头
$baseUrl = $scheme . '://' . request()->host(); $scheme = request()->header('x-forwarded-proto') ?? request()->header('x-scheme') ?? 'https';
$host = request()->host();
$baseUrl = $scheme . '://' . $host;
} }
// 统一使用审批详情页，不再跳转到具体业务模块的详情页 // 统一使用审批详情页，不再跳转到具体业务模块的详情页