Explorar o código

修复public服务及web服务

15313670163 hai 4 meses
pai
achega
fe380585c5

+ 1 - 1
.env

@@ -1,4 +1,4 @@
-APP_NAME=user_producer
+APP_NAME=admin_consumer
 APP_ENV=dev
 HOST = http://192.168.1.201:9501/
 DB_DRIVER=mysql

+ 0 - 1
admin_consumer

@@ -1 +0,0 @@
-Subproject commit bdb29002ec8bbd2ab8f0c0807f405f61468bb261

+ 5 - 0
app/JsonRpc/PublicRpcService.php

@@ -208,4 +208,9 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    public function modZhinengbumen(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

+ 5 - 2
app/JsonRpc/PublicRpcServiceInterface.php

@@ -124,6 +124,9 @@ interface PublicRpcServiceInterface
      * @param array $data
      * @return mixed
      */
-    public function delZhinengbumen(array $data);
-
+    public function delZhinengbumen(array $data); 
+    /**
+     * 
+     */
+    public function modZhinengbumen(array $data);
 }

+ 9 - 9
app/JsonRpc/WebsiteService.php

@@ -45,7 +45,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsite(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,$id, $data);
+        return $this->__request(__FUNCTION__,compact('id', 'data'));
     }
 
     /**
@@ -54,7 +54,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsite(int $id)
     {
-        return $this->__request(__FUNCTION__,$id);
+        return $this->__request(__FUNCTION__,compact('id'));
     }
 
     /**
@@ -63,7 +63,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function getWebsiteInfo(int $id)
     {
-        return $this->__request(__FUNCTION__,$id);
+        return $this->__request(__FUNCTION__,compact('id'));
     }
 
     /**
@@ -104,7 +104,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteColumn(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,$id, $data);
+        return $this->__request(__FUNCTION__,compact('id', 'data'));
     }
 
     /**
@@ -113,7 +113,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteColumn(int $id)
     {
-        return $this->__request(__FUNCTION__,$id);
+        return $this->__request(__FUNCTION__,compact('id'));
     }
 
     /**
@@ -142,7 +142,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteRole(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,$id, $data);
+        return $this->__request(__FUNCTION__,compact('id', 'data'));
     }
 
     /**
@@ -151,7 +151,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteRole(int $id)
     {
-        return $this->__request(__FUNCTION__,$id);
+        return $this->__request(__FUNCTION__,compact('id'));
     }
     /**
      * @param string $keyword
@@ -180,7 +180,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function updateWebsiteRoleUser(int $id, array $data)
     {
-        return $this->__request(__FUNCTION__,$id, $data);
+        return $this->__request(__FUNCTION__,compact('id', 'data'));
     }
 
     /**
@@ -189,7 +189,7 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
      */
     public function delWebsiteRoleUser(int $id)
     {
-        return $this->__request(__FUNCTION__,$id);
+        return $this->__request(__FUNCTION__,compact('id'));
     }
 
     /**

+ 4 - 1
app/Middleware/Auth/WebMiddleware.php

@@ -42,13 +42,16 @@ class WebMiddleware implements MiddlewareInterface
 
         $header = $request->getHeaders();
         try {
+          
             if($header &&  isset($header['origin']) && $header['origin'][0]!='null' && isset($header['origin'][0])){
                 $origin = $header['origin'][0];
                 $logindevice = explode("//", $origin);
                 $data = [
                     'website_url'=>$logindevice[1]
                 ];
+                // var_dump("222:",$data);
                 $result = $this->websiteServiceClient->getWebsiteId($data);
+                // var_dump("3333333:",$result);
                 if(!isset($result['data']['id']) || !$result['data']['id']){
                     return $this->response->json(
                         [
@@ -58,7 +61,7 @@ class WebMiddleware implements MiddlewareInterface
                         ]
                     );
                 }
-                var_dump("获取站点id:",$result);
+                // var_dump("获取站点id:",$result);
                 Context::set("SiteId",$result['data']['id']);
                 if ($result) {
                     return $handler->handle($request);