Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/ClientController.php

@@ -84,13 +84,13 @@ class ClientController extends AbstractController
         $request_data['user_id'] =  Context::get("UserId");
         // $request_data['website_id'] = Context::get("SiteId");
         $result = $this->clientServiceClient->addWeb($request_data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function deleteWeb()
     {
         $request_data = $this->request->all();
         $result = $this->clientServiceClient->deleteWeb($request_data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function getWebInfo()
     {
@@ -108,7 +108,7 @@ class ClientController extends AbstractController
             return Result::error($validator->errors()->first());
         }
         $result = $this->clientServiceClient->getWebInfo($request_data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function updateWeb()
     {
@@ -128,7 +128,7 @@ class ClientController extends AbstractController
             ]
         );
         $result = $this->clientServiceClient->updateWeb($request_data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function getWebList()
     {
@@ -149,18 +149,20 @@ class ClientController extends AbstractController
             return Result::error($validator->errors()->first());
         }
         $result = $this->clientServiceClient->getWebList($request_data);
-        return $result ? Result::success($result['data']) : Result::error($result['message']);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function updateWebConfig()
     {
         $request_data = $this->request->all();
         $data = $this->clientServiceClient->updateWebConfig($request_data);
-        return $data ? Result::success($data['data']) : Result::error($data['message']);
+        var_dump($data, 'return data');
+        return $data['code'] == 200 ? Result::success($data['data']) : Result::error($data['message']);
     }
     public function updateWebOutput()
     {
         $request_data = $this->request->all();
         $data = $this->clientServiceClient->updateWebOutput($request_data);
+        return $data ? Result::success($data['data']) : Result::error($data['message']);
     }
     public function updateWebMove()
     {