|
@@ -48,20 +48,20 @@ class Sms
|
|
|
* @param string $event 事件
|
|
|
* @return boolean
|
|
|
*/
|
|
|
- public static function send($mobile, $code = null, $event = 'default',$countrycode = 86)
|
|
|
+ public static function send($mobile, $code = null, $event = 'default')
|
|
|
{
|
|
|
$event = 'default';
|
|
|
$code = is_null($code) ? mt_rand(1000, 9999) : $code;
|
|
|
$time = time();
|
|
|
$ip = request()->ip();
|
|
|
- $sms = \app\common\model\Sms::create(['event' => $event, 'mobile' => $countrycode.$mobile, 'code' => $code, 'ip' => $ip, 'createtime' => $time, 'countrycode' => $countrycode]);
|
|
|
+ $sms = \app\common\model\Sms::create(['event' => $event, 'mobile' => $mobile, 'code' => $code, 'ip' => $ip, 'createtime' => $time]);
|
|
|
// $result = Hook::listen('sms_send', $sms, null, true);
|
|
|
|
|
|
//阿里短信
|
|
|
$params['mobile'] = $mobile;
|
|
|
$params['code'] = $code;
|
|
|
|
|
|
- $result = self::smsSend($params,$countrycode);
|
|
|
+ $result = self::smsSend($params);
|
|
|
|
|
|
if (!$result) {
|
|
|
$sms->delete();
|
|
@@ -75,15 +75,12 @@ class Sms
|
|
|
* @param array $params 必须包含mobile,event,code
|
|
|
* @return boolean
|
|
|
*/
|
|
|
- public static function smsSend($params,$countrycode)
|
|
|
+ public static function smsSend($params)
|
|
|
{
|
|
|
$config = config('alisms');
|
|
|
|
|
|
$template = $config['template_cn']; //默认国内模板
|
|
|
- if($countrycode != 86){
|
|
|
- $params['mobile'] = $countrycode.$params['mobile'];
|
|
|
- $template = $config['template_guoji'];
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
$alisms = new Alisms();
|
|
|
$result = $alisms->mobile($params['mobile'])
|