diff --git a/backend/db.js b/backend/db.js index bd21f76..1e0ee17 100644 --- a/backend/db.js +++ b/backend/db.js @@ -79,7 +79,7 @@ async function initSchema(connection) { role ENUM('owner','admin','player') NOT NULL DEFAULT 'player', active TINYINT(1) NOT NULL DEFAULT 0, email_verified TINYINT(1) NOT NULL DEFAULT 0, - source ENUM('netease','skin','java') NOT NULL DEFAULT 'netease', + source ENUM('netease','skin') NOT NULL DEFAULT 'netease', verify_token VARCHAR(255), verify_expires DATETIME, reset_token VARCHAR(255), @@ -263,7 +263,7 @@ async function migrateAdditions(db) { try { await db.execute("ALTER TABLE tickets ADD COLUMN parent_ticket_id INT"); } catch {} 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','java') NOT NULL DEFAULT 'netease'"); } catch {} + try { await db.execute("ALTER TABLE users ADD COLUMN source ENUM('netease','skin') NOT NULL DEFAULT 'netease'"); } 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/external.js b/backend/routes/external.js index 4522959..25ce6b2 100644 --- a/backend/routes/external.js +++ b/backend/routes/external.js @@ -29,7 +29,7 @@ router.post('/auth/register', async (req, res) => { const hashed = bcrypt.hashSync(password, 10); const verifyToken = uuid(); - await query('INSERT INTO users(username,password,email,game_name,game_uid,verify_token,verify_expires,source) VALUES (?,?,?,?,?,?,DATE_ADD(NOW(), INTERVAL 24 HOUR),?)', [username, hashed, email, game_name, game_uid, verifyToken, source || 'java']); + await query('INSERT INTO users(username,password,email,game_name,game_uid,verify_token,verify_expires,source) VALUES (?,?,?,?,?,?,DATE_ADD(NOW(), INTERVAL 24 HOUR),?)', [username, hashed, email, game_name, game_uid, verifyToken, source || 'skin']); const site = await getRow("SELECT v FROM settings WHERE k='site_url'"); const sent = await sendEmail(email, 'verify_email', { username, game_name, game_uid, verify_link: `${site?.v||'http://localhost:3100'}#/verify?token=${verifyToken}` }); diff --git a/public/js/pages/register.js b/public/js/pages/register.js index 964a2e8..e13fa39 100644 --- a/public/js/pages/register.js +++ b/public/js/pages/register.js @@ -12,7 +12,7 @@ const RegisterPage = {