新增用户信息修改

Author: TommyMerlin

auth.py

@@ -135,22 +135,56 @@ def update_user_profile(user_id, data):
         if not user:
             return None, '用户不存在'
 
-        # 更新允许的字段
-        if 'email' in data:
+        password_changed = False
+
+        # 更新用户名
+        if 'username' in data and data['username'] != user.username:
+            # 检查用户名是否已被其他用户使用
+            existing_user = db.query(User).filter(
+                User.username == data['username'],
+                User.id != user_id
+            ).first()
+            if existing_user:
+                return None, '用户名已存在'
+            user.username = data['username']
+
+        # 更新邮箱
+        if 'email' in data and data['email'] != user.email:
             # 检查邮箱是否已被其他用户使用
             existing_user = db.query(User).filter(
                 User.email == data['email'],
                 User.id != user_id
             ).first()
             if existing_user:
-                return None, '邮箱已被使用'
+                return None, '邮箱已存在'
             user.email = data['email']
 
-        if 'password' in data:
-            user.set_password(data['password'])
+        # 更新密码（需要验证旧密码）
+        if 'new_password' in data and data['new_password']:
+            # 验证新密码长度
+            if len(data['new_password']) < 8:
+                return None, '新密码长度至少8位'
+            
+            # 验证旧密码
+            old_password = data.get('old_password', '')
+            if not old_password:
+                return None, '修改密码需要提供旧密码'
+            
+            if not user.check_password(old_password):
+                return None, '旧密码错误'
+            
+            # 更新密码
+            user.set_password(data['new_password'])
+            password_changed = True
 
         db.commit()
 
-        return {
+        result = {
             'user': user.to_dict()
-        }, None
+        }
+        
+        # 如果修改了密码，返回标识
+        if password_changed:
+            result['password_changed'] = True
+
+        return result, None

static/css/styles.css

@@ -223,6 +223,22 @@ header p {
     transform: translateY(-2px);
 }
 
