diff --git a/backend/routes/external.js b/backend/routes/external.js index 25ce6b2..6022c9a 100644 --- a/backend/routes/external.js +++ b/backend/routes/external.js @@ -50,7 +50,7 @@ router.post('/auth/login', async (req, res) => { if (!user || !(await bcrypt.compare(password, user.password))) return res.status(401).json({ error: '用户名或密码错误' }); if (!user.active) return res.status(403).json({ error: '账号未激活' }); const token = generateToken(user); - res.json({ token, user: { id:user.id, username:user.username, game_name:user.game_name, game_uid:user.game_uid, role:user.role } }); + res.json({ token, user: { id:user.id, username:user.username, game_name:user.game_name, game_uid:user.game_uid, role:user.role, source:user.source } }); } catch (e) { res.status(500).json({ error: '服务器错误' }); } }); diff --git a/backend/routes/users.js b/backend/routes/users.js index 402e489..2e8d40a 100644 --- a/backend/routes/users.js +++ b/backend/routes/users.js @@ -6,23 +6,23 @@ const { authenticate, requireRole } = require('../middleware/auth'); const router = express.Router(); router.get('/', authenticate, requireRole('owner','admin'), async (req, res) => { - res.json(await query('SELECT id, username, email, game_name, game_uid, role, active, email_verified, created_at FROM users ORDER BY created_at DESC')); + res.json(await query('SELECT id, username, email, game_name, game_uid, source, role, active, email_verified, created_at FROM users ORDER BY created_at DESC')); }); router.get('/:id', authenticate, requireRole('owner','admin'), async (req, res) => { - const u = await getRow('SELECT id, username, email, game_name, game_uid, role, active, email_verified, created_at FROM users WHERE id = ?', [req.params.id]); + const u = await getRow('SELECT id, username, email, game_name, game_uid, source, role, active, email_verified, created_at FROM users WHERE id = ?', [req.params.id]); if (!u) return res.status(404).json({ error: '用户不存在' }); res.json(u); }); router.post('/', authenticate, requireRole('owner','admin'), async (req, res) => { - const { username, password, email, game_name, game_uid, role } = req.body; + const { username, password, email, game_name, game_uid, role, source } = req.body; if (!username||!password||!email||!game_name||!game_uid||!role) return res.status(400).json({ error: '所有字段必填' }); if (!['owner','admin','player'].includes(role)) return res.status(400).json({ error: '无效角色' }); if (password.length < 6) return res.status(400).json({ error: '密码至少6位' }); if (await getRow('SELECT id FROM users WHERE username = ?', [username])) return res.status(400).json({ error: '用户名已存在' }); const hashed = bcrypt.hashSync(password, 10); - const r = await query('INSERT INTO users(username, password, email, game_name, game_uid, role, active, email_verified) VALUES (?,?,?,?,?,?,1,1)', [username, hashed, email, game_name, game_uid, role]); + const r = await query('INSERT INTO users(username, password, email, game_name, game_uid, role, source, active, email_verified) VALUES (?,?,?,?,?,?,?,1,1)', [username, hashed, email, game_name, game_uid, role, source || 'netease']); await query("INSERT INTO audit_logs(user_id, username, action, entity_type, entity_id, details) VALUES (?,?,?,?,?,?)", [req.user.id, req.user.username, 'create_user', 'user', r.insertId, `创建用户 ${username}`]); res.status(201).json({ id: r.insertId, message: '创建成功' }); }); @@ -35,6 +35,7 @@ router.put('/:id', authenticate, requireRole('owner','admin'), async (req, res) if (req.body.email) fields.email = req.body.email; if (req.body.game_name) fields.game_name = req.body.game_name; if (req.body.game_uid) fields.game_uid = req.body.game_uid; + if (req.body.source) { if (!['netease','skin'].includes(req.body.source)) return res.status(400).json({ error: '无效来源' }); fields.source = req.body.source; } if (req.body.role) { if (!['owner','admin','player'].includes(req.body.role)) return res.status(400).json({ error: '无效角色' }); fields.role = req.body.role; } if (req.body.active !== undefined) fields.active = req.body.active ? 1 : 0; if (req.body.password) { if (req.body.password.length < 6) return res.status(400).json({ error: '密码至少6位' }); fields.password = bcrypt.hashSync(req.body.password, 10); } diff --git a/public/js/pages/users.js b/public/js/pages/users.js index a7f8da0..f587c0e 100644 --- a/public/js/pages/users.js +++ b/public/js/pages/users.js @@ -3,7 +3,7 @@ const UsersPage = { async mount() { document.getElementById('page-title').textContent = '用户管理'; - document.getElementById('page-actions').innerHTML = ''; + document.getElementById('page-actions').innerHTML = ''; await this.load(); }, @@ -11,17 +11,19 @@ const UsersPage = { const ct = document.getElementById('page-content'); try { const users = await API.get('/users'); + const srcLabel = { netease:'网易', skin:'皮肤站' }; ct.innerHTML = `
- + ${users.map(u => ` + - + `).join('')}
#用户名邮箱游戏名游戏UID角色状态时间操作#用户名邮箱游戏名游戏UID来源角色状态时间操作
${u.id}${U.esc(u.username)}${U.esc(u.email)} ${U.esc(u.game_name)}${U.esc(u.game_uid)}${srcLabel[u.source] || u.source || '网易'} ${U.badge(u.role,'role')} ${u.active ? '启用' : '禁用'} ${U.date(u.created_at)}
`; } catch (e) { ct.innerHTML = `
${e.message}
`; } @@ -31,54 +33,46 @@ const UsersPage = { U.modal('添加用户', `
-
+
+
-
+
`); document.getElementById('cu-form').onsubmit = async e => { e.preventDefault(); try { await API.post('/users', { - username: document.getElementById('cu-u').value, - password: document.getElementById('cu-p').value, - email: document.getElementById('cu-e').value, - role: document.getElementById('cu-r').value, - game_name: document.getElementById('cu-gn').value, - game_uid: document.getElementById('cu-gu').value, + username: document.getElementById('cu-u').value, password: document.getElementById('cu-p').value, + email: document.getElementById('cu-e').value, role: document.getElementById('cu-r').value, + game_name: document.getElementById('cu-gn').value, game_uid: document.getElementById('cu-gu').value, + source: document.getElementById('cu-s').value, }); - App.closeModal(); - this.load(); + App.closeModal(); this.load(); } catch (ex) { alert(ex.message); } }; }, - editUser(id, username, email, gameName, gameUid, role, active) { + editUser(id, username, email, gameName, gameUid, role, active, source) { U.modal('编辑用户', `
-
+
+
-
+
`); document.getElementById('eu-form').onsubmit = async e => { e.preventDefault(); const data = { - email: document.getElementById('eu-e').value, - role: document.getElementById('eu-r').value, - game_name: document.getElementById('eu-gn').value, - game_uid: document.getElementById('eu-gu').value, - active: document.getElementById('eu-a').value === '1', + email: document.getElementById('eu-e').value, role: document.getElementById('eu-r').value, + game_name: document.getElementById('eu-gn').value, game_uid: document.getElementById('eu-gu').value, + active: document.getElementById('eu-a').value === '1', source: document.getElementById('eu-s').value, }; - const pw = document.getElementById('eu-p').value; - if (pw) data.password = pw; - try { - await API.put(`/users/${id}`, data); - App.closeModal(); - this.load(); - } catch (ex) { alert(ex.message); } + const pw = document.getElementById('eu-p').value; if (pw) data.password = pw; + try { await API.put(`/users/${id}`, data); App.closeModal(); this.load(); } catch (ex) { alert(ex.message); } }; } };