From 90f07cbdc8ce73cc8bf9dca0a4f2d12e9e471ffb Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Wed, 23 Aug 2023 09:52:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=85=B1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php     | 18 ++++++++++++++++++
 app/model/User.php | 22 ++--------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/common.php b/app/common.php
index ee5052f..1caa6d3 100644
--- a/app/common.php
+++ b/app/common.php
@@ -53,4 +53,22 @@ function checkToken($token): array
         $status['msg'] = "未知错误";
         return $status;
     }
+}
+
+/**
+ * 获取随机用户命
+ * @param $length
+ * @return string
+ */
+function generate_random_str($length = 8) {
+    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    $username = '';
+
+    $maxIndex = strlen($characters) - 1;
+    for ($i = 0; $i < $length; $i++) {
+        $randomIndex = mt_rand(0, $maxIndex);
+        $username .= $characters[$randomIndex];
+    }
+
+    return $username;
 }
\ No newline at end of file
diff --git a/app/model/User.php b/app/model/User.php
index f459bbd..ed6833d 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' => $this->generateRandomUsername(),
+            'username' => generate_random_str(),
             'password' => $password,
             'salt' => $salt,
             'phone' => $data['phone'],
@@ -189,7 +189,7 @@ class User extends Model
      */
     private function generateSalt()
     {
-        return $this->generateRandomUsername(6);
+        return generate_random_str(6);
     }
 
     /**
@@ -202,22 +202,4 @@ class User extends Model
     {
         return md5(md5($password) . md5($salt));
     }
-
-    /**
-     * 获取随机用户命
-     * @param $length
-     * @return string
-     */
-    private function generateRandomUsername($length = 8) {
-        $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-        $username = '';
-
-        $maxIndex = strlen($characters) - 1;
-        for ($i = 0; $i < $length; $i++) {
-            $randomIndex = mt_rand(0, $maxIndex);
-            $username .= $characters[$randomIndex];
-        }
-
-        return $username;
-    }
 }
\ No newline at end of file