From a34314ac9dbb0f8ec50e4f0bfdd0f5b8ee9392dd Mon Sep 17 00:00:00 2001 From: canglan Date: Wed, 15 Jul 2026 04:53:27 +0800 Subject: [PATCH] feat: admin server assignment in user management --- backend/db.js | 2 ++ backend/routes/users.js | 3 ++- public/js/pages/users.js | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/backend/db.js b/backend/db.js index 1e0ee17..8dec0cd 100644 --- a/backend/db.js +++ b/backend/db.js @@ -80,6 +80,7 @@ async function initSchema(connection) { active TINYINT(1) NOT NULL DEFAULT 0, email_verified TINYINT(1) NOT NULL DEFAULT 0, source ENUM('netease','skin') NOT NULL DEFAULT 'netease', + admin_servers JSON, verify_token VARCHAR(255), verify_expires DATETIME, reset_token VARCHAR(255), @@ -264,6 +265,7 @@ async function migrateAdditions(db) { try { await db.execute("ALTER TABLE tickets MODIFY type ENUM('report','suggestion','appeal','result_appeal') NOT NULL"); } catch {} try { await db.execute("ALTER TABLE tickets MODIFY status ENUM('pending','processing','awaiting_info','appealing','resolved','rejected','closed') NOT NULL"); } catch {} try { await db.execute("ALTER TABLE users ADD COLUMN source ENUM('netease','skin') NOT NULL DEFAULT 'netease'"); } catch {} + try { await db.execute("ALTER TABLE users ADD COLUMN admin_servers JSON"); } catch {} try { await db.execute(`CREATE TABLE IF NOT EXISTS polls (id INT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(200) NOT NULL, description TEXT, options JSON NOT NULL, group_name VARCHAR(100) NOT NULL DEFAULT '', server_name VARCHAR(100) NOT NULL DEFAULT '', start_time DATETIME, end_time DATETIME, active TINYINT(1) NOT NULL DEFAULT 1, created_by INT, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_active (active), INDEX idx_group_server (group_name, server_name)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`); } catch {} try { await db.execute(`CREATE TABLE IF NOT EXISTS poll_votes (id INT AUTO_INCREMENT PRIMARY KEY, poll_id INT NOT NULL, user_id INT NOT NULL, option_index INT NOT NULL, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_poll_user (poll_id, user_id), INDEX idx_poll (poll_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4`); } catch {} diff --git a/backend/routes/users.js b/backend/routes/users.js index 2e8d40a..1f79e0e 100644 --- a/backend/routes/users.js +++ b/backend/routes/users.js @@ -6,7 +6,7 @@ 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, source, 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, admin_servers, email_verified, created_at FROM users ORDER BY created_at DESC')); }); router.get('/:id', authenticate, requireRole('owner','admin'), async (req, res) => { @@ -36,6 +36,7 @@ router.put('/:id', authenticate, requireRole('owner','admin'), async (req, res) 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.admin_servers !== undefined) fields.admin_servers = JSON.stringify(req.body.admin_servers); 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 f587c0e..5501e00 100644 --- a/public/js/pages/users.js +++ b/public/js/pages/users.js @@ -54,25 +54,42 @@ const UsersPage = { }, editUser(id, username, email, gameName, gameUid, role, active, source) { + this.loadUserServers(id, username, email, gameName, gameUid, role, active, source); + }, + + async loadUserServers(id, username, email, gameName, gameUid, role, active, source) { + let groups = [], userServers = []; + try { groups = await API.get('/polls/groups'); } catch {} + try { const u = await API.get('/users/'+id); userServers = u.admin_servers ? (typeof u.admin_servers==='string'?JSON.parse(u.admin_servers):u.admin_servers) : []; } catch {} + const checks = groups.map(g => { + const key = g.group_name+'::'+g.server_name; + const has = userServers.some(s => s.group_name===g.group_name && s.server_name===g.server_name); + return ``; + }).join(''); + U.modal('编辑用户', `
+
${checks||'无可用服务器（先在投票→分组管理中添加）'}
`); document.getElementById('eu-form').onsubmit = async e => { e.preventDefault(); + const servers = []; + document.querySelectorAll('.eu-srv:checked').forEach(cb => { const [g,s] = cb.value.split('::'); servers.push({group_name:g,server_name:s}); }); 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', source: document.getElementById('eu-s').value, + admin_servers: servers, }; 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); } + try { await API.put('/users/'+id, data); App.closeModal(); this.load(); } catch (ex) { alert(ex.message); } }; } };