From d1afe290f068fd0f35fe8fe36a110e8c9189243c Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Wed, 23 Aug 2023 10:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php              | 8 ++++----
 app/controller/Passport.php | 2 +-
 app/model/User.php          | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/common.php b/app/common.php
index 5e7750e..0837b7b 100644
--- a/app/common.php
+++ b/app/common.php
@@ -60,16 +60,16 @@ function checkToken($token): array
  * @param int $length
  * @return string
  */
-function generate_random_str(int $length = 8):string
+function generate_random_str(int $length = 8): string
 {
     $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    $username = '';
+    $str = '';
 
     $maxIndex = strlen($characters) - 1;
     for ($i = 0; $i < $length; $i++) {
         $randomIndex = mt_rand(0, $maxIndex);
-        $username .= $characters[$randomIndex];
+        $str .= $characters[$randomIndex];
     }
 
-    return $username;
+    return $str;
 }
\ No newline at end of file
diff --git a/app/controller/Passport.php b/app/controller/Passport.php
index 926355f..2d0d54d 100644
--- a/app/controller/Passport.php
+++ b/app/controller/Passport.php
@@ -73,7 +73,7 @@ class Passport extends BaseController
 
             if ($user['status']) {
 
-                $userinfo = ['id' => $user['data']['id'], 'username' => $user['data']['username']];
+                $userinfo = ['id' => $user['data']['id'], 'avatar' => $user['data']['avatar']];
                 $token = ['token'=>signToken($userinfo)];
 
                 return $this->renderSuccess('登陆成功',$token);
diff --git a/app/model/User.php b/app/model/User.php
index ed6833d..1195555 100644
--- a/app/model/User.php
+++ b/app/model/User.php
@@ -27,7 +27,7 @@ class User extends Model
         $password = $this->generateHashedPassword($data['password'], $salt);
 
         $this->save([
-            'username' => generate_random_str(),
+            'avatar' => '',
             'password' => $password,
             'salt' => $salt,
             'phone' => $data['phone'],
@@ -41,7 +41,7 @@ class User extends Model
     /**
      * 用户登录
      * @param $data
-     * @return User|array|mixed|Model
+     * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
@@ -51,7 +51,7 @@ class User extends Model
     public function login($data)
     {
         // 根据用户名查询用户信息
-        $user = $this->where('phone', $data['phone'])->field('id,username,phone,invite_code,password,salt')->find();
+        $user = $this->where('phone', $data['phone'])->field('id,avatar,phone,invite_code,password,salt')->find();
 
         if ($user) {
             // 使用相同的盐值对输入密码进行哈希验证