合并分支 'lyh-server' 到 'master'

列表页聚合页模式



查看合并请求 !2469

@@ -287,8 +287,8 @@ class InquiryController extends BaseController
             throw new \Exception('文件生成失败，请重试');
         }
         $fileurl = Storage::disk('runtime')->url($file);
-        return Storage::disk('runtime')->download($file); //直接下载
-//        $this->response('success',Code::SUCCESS,['url' => $fileurl]);
+//        return Storage::disk('runtime')->download($file); //直接下载
+        $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
 
     /**

@@ -20,7 +20,7 @@ class EnableCrossRequestMiddleware
         if(isset($_SERVER['HTTP_ORIGIN'])){
             $http_origin = $_SERVER['HTTP_ORIGIN'];
         }
-        $response->header('Access-Control-Allow-Origin', $http_origin ?? '*');
+        $response->header('Access-Control-Allow-Origin', $http_origin);
         $response->header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
         $response->header('Access-Control-Allow-Headers', 'Origin, Content-Type, Authorization');
         if (strtolower($_SERVER['REQUEST_METHOD']) == 'options') {