fix: 修复request()->scheme()方法不存在的问题
- ApprovalService.getDetailUrl: 改用 request()->isSecure() - AuthController.qrcodeLogin: 改用 request()->isSecure()
This commit is contained in:
@@ -287,7 +287,12 @@ class AuthController extends BaseController
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
// 构建扫码登录 URL(使用数据库中配置的回调地址)
|
// 构建扫码登录 URL(使用数据库中配置的回调地址)
|
||||||
$callbackUrl = $feishuApp->mobile_callback_url ?? request()->scheme() . '://' . request()->host() . '/login/callback';
|
if ($feishuApp->mobile_callback_url) {
|
||||||
|
$callbackUrl = $feishuApp->mobile_callback_url;
|
||||||
|
} else {
|
||||||
|
$scheme = request()->isSecure() ? 'https' : 'http';
|
||||||
|
$callbackUrl = $scheme . '://' . request()->host() . '/login/callback';
|
||||||
|
}
|
||||||
$redirectUri = urlencode($callbackUrl);
|
$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}";
|
$authUrl = "https://passport.feishu.cn/suite/passport/oauth/authorize?client_id={$feishuApp->app_id}&redirect_uri={$redirectUri}&response_type=code&state={$loginSession->id}";
|
||||||
|
|
||||||
|
|||||||
@@ -502,7 +502,13 @@ class ApprovalService
|
|||||||
*/
|
*/
|
||||||
private function getDetailUrl(ApprovalOrder $order): string
|
private function getDetailUrl(ApprovalOrder $order): string
|
||||||
{
|
{
|
||||||
$baseUrl = config('feishu_notification.base_url') ?? request()->scheme() . '://' . request()->host();
|
$baseUrl = config('feishu_notification.base_url');
|
||||||
|
|
||||||
|
// 如果没有配置,使用当前请求构建
|
||||||
|
if (!$baseUrl) {
|
||||||
|
$scheme = request()->isSecure() ? 'https' : 'http';
|
||||||
|
$baseUrl = $scheme . '://' . request()->host();
|
||||||
|
}
|
||||||
|
|
||||||
// 统一使用审批详情页,不再跳转到具体业务模块的详情页
|
// 统一使用审批详情页,不再跳转到具体业务模块的详情页
|
||||||
return "{$baseUrl}/approval/detail/{$order->id}";
|
return "{$baseUrl}/approval/detail/{$order->id}";
|
||||||
|
|||||||
Reference in New Issue
Block a user