Merge branch 'feature/mzl-dev'

backend/app/controller/AuthController.php

@@ -287,7 +287,8 @@ class AuthController extends BaseController
             ]);
 
             // 构建扫码登录 URL
-            $redirectUri = urlencode("https://xsm.dev.hnxinyouhe.com/login/callback");
+            $baseUrl = config('feishu_notification.base_url') ?? request()->scheme() . '://' . request()->host();
+            $redirectUri = urlencode($baseUrl . '/login/callback');
             $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}");

backend/app/service/ApprovalService.php

@@ -502,7 +502,7 @@ class ApprovalService
      */
     private function getDetailUrl(ApprovalOrder $order): string
     {
-        $baseUrl = 'https://xsm.dev.hnxinyouhe.com';
+        $baseUrl = config('feishu_notification.base_url') ?? request()->scheme() . '://' . request()->host();
 
         // 统一使用审批详情页，不再跳转到具体业务模块的详情页
         return "{$baseUrl}/approval/detail/{$order->id}";

backend/app/service/BusinessTripService.php

@@ -296,7 +296,7 @@ class BusinessTripService
             }
 
             // 构建审批链接（统一使用审批详情页）
-            $approvalUrl = "https://xsm.dev.hnxinyouhe.com/approval/detail/{$approvalOrder->id}";
+            $approvalUrl = "https://uniservice-mobile.hnxinyouhe.com/approval/detail/{$approvalOrder->id}";
 
             // 构建内容
             $content = "**出差原因**: {$businessTrip->reason}\n";
@@ -361,8 +361,8 @@ class BusinessTripService
 
             // 统一使用审批详情页
             $detailUrl = $approvalOrder
-                ? "https://xsm.dev.hnxinyouhe.com/approval/detail/{$approvalOrder->id}"
+                ? "https://uniservice-mobile.hnxinyouhe.com/approval/detail/{$approvalOrder->id}"
-                : "https://xsm.dev.hnxinyouhe.com/approval/list";
+                : "https://uniservice-mobile.hnxinyouhe.com/approval/list";
 
             if ($action === 'approve') {
                 $title = '出差申请已通过';
@@ -650,7 +650,7 @@ class BusinessTripService
             $notificationService = new \app\service\FeishuNotificationService();
 
             // 统一使用审批详情页
-            $detailUrl = "https://xsm.dev.hnxinyouhe.com/approval/detail/{$approvalOrder->id}";
+            $detailUrl = "https://uniservice-mobile.hnxinyouhe.com/approval/detail/{$approvalOrder->id}";
 
             // 获取审批人和抄送人
             $formData = $approvalOrder->form_data ?? [];

backend/config/feishu_notification.php

@@ -5,6 +5,9 @@
  */
 
 return [
+    // 基础 URL（用于生成回调地址）
+    'base_url' => env('FEISHU_BASE_URL') ?? null,
+
     // 卡片模板配置
     'templates' => [
         // 审批通知模板