diff --git a/hubcmdui/web/js/auth.js b/hubcmdui/web/js/auth.js
index 4b44e27..186ad30 100644
--- a/hubcmdui/web/js/auth.js
+++ b/hubcmdui/web/js/auth.js
@@ -1,5 +1,8 @@
// 用户认证相关功能
+// 存储重置令牌
+let currentResetToken = null;
+
// 登录函数
async function login() {
const username = document.getElementById('username').value;
@@ -82,10 +85,28 @@ async function refreshCaptcha() {
throw new Error(`验证码获取失败: ${response.status}`);
}
const data = await response.json();
- document.getElementById('captchaText').textContent = data.captcha;
+
+ // 更新登录表单验证码
+ const captchaText = document.getElementById('captchaText');
+ if (captchaText) {
+ captchaText.textContent = data.captcha;
+ }
+
+ // 更新忘记密码表单验证码
+ const resetCaptchaText = document.getElementById('resetCaptchaText');
+ if (resetCaptchaText) {
+ resetCaptchaText.textContent = data.captcha;
+ }
} catch (error) {
// console.error('刷新验证码失败:', error);
- document.getElementById('captchaText').textContent = '验证码加载失败，点击重试';
+ const captchaText = document.getElementById('captchaText');
+ if (captchaText) {
+ captchaText.textContent = '验证码加载失败，点击重试';
+ }
+ const resetCaptchaText = document.getElementById('resetCaptchaText');
+ if (resetCaptchaText) {
+ resetCaptchaText.textContent = '验证码加载失败，点击重试';
+ }
}
}
@@ -104,20 +125,171 @@ function showLoginModal() {
}
document.getElementById('loginModal').style.display = 'flex';
+ showLoginForm(); // 确保显示登录表单
refreshCaptcha();
}
+// 显示登录表单
+function showLoginForm() {
+ document.getElementById('loginTitle').textContent = '管理员登录';
+ document.getElementById('loginForm').style.display = 'block';
+ document.getElementById('forgotPasswordForm').style.display = 'none';
+ document.getElementById('resetPasswordForm').style.display = 'none';
+ currentResetToken = null;
+ refreshCaptcha();
+}
+
+// 显示忘记密码表单
+function showForgotPassword() {
+ document.getElementById('loginTitle').textContent = '忘记密码';
+ document.getElementById('loginForm').style.display = 'none';
+ document.getElementById('forgotPasswordForm').style.display = 'block';
+ document.getElementById('resetPasswordForm').style.display = 'none';
+ refreshCaptcha();
+}
+
+// 显示重置密码表单
+function showResetPasswordForm(token) {
+ document.getElementById('loginTitle').textContent = '重置密码';
+ document.getElementById('loginForm').style.display = 'none';
+ document.getElementById('forgotPasswordForm').style.display = 'none';
+ document.getElementById('resetPasswordForm').style.display = 'block';
+
+ if (token) {
+ currentResetToken = token;
+ document.getElementById('tokenValue').textContent = token;
+ document.getElementById('resetTokenDisplay').style.display = 'block';
+ }
+}
+
+// 请求重置令牌
+async function requestResetToken() {
+ const username = document.getElementById('resetUsername').value;
+ const captcha = document.getElementById('resetCaptcha').value;
+
+ if (!username) {
+ core.showAlert('请输入用户名', 'error');
+ return;
+ }
+
+ if (!captcha) {
+ core.showAlert('请输入验证码', 'error');
+ return;
+ }
+
+ try {
+ core.showLoading();
+ const response = await fetch('/api/auth/request-reset-token', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ username, captcha })
+ });
+
+ const data = await response.json();
+
+ if (response.ok) {
+ core.showAlert('重置令牌已生成，有效期10分钟', 'success');
+ showResetPasswordForm(data.token);
+ } else {
+ core.showAlert(data.error || '获取重置令牌失败', 'error');
+ refreshCaptcha();
+ }
+ } catch (error) {
+ core.showAlert('获取重置令牌失败: ' + error.message, 'error');
+ refreshCaptcha();
+ } finally {
+ core.hideLoading();
+ }
+}
+
+// 重置密码
+async function resetPassword() {
+ const newPassword = document.getElementById('resetNewPassword').value;
+ const confirmPassword = document.getElementById('resetConfirmPassword').value;
+
+ if (!newPassword || !confirmPassword) {
+ core.showAlert('请填写所有密码字段', 'error');
+ return;
+ }
+
+ if (newPassword !== confirmPassword) {
+ core.showAlert('两次输入的密码不一致', 'error');
+ return;
+ }
+
+ // 密码复杂度验证
+ const passwordRegex = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[.,\-_+=()[\]{}|\\;:'"<>?/@$!%*#?&])[A-Za-z\d.,\-_+=()[\]{}|\\;:'"<>?/@$!%*#?&]{8,16}$/;
+ if (!passwordRegex.test(newPassword)) {
+ core.showAlert('密码需要8-16位，包含至少一个字母、一个数字和一个特殊字符', 'error');
+ return;
+ }
+
+ if (!currentResetToken) {
+ core.showAlert('重置令牌无效，请重新获取', 'error');
+ showForgotPassword();
+ return;
+ }
+
+ try {
+ core.showLoading();
+ const response = await fetch('/api/auth/reset-password', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({
+ token: currentResetToken,
+ newPassword,
+ confirmPassword
+ })
+ });
+
+ const data = await response.json();
+
+ if (response.ok) {
+ core.showAlert('密码重置成功！请使用新密码登录', 'success');
+ currentResetToken = null;
+ showLoginForm();
+ } else {
+ core.showAlert(data.error || '重置密码失败', 'error');
+ }
+ } catch (error) {
+ core.showAlert('重置密码失败: ' + error.message, 'error');
+ } finally {
+ core.hideLoading();
+ }
+}
+
// 导出模块
const auth = {
init: function() {
// console.log('初始化认证模块...');
- // 在这里可以添加认证模块初始化的相关代码
+ // 初始化忘记密码表单事件
+ const forgotPasswordForm = document.getElementById('forgotPasswordForm');
+ if (forgotPasswordForm) {
+ forgotPasswordForm.addEventListener('submit', function(e) {
+ e.preventDefault();
+ requestResetToken();
+ });
+ }
+
+ const resetPasswordForm = document.getElementById('resetPasswordForm');
+ if (resetPasswordForm) {
+ resetPasswordForm.addEventListener('submit', function(e) {
+ e.preventDefault();
+ resetPassword();
+ });
+ }
+
return Promise.resolve(); // 返回一个已解决的 Promise，保持与其他模块一致
},
login,
logout,
refreshCaptcha,
- showLoginModal
+ showLoginModal,
+ showLoginForm,
+ showForgotPassword,
+ showResetPasswordForm,
+ requestResetToken,
+ resetPassword
};
// 全局公开认证模块
diff --git a/hubcmdui/web/js/userCenter.js b/hubcmdui/web/js/userCenter.js
index 8a8d18a..d7443a9 100644
--- a/hubcmdui/web/js/userCenter.js
+++ b/hubcmdui/web/js/userCenter.js
@@ -163,6 +163,100 @@ function isPasswordComplex(password) {
return passwordRegex.test(password);
}
+// 验证用户名格式
+function isUsernameValid(username) {
+ // 3-20位，只能包含字母、数字和下划线
+ const usernameRegex = /^[a-zA-Z0-9_]{3,20}$/;
+ return usernameRegex.test(username);
+}
+
+// 修改用户名
+async function changeUsername(event) {
+ if (event) {
+ event.preventDefault();
+ }
+
+ const form = document.getElementById('changeUsernameForm');
+ const newUsername = form.querySelector('#ucNewUsername').value;
+ const password = form.querySelector('#ucUsernamePassword').value;
+
+ // 验证表单
+ if (!newUsername || !password) {
+ return core.showAlert('所有字段都不能为空', 'error');
+ }
+
+ // 用户名格式检查
+ if (!isUsernameValid(newUsername)) {
+ return core.showAlert('用户名格式不正确（3-20位，只能包含字母、数字和下划线）', 'error');
+ }
+
+ // 显示加载状态
+ const submitButton = form.querySelector('button[type="submit"]');
+ const originalButtonText = submitButton.innerHTML;
+ submitButton.disabled = true;
+ submitButton.innerHTML = '
提交中...';
+
+ try {
+ const response = await fetch('/api/auth/change-username', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ newUsername,
+ password
+ })
+ });
+
+ // 无论成功与否，去除加载状态
+ submitButton.disabled = false;
+ submitButton.innerHTML = originalButtonText;
+
+ if (!response.ok) {
+ const errorData = await response.json();
+ throw new Error(errorData.error || '修改用户名失败');
+ }
+
+ const data = await response.json();
+
+ // 清空表单
+ form.reset();
+
+ // 设置倒计时并显示
+ let countDown = 5;
+
+ Swal.fire({
+ title: '用户名修改成功',
+ html: `您的用户名已成功修改为
${data.newUsername}，系统将在
${countDown} 秒后自动退出，请使用新用户名重新登录。`,
+ icon: 'success',
+ timer: countDown * 1000,
+ timerProgressBar: true,
+ didOpen: () => {
+ const content = Swal.getHtmlContainer();
+ const timerInterval = setInterval(() => {
+ countDown--;
+ if (content) {
+ const b = content.querySelectorAll('b')[1]; // 获取第二个b标签（倒计时）
+ if (b) {
+ b.textContent = countDown > 0 ? countDown : 0;
+ }
+ }
+ if (countDown <= 0) clearInterval(timerInterval);
+ }, 1000);
+ },
+ allowOutsideClick: false,
+ showConfirmButton: true,
+ confirmButtonText: '确定'
+ }).then((result) => {
+ if (result.dismiss === Swal.DismissReason.timer || result.isConfirmed) {
+ auth.logout();
+ }
+ });
+ } catch (error) {
+ core.showAlert('修改用户名失败: ' + error.message, 'error');
+ }
+}
+
// 检查密码强度
function checkUcPasswordStrength() {
const password = document.getElementById('ucNewPassword').value;
@@ -312,11 +406,20 @@ function loadUserStats() {
const userCenter = {
init: function() {
// console.log('初始化用户中心模块...');
- // 可以在这里调用初始化逻辑，也可以延迟到需要时调用
+ // 初始化修改用户名表单事件
+ const changeUsernameForm = document.getElementById('changeUsernameForm');
+ if (changeUsernameForm) {
+ changeUsernameForm.addEventListener('submit', function(e) {
+ e.preventDefault();
+ changeUsername();
+ });
+ }
return Promise.resolve(); // 返回一个已解决的 Promise，保持与其他模块一致
},
getUserInfo,
changePassword,
+ changeUsername,
+ isUsernameValid,
checkUcPasswordStrength,
initUserCenter,
loadUserStats,