From fe1972c6f6548ca2016040ac85948e63a129d58f Mon Sep 17 00:00:00 2001
From: "545522390@qq.com" <liweisen825>
Date: Thu, 17 Jan 2019 16:22:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=A8=E5=9F=9F=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/middleware/CORS.php  | 38 +++++++++++++++++++++++++
 application/project/middleware/Auth.php | 15 ----------
 2 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 application/common/middleware/CORS.php

diff --git a/application/common/middleware/CORS.php b/application/common/middleware/CORS.php
new file mode 100644
index 0000000..b941bfd
--- /dev/null
+++ b/application/common/middleware/CORS.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace app\common\middleware;
+
+use think\Request;
+
+/**
+ * 跨域处理
+ * Class Auth
+ * @package app\admin\middleware
+ */
+class CORS
+{
+    /**
+     * @param Request $request
+     * @param \Closure $next
+     * @return mixed
+     */
+    public function handle($request, \Closure $next)
+    {
+
+        $Origin = $request->header('Origin');
+        $Headers = $request->header('Access-Control-Request-Headers');
+        header('Access-Control-Allow-Origin: ' . $Origin);
+        header('Access-Control-Allow-Headers: ' . $Headers);
+        header('Access-Control-Allow-Credentials:true');
+        header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+        header('Access-Control-Max-Age: 1728000');
+        header('Content-Type:text/plain charset=UTF-8');
+        if (strtoupper($request->method()) == "OPTIONS") {
+            header('HTTP/1.0 204 No Content');
+            header('Content-Length:0');
+            header('status:204');
+            exit();
+        }
+        return $next($request);
+    }
+}
diff --git a/application/project/middleware/Auth.php b/application/project/middleware/Auth.php
index 34d5580..c9feeb4 100644
--- a/application/project/middleware/Auth.php
+++ b/application/project/middleware/Auth.php
@@ -25,21 +25,6 @@ class Auth
      */
     public function handle($request, \Closure $next)
     {
-//        $Origin = $request->header('Origin');
-//        $Headers = $request->header('Access-Control-Request-Headers');
-//        header('Access-Control-Allow-Origin: ' . $Origin);
-//        header('Access-Control-Allow-Headers: ' . $Headers);
-//        header('Access-Control-Allow-Credentials:true');
-//        header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, DELETE');
-//        header('Access-Control-Max-Age: 1728000');
-//        header('Content-Type:text/plain charset=UTF-8');
-//
-//        if (strtoupper($request->method()) == "OPTIONS") {
-//            header('HTTP/1.0 204 No Content');
-//            header('Content-Length:0');
-//            header('status:204');
-//            exit();
-//        }
         list($module, $controller, $action) = [$request->module(), $request->controller(), $request->action()];
         $access = $this->buildAuth($node = NodeService::parseNodeStr("{$module}/{$controller}/{$action}"));
         $currentOrganizationCode = $request->header('organizationCode');