From 4009457000dc8194e31e6a2fe66cbec2c34039f3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 19 Sep 2023 17:02:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20random=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/utils/random.py | 4 ++-- apps/users/models/user.py | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/common/utils/random.py b/apps/common/utils/random.py index f75e7001b..4b57a38d1 100644 --- a/apps/common/utils/random.py +++ b/apps/common/utils/random.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- # -import struct import random import socket import string - +import struct string_punctuation = '!#$%&()*+,-.:;<=>?@[]^_~' @@ -19,6 +18,7 @@ def random_ip(): def random_string(length: int, lower=True, upper=True, digit=True, special_char=False): + random.seed(None) args_names = ['lower', 'upper', 'digit', 'special_char'] args_values = [lower, upper, digit, special_char] args_string = [string.ascii_lowercase, string.ascii_uppercase, string.digits, string_punctuation] diff --git a/apps/users/models/user.py b/apps/users/models/user.py index a156478bd..37e3abe2b 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -3,8 +3,6 @@ # import base64 import datetime -import random -import string import uuid from typing import Callable @@ -562,8 +560,7 @@ class TokenMixin: return self.access_keys.first() def generate_reset_token(self): - letter = string.ascii_letters + string.digits - token = ''.join([random.choice(letter) for _ in range(50)]) + token = random_string(50) self.set_cache(token) return token