Kirin 3 years ago
parent
commit
493d60277d

+ 4 - 1
app/common/middleware/AllowOriginMiddleware.php

@@ -41,7 +41,10 @@ class AllowOriginMiddleware extends BaseMiddleware
     {
         $cookieDomain = Config::get('cookie.domain', '');
         $origin = $request->header('origin');
-
+        $lonlat = trim($request->header('LatLon'));
+        $request->macro('lonlat', function () use ($lonlat) {
+            return $lonlat;
+        });
         if ($origin && $cookieDomain && strpos($origin, $cookieDomain))
             $this->header['Access-Control-Allow-Origin'] = $origin;
         if ($request->method(true) == 'OPTIONS') {

+ 0 - 3
app/common/middleware/UserTokenMiddleware.php

@@ -36,7 +36,6 @@ class UserTokenMiddleware extends BaseMiddleware
         $force = $this->getArg(0, true);
         try {
             $token = trim($request->header('X-Token'));
-            $lonlat = trim($request->header('LatLon'));
 
 //            $longitude = explode(',', $lonlat)[0] ?? 0;
 //            $latitude = explode(',', $lonlat)[1] ?? 0;
@@ -67,8 +66,6 @@ class UserTokenMiddleware extends BaseMiddleware
                 throw new AuthException('账号不存在');
             if (!$user['status'])
                 throw new AuthException('账号已被禁用');
-
-            $user['now_local'] = $lonlat;
         } catch (Throwable $e) {
             if ($force)
                 throw  $e;