hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

修复后台常规管理修改配置时远程验证的错误 

修复SMS发送验证码的错误
pull/33/head
Karson 2018-01-22 23:25:55 +08:00
parent f26dec833b
commit 02ff41c0f2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/general/Config.php
View File

@ -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'));
}
}

10
application/api/controller/Sms.php
View File

@ -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()
{

10
application/common/library/Sms.php
View File

@ -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;
}
}