4

support/Jwt.php

@@ -75,7 +75,8 @@ class Jwt
             'avatar'   => '',
         ];
         $params = array_merge($data, [
-            'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
+            //'nickname'  => preg_match("/^1[3-9]{1}\d{9}$/", $username) ? substr_replace($username, '****', 3, 4) : $username,
+            'nickname'  => "wx_".Random::alnum(),
             //'salt'      => Random::alnum(),
             'join_time'  => $time,
             'join_ip'    => $ip,
@@ -83,6 +84,10 @@ class Jwt
             'last_ip'   => $ip,
             'status'    => '1'
         ]);
+        $region = Request()->post('region');
+        if($region){
+            $params['region'] = str_replace('+','',$region);
+        }
         $params['password'] = \plugin\admin\app\common\Util::passwordHash($password);
         $params = array_merge($params, $extend); 
 
@@ -102,9 +107,9 @@ class Jwt
             }
             $_token = \support\Jwt\JwtToken::generateToken($user->toArray());
             $user->token = $_token['access_token'];
-            Db::commit();
             //注册成功的事件
             Hook("user.register_successed", $user);
+            Db::commit();
             return self::getUserinfo($user);
         } catch (\Exception $e) {
             Db::rollback();
@@ -130,7 +135,9 @@ class Jwt
          * @var User $user
          * */
         if($field=='mobile'){
-            $user = User::where($field , $account)->where('region',Request()->post('region'))->find();
+            $region = Request()->post('region');
+            $region = str_replace('+','',$region);
+            $user = User::where($field , $account)->where('region',$region)->find();
         }else{
             $user = User::where($field , $account)->find();
         }