Merge a15af33164 into 71c6f290d1

api/models_user.py

@@ -1,84 +1,67 @@
-# cython:language_level=3
 from django.db import models
 from django.contrib.auth.models import (
-    BaseUserManager,AbstractBaseUser,PermissionsMixin
+    BaseUserManager, AbstractBaseUser, PermissionsMixin
 )
 from .models_work import *
 from django.utils.translation import gettext as _
+from django.utils import timezone  # 新增导入
 
 class MyUserManager(BaseUserManager):
     def create_user(self, username, password=None):
         if not username:
             raise ValueError('Users must have an username')
-
-        user = self.model(username=username,
-        )
- 
+        user = self.model(username=username)
         user.set_password(password)
         user.save(using=self._db)
         return user
- 
+
     def create_superuser(self, username, password):
-        user = self.create_user(username,
-            password=password,
-            
-        )
+        user = self.create_user(username, password=password)
         user.is_admin = True
         user.save(using=self._db)
         return user
 
 
 class UserProfile(AbstractBaseUser, PermissionsMixin):
-    username = models.CharField(_('用户名'), 
-                                unique=True,
-                                max_length=50)
-    
+    username = models.CharField(_('用户名'), unique=True, max_length=50)
+
     rid = models.CharField(verbose_name='RustDesk ID', max_length=16)
     uuid = models.CharField(verbose_name='uuid', max_length=60)
     autoLogin = models.BooleanField(verbose_name='autoLogin', default=True)
     rtype = models.CharField(verbose_name='rtype', max_length=20)
     deviceInfo = models.TextField(verbose_name=_('登录信息:'), blank=True)
-    
+
     is_active = models.BooleanField(verbose_name=_('是否激活'), default=True)
     is_admin = models.BooleanField(verbose_name=_('是否管理员'), default=False)
 
-    objects = MyUserManager()
- 
-    USERNAME_FIELD = 'username'  # 用作用户名的字段
-    REQUIRED_FIELDS = ['password']     #必须填写的字段
-    
-    
-    def get_full_name(self):
-        # The user is identified by their email address
-        return self.username
- 
-    def get_short_name(self):
-        # The user is identified by their email address
-        return self.username
- 
-    def __str__(self):              # __unicode__ on Python 2
-        return self.username
- 
-    def has_perm(self, perm, obj=None):    #有没有指定的权限
-        "Does the user have a specific permission?"
-        # Simplest possible answer: Yes, always
-        return True
- 
-    def has_module_perms(self, app_label):
-        "Does the user have permissions to view the app `app_label`?"
-        # Simplest possible answer: Yes, always
-        return True
-        
+    # ✅ 新增：账号过期字段
+    expire_at = models.DateTimeField(verbose_name='账号过期时间', null=True, blank=True)
 
+    objects = MyUserManager()
+
+    USERNAME_FIELD = 'username'
+    REQUIRED_FIELDS = ['password']
+
+    def get_full_name(self):
+        return self.username
+
+    def get_short_name(self):
+        return self.username
+
+    def __str__(self):
+        return self.username
+
+    def has_perm(self, perm, obj=None):
+        return True
+
+    def has_module_perms(self, app_label):
+        return True
 
     @property
     def is_staff(self):
-        "Is the user a member of staff?"
-        # Simplest possible answer: All admins are staff 
         return self.is_admin
 
     class Meta:
-    
         verbose_name = _("用户")
         verbose_name_plural = _("用户列表")
         permissions = (
@@ -86,4 +69,3 @@ class UserProfile(AbstractBaseUser, PermissionsMixin):
             ("change_task_status", "Can change the status of tasks"),
             ("close_task", "Can remove a task by setting its status as closed"),
         )
-

api/views_api.py

@@ -42,6 +42,10 @@ def login(request):
     if not user:
         result['error'] = _('帐号或密码错误！请重试，多次重试后将被锁定IP！')
         return JsonResponse(result)
+    # 加入过期时间判断
+    if user.expire_at and user.expire_at < datetime.datetime.now(datetime.timezone.utc):
+        result['error'] = _('账号已过期，请联系管理员续费。')
+        return JsonResponse(result)
     user.rid = rid
     user.uuid = uuid
     user.autoLogin = autoLogin