bluish/ai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
liangweihao
2025-07-08 16:44:04 +08:00
parent aa2416c5d6
commit 1af79c4111
22 changed files with 400 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/controllers/accountController.ts
View File

@@ -51,8 +51,6 @@ export const accountController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
}
}
}

10
backend/src/controllers/authController.ts
View File

@@ -46,7 +46,7 @@ async function createSession(userId: string, token: string, req: Request) {
export const authController = {
// 用户注册
async register(req: Request, res: Response) {
const { username, password, confirmPassword, firstName, lastName } = req.body;
const { username, password, confirmPassword } = req.body;
// 验证密码确认
if (password !== confirmPassword) {
@@ -74,8 +74,6 @@ export const authController = {
data: {
username,
password: hashedPassword,
firstName,
lastName,
isActive: false, // 新注册用户默认为禁用状态
},
});
@@ -97,8 +95,6 @@ export const authController = {
user: {
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
isAdmin: user.isAdmin,
isActive: user.isActive,
}
@@ -237,8 +233,6 @@ export const authController = {
user: {
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
isAdmin: user.isAdmin,
}
});
@@ -283,8 +277,6 @@ export const authController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
isAdmin: true,
isActive: true,
lastLoginAt: true,

36
backend/src/controllers/userController.ts
View File

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
import { prisma } from '../config/database';
import { AuthRequest } from '../middleware/auth';
import bcrypt from 'bcryptjs';
import type { PrismaClient } from '@prisma/client';
export const userController = {
// 获取所有用户 (管理员)
@@ -18,8 +19,6 @@ export const userController = {
if (search) {
where.OR = [
{ username: { contains: search as string, mode: 'insensitive' } },
{ firstName: { contains: search as string, mode: 'insensitive' } },
{ lastName: { contains: search as string, mode: 'insensitive' } }
];
}
@@ -40,11 +39,8 @@ export const userController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
isAdmin: true,
isActive: true,
totpEnabled: true,
lastLoginAt: true,
createdAt: true,
accountAssignments: {
@@ -65,12 +61,9 @@ export const userController = {
users: users.map((user: any) => ({
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
role: user.isAdmin ? 'admin' : 'user',
isAdmin: user.isAdmin,
isActive: user.isActive,
totpEnabled: user.totpEnabled,
lastLoginAt: user.lastLoginAt,
createdAt: user.createdAt,
accounts: user.accountAssignments.map((assignment: any) => assignment.accountId)
@@ -102,11 +95,8 @@ export const userController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
isAdmin: true,
isActive: true,
totpEnabled: true,
lastLoginAt: true,
createdAt: true,
}
@@ -120,11 +110,8 @@ export const userController = {
user: {
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
isAdmin: user.isAdmin,
isActive: user.isActive,
totpEnabled: user.totpEnabled,
lastLoginAt: user.lastLoginAt,
createdAt: user.createdAt
}
@@ -134,9 +121,7 @@ export const userController = {
// 更新用户信息
async updateUser(req: AuthRequest, res: Response) {
const { id } = req.params;
const { username, role, firstName, lastName, isActive, loginAttempts } = req.body;
console.log('收到更新请求:', req.body);
const { username, role, isActive, loginAttempts } = req.body;
if (!id) {
return res.status(400).json({ error: '用户ID是必需的' });
@@ -157,9 +142,6 @@ export const userController = {
if (typeof isActive === 'boolean') updateData.isActive = isActive;
}
// 普通用户可以修改这些字段
if (firstName !== undefined) updateData.firstName = firstName;
if (lastName !== undefined) updateData.lastName = lastName;
// 新增：处理密码修改
if (req.body.password && typeof req.body.password === 'string' && req.body.password.trim() !== '') {
@@ -191,11 +173,8 @@ export const userController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
isAdmin: true,
isActive: true,
totpEnabled: true,
lastLoginAt: true,
createdAt: true,
password: true,
@@ -207,11 +186,8 @@ export const userController = {
user: {
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
isAdmin: user.isAdmin,
isActive: user.isActive,
totpEnabled: user.totpEnabled,
lastLoginAt: user.lastLoginAt,
createdAt: user.createdAt,
password: user.password,
@@ -254,7 +230,7 @@ export const userController = {
}
// 使用事务来确保数据一致性
await prisma.$transaction(async (tx) => {
await prisma.$transaction(async (tx: PrismaClient) => {
// 删除用户现有的所有账号分配
await tx.accountAssignment.deleteMany({
where: { userId: id }
@@ -336,11 +312,8 @@ export const userController = {
select: {
id: true,
username: true,
firstName: true,
lastName: true,
isAdmin: true,
isActive: true,
totpEnabled: true,
lastLoginAt: true,
createdAt: true,
}
@@ -351,12 +324,9 @@ export const userController = {
user: {
id: user.id,
username: user.username,
firstName: user.firstName,
lastName: user.lastName,
role: user.isAdmin ? 'admin' : 'user',
isAdmin: user.isAdmin,
isActive: user.isActive,
totpEnabled: user.totpEnabled,
lastLoginAt: user.lastLoginAt,
createdAt: user.createdAt
}