+/* 设置按钮样式 */
+.settings-btn {
+    background: rgba(255, 255, 255, 0.15);
+    color: white;
+    border: none;
+    padding: 6px 18px;
+    border-radius: 999px;
+    cursor: pointer;
+    transition: background 0.3s, transform 0.3s;
+}
+
+.settings-btn:hover {
+    background: rgba(255, 255, 255, 0.3);
+    transform: translateY(-2px);
+}
+
 .main-content {
     display: grid;
     grid-template-columns: minmax(0, 1fr) minmax(0, 1.15fr);
@@ -360,6 +376,15 @@ header p {
     resize: vertical;
 }
 
+/* 表单提示文字样式 */
+.form-hint {
+    display: block;
+    margin-top: 5px;
+    font-size: 0.9em;
+    color: #666;
+    line-height: 1.5;
+}
+
 .config-fields {
     background: rgba(99, 102, 241, 0.05);
     padding: 18px;

static/index.html

@@ -113,6 +113,7 @@ <h1>📬 消息推送系统</h1>
                     <input type="file" id="importFileInput" accept=".json" style="display: none;" onchange="importData(event)">
                     <button id="openCalendarBtn" class="btn btn-sm btn-ghost" onclick="openCalendarView()">📅 日历</button>
                     <button id="syncBtn" class="btn btn-sm btn-ghost" onclick="openSyncModal()">🔄 订阅</button>
+                    <button class="settings-btn" onclick="openUserSettingsModal()">⚙️ 设置</button>
                     <button class="logout-btn" onclick="logout()">退出</button>
                 </div>
             </header>
@@ -482,6 +483,48 @@ <h2>编辑任务</h2>
         </div>
     </div>
 
+    <!-- 用户设置模态框 -->
+    <div id="userSettingsModal" class="modal">
+        <div class="modal-content">
+            <span class="close" onclick="closeUserSettingsModal()">&times;</span>
+            <h2>⚙️ 用户设置</h2>
+            <form id="userSettingsForm" onsubmit="handleUserSettingsSubmit(event)">
+                <div class="form-group">
+                    <label for="settingsUsername">用户名 *</label>
+                    <input type="text" id="settingsUsername" name="username" maxlength="50" placeholder="请输入用户名" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="settingsEmail">邮箱 *</label>
+                    <input type="email" id="settingsEmail" name="email" placeholder="请输入邮箱" required>
+                </div>
+
+                <div class="form-group">
+                    <label for="settingsOldPassword">旧密码</label>
+                    <input type="password" id="settingsOldPassword" name="old_password" placeholder="仅修改密码时需要填写">
+                    <small class="form-hint">仅在修改密码时需要填写</small>
+                </div>
+
+                <div class="form-group">
+                    <label for="settingsNewPassword">新密码</label>
+                    <input type="password" id="settingsNewPassword" name="new_password" minlength="8" placeholder="留空表示不修改，最少8位">
+                    <small class="form-hint">留空表示不修改密码，修改时最少8位</small>
+                </div>
+
+                <div class="form-group">
+                    <label for="settingsConfirmPassword">确认新密码</label>
+                    <input type="password" id="settingsConfirmPassword" name="confirm_password" minlength="8" placeholder="再次输入新密码">
+                    <small class="form-hint">请再次输入新密码以确认</small>
+                </div>
+
+                <div class="form-actions">
+                    <button type="button" class="btn btn-secondary" onclick="closeUserSettingsModal()">取消</button>
+                    <button type="submit" class="btn btn-primary">保存设置</button>
+                </div>
+            </form>
+        </div>
+    </div>
+
     <!-- 添加：视图切换控制（在加载 app.js 和 calendar.js 之前） -->
     <script>
     // filepath: /Users/7ommmy/Code/DIY/Notify-Scheduler/static/index.html

static/js/app.js

@@ -2819,3 +2819,151 @@ window.addEventListener('click', function(event) {
         closeLogsModal();
     }
 });
+// ============= 用户设置功能 =============
+
+// 打开用户设置模态框
+async function openUserSettingsModal() {
+    try {
+        // 获取当前用户信息
+        const response = await fetch(`${API_BASE}/auth/profile`, {
+            method: 'GET',
+            headers: {
+                'Authorization': `Bearer ${localStorage.getItem('token')}`
+            }
+        });
+
+        if (response.ok) {
+            const data = await response.json();
+            const user = data.user;
+            
+            // 填充表单
+            document.getElementById('settingsUsername').value = user.username || '';
+            document.getElementById('settingsEmail').value = user.email || '';
+            document.getElementById('settingsOldPassword').value = '';
+            document.getElementById('settingsNewPassword').value = '';
+            document.getElementById('settingsConfirmPassword').value = '';
+            
+            // 显示模态框
+            document.getElementById('userSettingsModal').style.display = 'block';
+        } else {
+            const error = await response.json();
+            showNotification(error.error || '获取用户信息失败', 'error');
+        }
+    } catch (error) {
+        console.error('打开用户设置失败:', error);
+        showNotification('打开用户设置失败', 'error');
+    }
+}
+
+// 关闭用户设置模态框
+function closeUserSettingsModal() {
+    document.getElementById('userSettingsModal').style.display = 'none';
+    // 清空密码字段
+    document.getElementById('settingsOldPassword').value = '';
+    document.getElementById('settingsNewPassword').value = '';
+    document.getElementById('settingsConfirmPassword').value = '';
+}
+
+// 处理用户设置提交
+async function handleUserSettingsSubmit(event) {
+    event.preventDefault();
+    
+    const username = document.getElementById('settingsUsername').value.trim();
+    const email = document.getElementById('settingsEmail').value.trim();
+    const oldPassword = document.getElementById('settingsOldPassword').value;
+    const newPassword = document.getElementById('settingsNewPassword').value;
+    const confirmPassword = document.getElementById('settingsConfirmPassword').value;
+    
+    // 验证用户名和邮箱
+    if (!username) {
+        showNotification('用户名不能为空', 'error');
+        return;
+    }
+    
+    if (!email) {
+        showNotification('邮箱不能为空', 'error');
+        return;
+    }
+    
+    // 验证邮箱格式
+    if (!email.includes('@')) {
+        showNotification('请输入有效的邮箱地址', 'error');
+        return;
+    }
+    
+    // 构建更新数据
+    const updateData = {
+        username: username,
+        email: email
+    };
+    
+    // 如果填写了新密码，进行密码相关验证
+    if (newPassword) {
+        // 验证新密码长度
+        if (newPassword.length < 8) {
+            showNotification('新密码长度至少8位', 'error');
+            return;
+        }
+        
+        // 验证确认密码
+        if (newPassword !== confirmPassword) {
+            showNotification('两次输入的新密码不一致', 'error');
+            return;
+        }
+        
+        // 验证是否填写旧密码
+        if (!oldPassword) {
+            showNotification('修改密码需要输入旧密码', 'error');
+            return;
+        }
+        
+        // 添加密码字段到更新数据
+        updateData.old_password = oldPassword;
+        updateData.new_password = newPassword;
+    }
+    
+    try {
+        const response = await fetch(`${API_BASE}/auth/profile`, {
+            method: 'PUT',
+            headers: {
+                'Authorization': `Bearer ${localStorage.getItem('token')}`,
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(updateData)
+        });
+
+        const result = await response.json();
+
+        if (response.ok) {
+            showNotification(result.message || '更新成功', 'success');
+            closeUserSettingsModal();
+            
+            // 更新页面显示的用户名
+            if (currentUser && updateData.username !== currentUser.username) {
+                currentUser.username = updateData.username;
+                document.getElementById('currentUsername').textContent = updateData.username;
+            }
+            
+            // 如果修改了密码，强制重新登录
+            if (result.data && result.data.password_changed) {
+                showNotification('密码已修改，请重新登录', 'info');
+                setTimeout(() => {
+                    logout();
+                }, 1500);
+            }
+        } else {
+            showNotification(result.error || '更新失败', 'error');
+        }
+    } catch (error) {
+        console.error('更新用户设置失败:', error);
+        showNotification('更新用户设置失败', 'error');
+    }
+}
+
+// 点击模态框外部关闭用户设置
+window.addEventListener('click', function(event) {
+    const userSettingsModal = document.getElementById('userSettingsModal');
+    if (event.target === userSettingsModal) {
+        closeUserSettingsModal();
+    }
+});

version.yml

@@ -1 +1 @@
-version: 0.9.2
+version: 1.0.0