Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/zhupu into dev

addons/fastim/controller/api/User.php

@@ -180,26 +180,26 @@ class User extends Base
 
         $rule = [
             'mobile'   => 'regex:/^1\d{10}$/',
-            'username' => 'require|length:3,30',
-            'realname' => 'require|length:1,30',
-            'surname_id' => 'require|length:1,3',
+            'username' => 'require|length:1,30',
+//            'realname' => 'require|length:1,30',
+//            'surname_id' => 'require|length:1,3',
             'password' => 'require|length:6,30'
         ];
         $msg  = [
             'mobile'           => 'Mobile is incorrect',
             'username.require' => 'Username can not be empty',
-            'username.length'  => 'Username must be 3 to 30 characters',
+            'username.length'  => 'Username must be 1 to 30 characters',
             'password.require' => 'Password can not be empty',
             'password.length'  => 'Password must be 6 to 30 characters',
-            'realname.require' => 'Realname can not be empty',
-            'surname_id.require' => 'Surname_id can not be empty',
+//            'realname.require' => 'Realname can not be empty',
+//            'surname_id.require' => 'Surname_id can not be empty',
         ];
         $data = [
             'mobile'   => $mobile,
             'username' => $username,
             'password' => $password,
             'captcha'  => $captcha,
-            'realname'  => $realname,
+//            'realname'  => $realname,
 //            'surname_id'  => $surname_id,
         ];
 
@@ -214,7 +214,7 @@ class User extends Base
             $this->error(__($validate->getError()));
         }
 
-        $userInfo = $this->createUser($username, $password, '', $mobile, ['realname'=>$realname]);//$surname_id
+        $userInfo = $this->createUser($username, $password, '', $mobile);//$surname_id
         $userInfo['user_token'] = $this->getRefreshtoken($userInfo['user_id']);
 //        $this->createFamily($surname_id,$realname,$userInfo['user_id'],$userInfo['id'],$sex);
         Sms::flush($mobile, 'register');

addons/fastim/lang/api/zh-cn.php

@@ -8,7 +8,7 @@ return [
     'Username can not be empty'                    => '用户名不能为空',
     'Realname can not be empty'                    => '真实名不能为空',
     'Surname_id can not be empty'                    => '真实姓不能为空',
-    'Username must be 3 to 30 characters'          => '用户名必须3-30个字符',
+    'Username must be 1 to 30 characters'          => '用户名必须1-30个字符',
     'Password can not be empty'                    => '密码不能为空',
     'Password must be 6 to 30 characters'          => '密码必须6-30个字符',
     'Captcha is incorrect'                         => '验证码不正确',

application/api/lang/zh-cn/user.php

@@ -6,7 +6,7 @@ return [
     'Login'                                 => '登录',
     'Sign up successful'                    => '注册成功',
     'Username can not be empty'             => '用户名不能为空',
-    'Username must be 3 to 30 characters'   => '用户名必须3-30个字符',
+    'Username must be 1 to 30 characters'   => '用户名必须1-30个字符',
     'Username must be 6 to 30 characters'   => '用户名必须6-30个字符',
     'Password can not be empty'             => '密码不能为空',
     'Password must be 6 to 30 characters'   => '密码必须6-30个字符',

application/lib/sms/DxSms.php

@@ -23,7 +23,7 @@ class DxSms
     public static function sendCodeSms($mobile, $event )
     {
         $code = rand(10000, 99999);
-        $info = "您的验证码：" . $code . "，您正进行身份验证，打死不告诉别人！";
+        $info = "您的验证码：" . $code . "，您正进行身份验证，请勿告诉别人！";
         try {
             $result = ZthySms::sendSms($mobile, $info);
             $res = json_decode($result, true);