diff --git a/application/api/controller/Smartlock.php b/application/api/controller/Smartlock.php index c8f2cb0..4f1eb64 100644 --- a/application/api/controller/Smartlock.php +++ b/application/api/controller/Smartlock.php @@ -82,9 +82,9 @@ class Smartlock extends Base $param = array_merge($deviceInfo,$deviceStatus); $pushRes = SmartLocks::TimingDataPush($param); - if (!$pushRes['status']) throw new \Exception($pushRes['msg']); + #if (!$pushRes['status']) throw new \Exception($pushRes['msg']); - return $this->jsonSuccess(); + return $this->jsonSuccess('成功',$pushRes); } catch (\Exception $exception) { return $this->jsonError($exception->getMessage()); } diff --git a/application/common/SzxfjkSdk/SmartLocks.php b/application/common/SzxfjkSdk/SmartLocks.php index ef26eaa..db8677a 100644 --- a/application/common/SzxfjkSdk/SmartLocks.php +++ b/application/common/SzxfjkSdk/SmartLocks.php @@ -52,13 +52,13 @@ class SmartLocks ],//数据内容 ]; - $result = self::curlPost($requestUrl, $data); + return $result = self::curlPost($requestUrl, $data); - if (!$result['code']) { - return ['status' => 1,'msg' => '推送成功']; - } - - return ['status' => 0,'msg' => '推送失败']; +// if (!$result['code']) { +// return ['status' => 1,'msg' => '推送成功']; +// } +// +// return ['status' => 0,'msg' => '推送失败']; } /**