From 6f898e5fdc8f1c6a5c23aa2b17ddd0bbf8331a8d Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 16 May 2018 15:30:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3token=E8=B7=A8=E5=9F=9Fheader=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/controller/BasicApi.php | 4 ++-- extend/service/ToolsService.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extend/controller/BasicApi.php b/extend/controller/BasicApi.php index 20723a2dc..bee2b8830 100644 --- a/extend/controller/BasicApi.php +++ b/extend/controller/BasicApi.php @@ -39,11 +39,11 @@ class BasicApi */ public function __construct() { - ToolsService::corsOptionsHandler(); - $this->request = app('request'); Session::init(config('session.')); + ToolsService::corsOptionsHandler(); $sessionName = $this->request->header(session_name()); empty($sessionName) || session_id($sessionName); + $this->request = app('request'); } /** diff --git a/extend/service/ToolsService.php b/extend/service/ToolsService.php index 9c3234ea8..53280cbb1 100644 --- a/extend/service/ToolsService.php +++ b/extend/service/ToolsService.php @@ -33,7 +33,7 @@ class ToolsService header('Access-Control-Allow-Origin:*'); header('Access-Control-Allow-Credentials:true'); header('Access-Control-Allow-Methods:GET,POST,OPTIONS'); - header('Access-Control-Allow-Headers:Accept,Referer,Host,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Cookie'); + header('Access-Control-Allow-Headers:Accept,Referer,Host,Keep-Alive,User-Agent,X-Requested-With,Cache-Control,Cookie,' . session_name()); header('Content-Type:text/plain charset=UTF-8'); header('Access-Control-Max-Age:1728000'); header('HTTP/1.0 204 No Content');