Kirin 3 years ago
parent
commit
2c838e11f2

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

@@ -31,7 +31,7 @@ class AllowOriginMiddleware extends BaseMiddleware
      */
     protected $header = [
         'Access-Control-Allow-Origin' => '*',
-        'Access-Control-Allow-Headers' => 'LonLat, X-Token, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With,Form-type,Referer,Connection,Content-Length,Host,Origin,Authorization,Authori-zation,Accept,Accept-Encoding',//,Host,Origin,Authorization,Authori-zation,Accept,Accept-Encoding
+        'Access-Control-Allow-Headers' => 'LatLon, X-Token, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With,Form-type,Referer,Connection,Content-Length,Host,Origin,Authorization,Authori-zation,Accept,Accept-Encoding',//,Host,Origin,Authorization,Authori-zation,Accept,Accept-Encoding
         //'Access-Control-Allow-Headers' => '*',
         'Access-Control-Allow-Methods' => 'GET,POST,PATCH,PUT,DELETE,OPTIONS,DELETE',
         'Access-Control-Max-Age' => '1728000'

+ 4 - 4
app/common/middleware/UserTokenMiddleware.php

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