diff --git a/backend/db.js b/backend/db.js
index b3a1bfc..bd21f76 100644
--- a/backend/db.js
+++ b/backend/db.js
@@ -79,6 +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',
verify_token VARCHAR(255),
verify_expires DATETIME,
reset_token VARCHAR(255),
@@ -262,6 +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(`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/auth.js b/backend/routes/auth.js
index 7fa3949..e408612 100644
--- a/backend/routes/auth.js
+++ b/backend/routes/auth.js
@@ -18,7 +18,7 @@ router.post('/register', validateLengths({
username: 20, password: 100, email: 100, game_name: 50, game_uid: 50,
}), async (req, res) => {
try {
- const { username, password, email, game_name, game_uid, captcha_id, captcha_answer } = req.body;
+ const { username, password, email, game_name, game_uid, captcha_id, captcha_answer, source } = req.body;
if (!username || !password || !email || !game_name || !game_uid) {
return res.status(400).json({ error: '所有字段均为必填' });
@@ -51,8 +51,8 @@ router.post('/register', validateLengths({
const verifyExpires = new Date(Date.now() + 24 * 3600 * 1000).toISOString().replace('T', ' ').slice(0, 19);
await query(
- 'INSERT INTO users(username, password, email, game_name, game_uid, active, email_verified, verify_token, verify_expires) VALUES (?,?,?,?,?,?,?,?,?)',
- [username, hashed, email, game_name, game_uid, 0, 0, verifyToken, verifyExpires]
+ 'INSERT INTO users(username, password, email, game_name, game_uid, active, email_verified, verify_token, verify_expires, source) VALUES (?,?,?,?,?,?,?,?,?,?)',
+ [username, hashed, email, game_name, game_uid, 0, 0, verifyToken, verifyExpires, source || 'netease']
);
const siteUrl = await getSiteUrl();
diff --git a/backend/routes/external.js b/backend/routes/external.js
index dc0b45c..4522959 100644
--- a/backend/routes/external.js
+++ b/backend/routes/external.js
@@ -21,7 +21,7 @@ function externalAuth(req, res, next) {
// ---- Auth (no external key needed) ----
router.post('/auth/register', async (req, res) => {
try {
- const { username, password, email, game_name, game_uid } = req.body;
+ const { username, password, email, game_name, game_uid, source } = req.body;
if (!username || !password || !email || !game_name || !game_uid) 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: '注册失败，请检查输入信息' });
@@ -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) VALUES (?,?,?,?,?,?,DATE_ADD(NOW(), INTERVAL 24 HOUR))', [username, hashed, email, game_name, game_uid, verifyToken]);
+ 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']);
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 ac0e958..964a2e8 100644
--- a/public/js/pages/register.js
+++ b/public/js/pages/register.js
@@ -11,9 +11,12 @@ const RegisterPage = {
+
${this.captcha ? `
@@ -37,13 +40,15 @@ const RegisterPage = {
`;
},
+ toggleSource() {
+ const src = document.getElementById('rs').value;
+ const labels = { netease:['游戏名称','网易UID'], skin:['游戏名称','皮肤站UID'], java:['游戏名称','Minecraft UUID'] };
+ document.getElementById('rs-label1').textContent = labels[src][0] + ' *';
+ document.getElementById('rs-label2').textContent = labels[src][1] + ' *';
+ },
+
async refreshCaptcha() {
- try {
- const c = await API.get('/captcha');
- document.getElementById('captcha-img').innerHTML = c.svg;
- document.getElementById('captcha-id').value = c.id;
- document.getElementById('captcha-a').value = '';
- } catch {}
+ try { const c = await API.get('/captcha'); document.getElementById('captcha-img').innerHTML = c.svg; document.getElementById('captcha-id').value = c.id; document.getElementById('captcha-a').value = ''; } catch {}
},
mount() {
@@ -52,11 +57,9 @@ const RegisterPage = {
const btn = e.target.querySelector('button');
const err = document.getElementById('regerr');
const ok = document.getElementById('regok');
- err.classList.add('hidden');
- ok.classList.add('hidden');
+ err.classList.add('hidden'); ok.classList.add('hidden');
btn.disabled = true;
btn.innerHTML = ' 注册中...';
-
try {
await Auth.register({
username: document.getElementById('ru').value.trim(),
@@ -64,19 +67,16 @@ const RegisterPage = {
email: document.getElementById('re').value.trim(),
game_name: document.getElementById('rgn').value.trim(),
game_uid: document.getElementById('rgu').value.trim(),
+ source: document.getElementById('rs').value,
captcha_id: document.getElementById('captcha-id')?.value,
captcha_answer: document.getElementById('captcha-a')?.value.trim(),
});
- ok.textContent = '注册成功！请查收验证邮件（如SMTP未配置则自动激活）';
+ ok.textContent = '注册成功！' + (document.getElementById('rs').value === 'netease' ? '网易端' : '皮肤站') + '账号已创建，请查收验证邮件或直接登录';
ok.classList.remove('hidden');
- btn.innerHTML = ' 注册';
- btn.disabled = false;
setTimeout(() => location.hash = '#/login', 3000);
} catch (ex) {
- err.textContent = ex.message;
- err.classList.remove('hidden');
- btn.disabled = false;
- btn.innerHTML = ' 注册';
+ err.textContent = ex.message; err.classList.remove('hidden');
+ btn.disabled = false; btn.innerHTML = ' 注册';
}
});
}