Merge branch 'web_12_16_liu' into dev

app/Middleware/Auth/WebMiddleware.php

@@ -41,10 +41,11 @@ class WebMiddleware implements MiddlewareInterface
     {
 
         $header = $request->getHeaders();
-        var_dump("测试：",$header);
         try {
-          
-            if($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
+            if($header &&  isset($header['siteid']) && $header['siteid'][0]!='null' && isset($header['siteid'][0])){
+                Context::set("SiteId",intval($header['siteid'][0]));
+                return $handler->handle($request);
+            }elseif($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
                 $origin = $header['origin'][0];
                 $logindevice = explode("//", $origin);
                 $data = [
@@ -67,10 +68,6 @@ class WebMiddleware implements MiddlewareInterface
                 if ($result) {
                     return $handler->handle($request);
                 }
-            }elseif($header &&  isset($header['siteid']) && $header['siteid'][0]!='null' && isset($header['siteid'][0])){
-                var_dump("网站id",$header['siteid'][0]);
-                Context::set("SiteId",intval($header['siteid'][0]));
-                return $handler->handle($request);
             }else{
                 return $this->response->json(
                     [