From 342f984a3b4a0c40a0843c9b7a22b94d3d1ab2c1 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Wed, 16 Apr 2025 12:01:09 +0800
Subject: [PATCH] feat: update UUID generation to use uuid.uuid7 and add
 uuid-utils dependency

---
 apps/users/migrations/0001_initial.py | 4 ++--
 apps/users/models/user.py             | 4 ++--
 pyproject.toml                        | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/users/migrations/0001_initial.py b/apps/users/migrations/0001_initial.py
index 2d44acd94..875e2dcb8 100644
--- a/apps/users/migrations/0001_initial.py
+++ b/apps/users/migrations/0001_initial.py
@@ -1,6 +1,6 @@
 # Generated by Django 5.2 on 2025-04-14 02:22
 
-import uuid
+import uuid_utils.compat
 from django.db import migrations, models
 
 from common.constants.permission_constants import RoleConstants
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='User',
             fields=[
-                ('id', models.UUIDField(default=uuid.uuid1, editable=False, primary_key=True, serialize=False,
+                ('id', models.UUIDField(default=uuid_utils.compat.uuid7, editable=False, primary_key=True, serialize=False,
                                         verbose_name='主键id')),
                 ('email', models.EmailField(blank=True, max_length=254, null=True, unique=True, verbose_name='邮箱')),
                 ('phone', models.CharField(default='', max_length=20, verbose_name='电话')),
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index ea608c15c..6c866dfa1 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -6,7 +6,7 @@
     @date：2025/4/14 10:20
     @desc:
 """
-import uuid
+import uuid_utils.compat as uuid
 
 from django.db import models
 
@@ -14,7 +14,7 @@ from common.utils.common import password_encrypt
 
 
 class User(models.Model):
-    id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid1, editable=False, verbose_name="主键id")
+    id = models.UUIDField(primary_key=True, max_length=128, default=uuid.uuid7, editable=False, verbose_name="主键id")
     email = models.EmailField(unique=True, null=True, blank=True, verbose_name="邮箱")
     phone = models.CharField(max_length=20, verbose_name="电话", default="")
     nick_name = models.CharField(max_length=150, verbose_name="昵称", default="")
diff --git a/pyproject.toml b/pyproject.toml
index 4faafe006..c6badc00d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ django-redis = "5.4.0"
 django-db-connection-pool = "1.2.5"
 psycopg = {extras = ["binary"], version = "3.2.6"}
 python-dotenv = "1.1.0"
+uuid-utils = "0.10.0"
 
 [build-system]
 requires = ["poetry-core"]