diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php index 80c154c8..b594fda1 100644 --- a/application/admin/controller/general/Config.php +++ b/application/admin/controller/general/Config.php @@ -191,16 +191,16 @@ class Config extends Backend $config = $this->model->get($params); if (!$config) { - return json(['ok' => '']); + return $this->success(); } else { - return json(['error' => __('Name already exist')]); + return $this->error(__('Name already exist')); } } else { - return json(['error' => __('Invalid parameters')]); + return $this->error(__('Invalid parameters')); } } diff --git a/application/api/controller/Sms.php b/application/api/controller/Sms.php index 99c7deb4..5e558c42 100644 --- a/application/api/controller/Sms.php +++ b/application/api/controller/Sms.php @@ -23,8 +23,8 @@ class Sms extends Api /** * 发送验证码 * - * @param string $mobile 手机号 - * @param string $event 事件名称 + * @param string $mobile 手机号 + * @param string $event 事件名称 */ public function send() { @@ -70,9 +70,9 @@ class Sms extends Api /** * 检测验证码 * - * @param string $mobile 手机号 - * @param string $event 事件名称 - * @param string $captcha 验证码 + * @param string $mobile 手机号 + * @param string $event 事件名称 + * @param string $captcha 验证码 */ public function check() { diff --git a/application/common/library/Sms.php b/application/common/library/Sms.php index aa1e2c9f..59d5f17d 100644 --- a/application/common/library/Sms.php +++ b/application/common/library/Sms.php @@ -35,8 +35,8 @@ class Sms where(['mobile' => $mobile, 'event' => $event]) ->order('id', 'DESC') ->find(); - $result = Hook::listen('sms_get', $sms); - return $result ? $result : NULL; + Hook::listen('sms_get', $sms, null, true); + return $sms ? $sms : NULL; } /** @@ -52,7 +52,7 @@ class Sms $code = is_null($code) ? mt_rand(1000, 9999) : $code; $time = time(); $sms = \app\common\model\Sms::create(['event' => $event, 'mobile' => $mobile, 'code' => $code, 'createtime' => $time]); - $result = Hook::listen('sms_send', $sms); + $result = Hook::listen('sms_send', $sms, null, true); if (!$result) { $sms->delete(); @@ -69,7 +69,7 @@ class Sms */ public static function notice($params = []) { - $result = Hook::listen('sms_notice', $params); + $result = Hook::listen('sms_notice', $params, null, true); return $result ? TRUE : FALSE; } @@ -100,7 +100,7 @@ class Sms } else { - $result = Hook::listen('sms_check', $sms); + $result = Hook::listen('sms_check', $sms, null, true); return $result; } }