diff --git a/README.md b/README.md index 64a2684..c4d2a11 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ - **Excel 导入导出** — 批量导入(分类不存在自动创建)、筛选导出、模板下载 - **多维度搜索** — 按编号/名称/部门/维护人/位置搜索,按分类/状态/位置筛选 - **质保提醒** — 已过保/即将过保状态标识 +- **用户管理** — 超级管理员可查看用户列表、搜索筛选、为任意用户重置密码(密码强度校验,重置自身不掉登录) - **用户认证** — 登录/退出,管理员权限控制 - **深色主题** — 护眼深色 UI,适合长时间使用 @@ -120,6 +121,16 @@ DATABASES = { | DJANGO_DEBUG | False | 调试模式 | | DJANGO_SECRET_KEY | your-secret-key... | Django 密钥 | +## 👥 用户管理 + +- 超级管理员登录后,导航栏可见 **用户管理** 入口(路径 `/users/`) +- 支持按用户名 / 姓名 / 邮箱搜索,按账号状态(正常/已禁用)筛选 +- 点击"重置密码"可为任意用户设置新密码: + - 两次密码必须一致 + - 应用 Django 密码强度校验(最少 8 位、不能与用户信息过于相似、不能是常见/纯数字密码) + - 管理员重置自己的密码后当前登录不会失效 +- 该功能仅 **超级管理员(is_superuser)** 可访问,其他用户访问会被拒绝 + ## 📊 Excel 导入格式 | 资产编号 | 设备名称 | 分类 | 品牌 | 型号 | 资产面值 | 序列号 | 状态 | IP地址 | BMC地址 | 设备位置 | 负责人 | 使用部门 | 维护人 | 采购日期 | 质保到期 | 备注 | @@ -137,7 +148,7 @@ asset-management/ ├── assetapp/ # 主应用 │ ├── models.py # 数据模型 │ ├── views.py # 视图逻辑 -│ ├── forms.py # 表单定义 +│ ├── forms.py # 表单定义(含管理员重置密码表单) │ ├── excel_utils.py # Excel 导入导出工具 │ ├── urls.py # URL 路由 │ ├── management/commands/ # 管理命令 @@ -147,7 +158,7 @@ asset-management/ │ ├── settings.py │ ├── urls.py │ └── wsgi.py -├── templates/assetapp/ # HTML 模板 +├── templates/assetapp/ # HTML 模板(含 user_list / user_password_reset) ├── static/css/ # 静态资源 ├── docker-compose.yml # Docker 编排 ├── Dockerfile # 容器构建 @@ -158,6 +169,11 @@ asset-management/ ## 📝 版本历史 +### v1.1.0 + +- 新增用户管理:超级管理员可查看用户列表、搜索筛选、重置任意用户密码 +- 补充密码强度校验配置 + ### v1.0.0 - 资产增删改查 diff --git a/assetapp/forms.py b/assetapp/forms.py index 7ed2b0c..130cb41 100644 --- a/assetapp/forms.py +++ b/assetapp/forms.py @@ -1,4 +1,5 @@ from django import forms +from django.contrib.auth.password_validation import password_validators_help_text_html, validate_password from .models import Asset, Category @@ -33,3 +34,39 @@ class CategoryForm(forms.ModelForm): class Meta: model = Category fields = ['name', 'description'] + + +class AdminPasswordResetForm(forms.Form): + """管理员重置指定用户密码的表单""" + + new_password1 = forms.CharField( + label='新密码', + widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}), + help_text=password_validators_help_text_html(), + ) + new_password2 = forms.CharField( + label='确认新密码', + widget=forms.PasswordInput(attrs={'class': 'form-control', 'autocomplete': 'new-password'}), + ) + + def __init__(self, *args, target_user=None, **kwargs): + self.target_user = target_user + super().__init__(*args, **kwargs) + + def clean(self): + cleaned_data = super().clean() + password1 = cleaned_data.get('new_password1') + password2 = cleaned_data.get('new_password2') + + if password1 and password2 and password1 != password2: + raise forms.ValidationError('两次输入的密码不一致') + + if password1 and self.target_user is not None: + validate_password(password1, self.target_user) + + return cleaned_data + + def save(self): + self.target_user.set_password(self.cleaned_data['new_password1']) + self.target_user.save(update_fields=['password']) + return self.target_user diff --git a/assetapp/urls.py b/assetapp/urls.py index ec57d49..7c9fdf1 100644 --- a/assetapp/urls.py +++ b/assetapp/urls.py @@ -29,4 +29,8 @@ urlpatterns = [ path('categories/create/', views.category_create, name='category_create'), path('categories//edit/', views.category_update, name='category_update'), path('categories//delete/', views.category_delete, name='category_delete'), + + # 用户管理(仅超级管理员) + path('users/', views.user_list, name='user_list'), + path('users//password/', views.admin_password_reset, name='admin_password_reset'), ] diff --git a/assetapp/views.py b/assetapp/views.py index 41baf72..6a408ae 100644 --- a/assetapp/views.py +++ b/assetapp/views.py @@ -1,6 +1,7 @@ from django.shortcuts import render, redirect, get_object_or_404 -from django.contrib.auth.decorators import login_required -from django.contrib.auth import authenticate, login, logout +from django.contrib.auth.decorators import login_required, user_passes_test +from django.contrib.auth import authenticate, login, logout, update_session_auth_hash +from django.contrib.auth.models import User from django.contrib import messages from django.http import HttpResponse, JsonResponse from django.db.models import Count, Q @@ -11,7 +12,7 @@ from io import BytesIO from datetime import date, timedelta from .models import Asset, Category, AssetChangeLog -from .forms import AssetForm, AssetImportForm, CategoryForm +from .forms import AssetForm, AssetImportForm, CategoryForm, AdminPasswordResetForm from .excel_utils import ( export_assets_to_excel, generate_import_template, import_assets_from_excel, STATUS_MAP, @@ -437,3 +438,57 @@ def category_delete(request, pk): return redirect('category_list') return render(request, 'assetapp/category_confirm_delete.html', {'category': category}) + + +# ─── 用户管理(仅超级管理员) ─────────────────────── + +superuser_required = user_passes_test(lambda u: u.is_authenticated and u.is_superuser) + + +@superuser_required +def user_list(request): + users = User.objects.order_by('id') + + keyword = request.GET.get('search', '').strip() + if keyword: + users = users.filter( + Q(username__icontains=keyword) | + Q(first_name__icontains=keyword) | + Q(email__icontains=keyword) + ) + + is_active = request.GET.get('is_active') + if is_active in ('1', '0'): + users = users.filter(is_active=(is_active == '1')) + + paginator = Paginator(users, 20) + page_obj = paginator.get_page(request.GET.get('page', 1)) + + context = { + 'page_obj': page_obj, + 'search': keyword, + 'current_is_active': is_active, + } + return render(request, 'assetapp/user_list.html', context) + + +@superuser_required +def admin_password_reset(request, pk): + target_user = get_object_or_404(User, pk=pk) + + if request.method == 'POST': + form = AdminPasswordResetForm(request.POST, target_user=target_user) + if form.is_valid(): + form.save() + + # 如果管理员重置的是自己的密码,保持当前登录会话不失效 + if request.user.pk == target_user.pk: + update_session_auth_hash(request, target_user) + + messages.success(request, f'用户 "{target_user.username}" 的密码已重置') + return redirect('user_list') + else: + form = AdminPasswordResetForm(target_user=target_user) + + context = {'form': form, 'target_user': target_user} + return render(request, 'assetapp/user_password_reset.html', context) diff --git a/config/settings.py b/config/settings.py index c3077bb..36a63e7 100644 --- a/config/settings.py +++ b/config/settings.py @@ -76,6 +76,15 @@ LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/login/' +# Password validation +AUTH_PASSWORD_VALIDATORS = [ + {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'}, + {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + 'OPTIONS': {'min_length': 8}}, + {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'}, + {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'}, +] + # Static files STATIC_URL = '/static/' STATICFILES_DIRS = [BASE_DIR / 'static'] diff --git a/templates/assetapp/base.html b/templates/assetapp/base.html index 7b82427..14dd914 100644 --- a/templates/assetapp/base.html +++ b/templates/assetapp/base.html @@ -43,6 +43,13 @@ 变更记录 + {% if user.is_superuser %} + + {% endif %}