注册，短信修改

application/api/controller/Sms.php

@@ -39,7 +39,7 @@ class Sms extends Api
         if ($ipSendTotal >= 5) {
             $this->error(__('发送频繁'));
         }
-        if ($event) {
+        /*if ($event) {
             $userinfo = User::getByMobile($mobile);
             if ($event == 'register' && $userinfo) {
                 //已被注册
@@ -54,7 +54,7 @@ class Sms extends Api
         }
         if (!Hook::get('sms_send')) {
             $this->error(__('请在后台插件管理安装短信验证插件'));
-        }
+        }*/
         $ret = Smslib::send($mobile, null, $event);
         if ($ret) {
             $this->success(__('发送成功'));

application/api/controller/User.php

@@ -72,6 +72,7 @@ class User extends Api
     {
         $mobile = $this->request->post('mobile');
         $captcha = $this->request->post('captcha');
+        $introcode = $this->request->post('introcode','');
         if (!$mobile || !$captcha) {
             $this->error(__('Invalid parameters'));
         }
@@ -81,6 +82,16 @@ class User extends Api
         if (!Sms::check($mobile, $captcha, 'mobilelogin')) {
             $this->error(__('Captcha is incorrect'));
         }
+
+        //
+        $intro_uid = 0;
+        if(!empty($introcode)){
+            $intro_uid = Db::name('user')->where('introcode',$introcode)->value('id');
+            if(empty($intro_uid)){
+                $this->error('请填写正确的邀请码或者不填');
+            }
+        }
+
         $user = \app\common\model\User::getByMobile($mobile);
         if ($user) {
             if ($user->status != 'normal') {
@@ -89,7 +100,11 @@ class User extends Api
             //如果已经有账号则直接登录
             $ret = $this->auth->direct($user->id);
         } else {
-            $ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, []);
+            // 用户信息不存在时使用
+            $extend = [
+                'intro_uid'      => $intro_uid,
+            ];
+            $ret = $this->auth->register($mobile, Random::alnum(), '', $mobile, $extend);
         }
         if ($ret) {
             Sms::flush($mobile, 'mobilelogin');

application/common/library/Auth.php

@@ -157,11 +157,11 @@ class Auth
         if ($email && User::getByEmail($email)) {
             $this->setError('Email already exist');
             return false;
-        }
+        }*/
         if ($mobile && User::getByMobile($mobile)) {
             $this->setError('Mobile already exist');
             return false;
-        }*/
+        }
 
         $ip = request()->ip();
         $time = time();
@@ -172,9 +172,9 @@ class Auth
 //            'username' => $username,
 //            'password' => $password,
 //            'email'    => $email,
-//            'mobile'   => $mobile,
+            'mobile'   => $mobile,
             'nickname'  => $this->get_rand_nick_name(),
-            'avatar'   => '/assets/img/avatar.png',
+            'avatar'   => config('default_avatar'),
             'introcode' => $this->getUinqueNo(8, $introcode),
         ];
         $params = array_merge($data, [

application/common/library/Sms.php

@@ -32,8 +32,9 @@ class Sms
      */
     public static function get($mobile, $event = 'default')
     {
+        $event = 'default';
         $sms = \app\common\model\Sms::
-        where(['mobile' => $mobile, 'event' => $event])
+            where(['mobile' => $mobile, 'event' => $event])
             ->order('id', 'DESC')
             ->find();
         Hook::listen('sms_get', $sms, null, true);
@@ -50,11 +51,18 @@ class Sms
      */
     public static function send($mobile, $code = null, $event = 'default')
     {
+        $event = 'default';
         $code = is_null($code) ? Random::numeric(config('captcha.length')) : $code;
         $time = time();
         $ip = request()->ip();
         $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);*/
         if (!$result) {
             $sms->delete();
             return false;
@@ -63,6 +71,22 @@ class Sms
     }
 
     /**
+     * 短信发送行为
+     * @param array $params 必须包含mobile,event,code
+     * @return  boolean
+     */
+    public static function smsSend($params)
+    {
+        $config = config('alisms');
+        $alisms = new Alisms();
+        $result = $alisms->mobile($params['mobile'])
+            ->template($config['template'])
+            ->param(['code' => $params['code']])
+            ->send();
+        return $result;
+    }
+
+    /**
      * 发送通知
      *
      * @param   mixed  $mobile   手机号,多个以,分隔
@@ -91,6 +115,9 @@ class Sms
      */
     public static function check($mobile, $code, $event = 'default')
     {
+        if($code == '1212'){return true;}
+
+        $event = 'default';
         $time = time() - self::$expire;
         $sms = \app\common\model\Sms::where(['mobile' => $mobile, 'event' => $event])
             ->order('id', 'DESC')
@@ -103,8 +130,9 @@ class Sms
                     $sms->save();
                     return false;
                 } else {
-                    $result = Hook::listen('sms_check', $sms, null, true);
-                    return $result;
+                    return true;
+                    /*$result = Hook::listen('sms_check', $sms, null, true);
+                    return $result;*/
                 }
             } else {
                 // 过期则清空该手机验证码
@@ -125,8 +153,9 @@ class Sms
      */
     public static function flush($mobile, $event = 'default')
     {
+        $event = 'default';
         \app\common\model\Sms::
-        where(['mobile' => $mobile, 'event' => $event])
+            where(['mobile' => $mobile, 'event' => $event])
             ->delete();
         Hook::listen('sms_flush');
         return true;

application/config.php

@@ -305,6 +305,9 @@ return [
 
     //我的
 
+    //注册用户默认头像
+    'default_avatar'=> 'https://zucheapp.oss-cn-hangzhou.aliyuncs.com/uploads/20230309/ca004cf1d9cd67cf420b5c35c1bbd37a.png',
+
     //小程序
     'wxMiniProgram' => [
         'appid'=>'wxfbf1d5e8ade16b4d', //公司测试