Upload 51 files

pages/Attendance.tsx

@@ -99,7 +99,7 @@ export const AttendancePage: React.FC = () => {
       else if (current === 'Leave') nextStatus = 'Absent';
       else if (current === 'Absent') nextStatus = 'Present';
       if (!current) nextStatus = 'Present';
-      await api.attendance.update({ studentId, date, status: nextStatus as 'Present' | 'Absent' | 'Leave' });
+      await api.attendance.update({ studentId, date, status: nextStatus });
       loadData();
   };
 
@@ -272,4 +272,4 @@ export const AttendancePage: React.FC = () => {
        )}
     </div>
   );
-};
+};

pages/ScoreList.tsx

@@ -126,7 +126,7 @@ export const ScoreList: React.FC = () => {
       semester: importSemester,
       type: formData.type,
       examName: formData.examName,
-      status: formData.status as ExamStatus
+      status: formData.status
     });
     setIsAddOpen(false);
     setFormData({ studentId: '', score: '', type: 'Final', examName: '', status: 'Normal' });
@@ -477,4 +477,4 @@ export const ScoreList: React.FC = () => {
        )}
     </div>
   );
-};
+};

pages/StudentList.tsx

@@ -163,7 +163,7 @@ export const StudentList: React.FC = () => {
       const payload = {
         ...formData,
         birthday: '2015-01-01', 
-        status: 'Enrolled' as const,
+        status: 'Enrolled',
         gender: formData.gender as any
       };
 
@@ -507,4 +507,4 @@ export const StudentList: React.FC = () => {
       )}
     </div> 
   ); 
-};
+};

pages/UserList.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { User, UserRole, UserStatus, School, ClassInfo } from '../types';
 import { api } from '../services/api';
-import { Loader2, Check, X, Trash2, Edit, Briefcase, GraduationCap, AlertCircle, Bot, KeyRound } from 'lucide-react';
+import { Loader2, Check, X, Trash2, Edit, Briefcase, GraduationCap, AlertCircle, Bot } from 'lucide-react';
 
 export const UserList: React.FC = () => {
   const [users, setUsers] = useState<User[]>([]);
@@ -51,16 +51,6 @@ export const UserList: React.FC = () => {
     }
   };
 
-  const handleResetPassword = async (user: User) => {
-      if (!confirm(`确定要重置 ${user.trueName || user.username} 的密码为 123456 吗？`)) return;
-      try {
-          await api.users.resetPassword(user._id || String(user.id));
-          alert('密码已重置为 123456');
-      } catch (e: any) {
-          alert('重置失败: ' + e.message);
-      }
-  };
-
   const handleRoleChange = async (user: User, newRole: UserRole) => {
     if (user.username === 'admin') return alert('无法修改超级管理员');
     if (isPrincipal && newRole === UserRole.ADMIN) return alert('权限不足：校长无法将用户提升为超级管理员');
@@ -124,7 +114,6 @@ export const UserList: React.FC = () => {
 
      if (isTeacher) {
         if (user.role !== UserRole.STUDENT) return false;
-        // Strict homeroom filter for teachers viewing the list
         const teacherClass = (currentUser.homeroomClass || '').trim();
         const studentClass = (user.homeroomClass || '').trim();
         if (teacherClass && studentClass === teacherClass) {
@@ -188,11 +177,6 @@ export const UserList: React.FC = () => {
             {filteredUsers.map(user => {
               const isSelf = !!(currentUser && (user._id === currentUser._id || user.username === currentUser.username));
               const hasApp = user.classApplication && user.classApplication.status === 'PENDING';
-              
-              // Permission Logic for Reset Password Button
-              const canReset = isAdmin || 
-                               (isPrincipal && user.role !== UserRole.ADMIN && user.role !== UserRole.PRINCIPAL) || 
-                               (isTeacher && user.role === UserRole.STUDENT);
 
               return (
               <tr key={user._id || user.id} className="hover:bg-gray-50">
@@ -282,19 +266,12 @@ export const UserList: React.FC = () => {
                     </td>
                 )}
 
-                <td className="px-4 py-3 text-right space-x-2 flex justify-end">
+                <td className="px-4 py-3 text-right space-x-2">
                    {user.status === UserStatus.PENDING && (
                      <button onClick={() => handleApprove(user)} className="text-green-600 hover:bg-green-50 p-1 rounded border border-green-200" title="通过注册审核">
                         <span className="flex items-center text-xs font-bold"><Check size={14} className="mr-1"/> 激活</span>
                      </button>
                    )}
-                   
-                   {canReset && (
-                       <button onClick={() => handleResetPassword(user)} className="text-orange-500 hover:bg-orange-50 p-1.5 rounded" title="重置密码为 123456">
-                           <KeyRound size={18}/>
-                       </button>
-                   )}
-
                    {(isAdmin || isPrincipal) && (
                      <button 
                         onClick={() => handleDelete(user)} 

pages/WishesAndFeedback.tsx

@@ -122,7 +122,7 @@ export const WishesAndFeedback: React.FC = () => {
         const content = type === 'ACADEMIC' ? feedbackContent : wishContent; 
         if (!content.trim()) return alert('请输入内容');
         try {
-            const payload: Partial<Feedback> = { creatorId: type === 'ACADEMIC' ? (studentInfo?._id || String(studentInfo?.id)) : currentUser?._id, creatorName: type === 'ACADEMIC' ? studentInfo?.name : (currentUser?.trueName || currentUser?.username), creatorRole: currentUser?.role, content: content, type: type, status: 'PENDING' as const };
+            const payload: Partial<Feedback> = { creatorId: type === 'ACADEMIC' ? (studentInfo?._id || String(studentInfo?.id)) : currentUser?._id, creatorName: type === 'ACADEMIC' ? studentInfo?.name : (currentUser?.trueName || currentUser?.username), creatorRole: currentUser?.role, content: content, type: type, status: 'PENDING' };
             if (type === 'ACADEMIC') { if (!selectedTeacherId) return alert('请选择反馈对象'); const targetTeacher = teachers.find(t => t._id === selectedTeacherId); payload.targetId = selectedTeacherId; payload.targetName = targetTeacher?.trueName || targetTeacher?.username; } else { payload.targetId = 'ADMIN'; payload.targetName = '系统管理员'; }
             await api.feedback.create(payload); alert('提交成功'); if (type === 'ACADEMIC') setFeedbackContent(''); else setWishContent(''); loadData();
         } catch(e) { alert('提交失败'); }
@@ -182,4 +182,4 @@ export const WishesAndFeedback: React.FC = () => {
             </div>
         </div>
     );
-};
+};

server.js

@@ -48,6 +48,7 @@ const connectDB = async () => {
     await mongoose.connect(MONGO_URI, { serverSelectionTimeoutMS: 30000 });
     console.log('✅ MongoDB 连接成功 (Real Data)');
     
+    // FIX: Drop the restrictive index that prevents multiple schedules per slot
     try {
         await ScheduleModel.collection.dropIndex('schoolId_1_className_1_dayOfWeek_1_period_1');
         console.log('✅ Dropped restrictive schedule index');
@@ -112,61 +113,7 @@ const generateStudentNo = async () => {
 // MOUNT AI ROUTES
 app.use('/api/ai', aiRoutes);
 
-// --- USER MENU ORDER ---
-app.put('/api/users/:id/menu-order', async (req, res) => {
-    const { menuOrder } = req.body;
-    await User.findByIdAndUpdate(req.params.id, { menuOrder });
-    res.json({ success: true });
-});
-
-// --- PASSWORD RESET ENDPOINT ---
-app.post('/api/users/:id/reset-password', async (req, res) => {
-    const targetUserId = req.params.id;
-    const requesterRole = req.headers['x-user-role'];
-    const requesterUsername = req.headers['x-user-username'];
-    const requesterSchoolId = req.headers['x-school-id'];
-
-    try {
-        const targetUser = await User.findById(targetUserId);
-        if (!targetUser) return res.status(404).json({ error: 'Target user not found' });
-
-        const requester = await User.findOne({ username: requesterUsername });
-        if (!requester) return res.status(401).json({ error: 'Requester not found' });
-
-        let hasPermission = false;
-
-        if (requesterRole === 'ADMIN') {
-            // Admins can reset anyone
-            hasPermission = true;
-        } else if (requesterRole === 'PRINCIPAL') {
-            // Principals can reset anyone in their school except other Admins
-            if (targetUser.schoolId === requesterSchoolId && targetUser.role !== 'ADMIN') {
-                hasPermission = true;
-            }
-        } else if (requesterRole === 'TEACHER') {
-            // Teachers can only reset Students in their Homeroom Class
-            if (targetUser.role === 'STUDENT' && requester.homeroomClass) {
-                // Check if student belongs to teacher's homeroom class
-                // User model stores class name in 'homeroomClass' for students as well (from registration/update logic)
-                if (targetUser.homeroomClass === requester.homeroomClass) {
-                    hasPermission = true;
-                }
-            }
-        }
-
-        if (!hasPermission) {
-            return res.status(403).json({ error: 'PERMISSION_DENIED', message: '您没有权限重置该用户的密码' });
-        }
-
-        targetUser.password = '123456';
-        await targetUser.save();
-
-        res.json({ success: true });
-    } catch (e) {
-        console.error("Reset password error:", e);
-        res.status(500).json({ error: e.message });
-    }
-});
+// ... (Rest of Existing Routes) ...
 
 // --- TODO LIST ENDPOINTS ---
 app.get('/api/todos', async (req, res) => {
@@ -195,13 +142,14 @@ app.delete('/api/todos/:id', async (req, res) => {
     res.json({ success: true });
 });
 
-// --- SCHEDULE ENDPOINTS ---
+// --- UPDATED SCHEDULE ENDPOINTS ---
 app.get('/api/schedules', async (req, res) => { 
     const query = { ...getQueryFilter(req), ...req.query }; 
     if (query.grade) { query.className = { $regex: '^' + query.grade }; delete query.grade; } 
     res.json(await ScheduleModel.find(query)); 
 });
 
+// NEW: Update by ID (Exact Update)
 app.put('/api/schedules/:id', async (req, res) => {
     try {
         await ScheduleModel.findByIdAndUpdate(req.params.id, req.body);
@@ -211,8 +159,10 @@ app.put('/api/schedules/:id', async (req, res) => {
     }
 });
 
+// Create or Update by Logic (Upsert)
 app.post('/api/schedules', async (req, res) => { 
     try {
+        // Updated Filter: Include weekType to allow separate ODD/EVEN records for same slot
         const filter = { 
             className: req.body.className, 
             dayOfWeek: req.body.dayOfWeek, 
@@ -225,12 +175,14 @@ app.post('/api/schedules', async (req, res) => {
         await ScheduleModel.findOneAndUpdate(filter, injectSchoolId(req, req.body), {upsert:true}); 
         res.json({}); 
     } catch (e) {
+        console.error("Save schedule error:", e);
         res.status(500).json({ error: e.message });
     }
 });
 
 app.delete('/api/schedules', async (req, res) => { 
     try {
+        // Support deleting by ID if provided
         if (req.query.id) {
             await ScheduleModel.findByIdAndDelete(req.query.id);
         } else {
@@ -242,7 +194,14 @@ app.delete('/api/schedules', async (req, res) => {
     }
 });
 
-// ... (Rest of existing routes)
+// --- USER MENU ORDER ---
+app.put('/api/users/:id/menu-order', async (req, res) => {
+    const { menuOrder } = req.body;
+    await User.findByIdAndUpdate(req.params.id, { menuOrder });
+    res.json({ success: true });
+});
+
+// ... (Rest of existing routes unchanged) ...
 app.get('/api/classes/:className/teachers', async (req, res) => {
     const { className } = req.params;
     const schoolId = req.headers['x-school-id'];
@@ -526,9 +485,13 @@ app.put('/api/classes/:id', async (req, res) => {
         const teachers = await User.find({ _id: { $in: newTeacherIds } }); 
         displayTeacherName = teachers.map(t => t.trueName || t.username).join(', '); 
     } 
+    
+    // FIX: Explicitly update periodConfig if present in the body
     const updatePayload = { grade, className, teacherName: displayTeacherName, homeroomTeacherIds: newTeacherIds };
     if (periodConfig) updatePayload.periodConfig = periodConfig;
+
     await ClassModel.findByIdAndUpdate(classId, updatePayload); 
+    
     if (oldFullClass !== newFullClass) { 
         await Student.updateMany({ className: oldFullClass, schoolId: sId }, { className: newFullClass }); 
         await User.updateMany({ homeroomClass: oldFullClass, schoolId: sId }, { homeroomClass: newFullClass }); 

services/api.ts

@@ -1,74 +1,113 @@
-import { User, Student, ClassInfo, Course, Score, Subject, Exam, Schedule, School, Notification, SystemConfig, GameSession, GameTeam, StudentReward, LuckyDrawConfig, AchievementConfig, AchievementItem, ExchangeRule, TeacherExchangeConfig, StudentAchievement, Attendance, SchoolCalendarEntry, Wish, Feedback, Todo, GameRewardConfig } from '../types';
 
-const API_BASE = '/api';
+// ... existing imports
+import { User, ClassInfo, SystemConfig, Subject, School, Schedule, GameSession, StudentReward, LuckyDrawConfig, Attendance, LeaveRequest, AchievementConfig, SchoolCalendarEntry, TeacherExchangeConfig, Wish, Feedback, AIChatMessage, Todo } from '../types';
 
-const request = async (endpoint: string, options?: RequestInit) => {
-  const token = localStorage.getItem('token');
-  const headers = {
-    'Content-Type': 'application/json',
-    ...(token ? { 'Authorization': `Bearer ${token}` } : {}),
+// ... existing getBaseUrl ...
+const getBaseUrl = () => {
+  let isProd = false;
+  try {
     // @ts-ignore
-    ...(options?.headers || {})
-  };
-
-  const currentSchoolId = localStorage.getItem('admin_view_school_id');
-  if (currentSchoolId) {
-      // @ts-ignore
-      headers['x-school-id'] = currentSchoolId;
+    if (typeof import.meta !== 'undefined' && import.meta.env && import.meta.env.PROD) {
+      isProd = true;
+    }
+  } catch (e) {}
+  
+  if (isProd || (typeof window !== 'undefined' && window.location.port === '7860')) {
+    return '/api';
   }
+  return 'http://localhost:7860/api';
+};
 
-  const response = await fetch(`${API_BASE}${endpoint}`, {
-    ...options,
-    headers
-  });
+const API_BASE_URL = getBaseUrl();
 
-  if (response.status === 401) {
-      localStorage.removeItem('user');
-      localStorage.removeItem('token');
-      // window.location.href = '/login'; 
-      throw new Error('Unauthorized');
+async function request(endpoint: string, options: RequestInit = {}) {
+  const headers: any = { 'Content-Type': 'application/json', ...options.headers };
+  
+  if (typeof window !== 'undefined') {
+    const currentUser = JSON.parse(localStorage.getItem('user') || 'null');
+    const selectedSchoolId = localStorage.getItem('admin_view_school_id');
+    
+    if (currentUser?.role === 'ADMIN' && selectedSchoolId) {
+      headers['x-school-id'] = selectedSchoolId;
+    } else if (currentUser?.schoolId) {
+      headers['x-school-id'] = currentUser.schoolId;
+    }
+    
+    if (currentUser?.role) {
+      headers['x-user-role'] = currentUser.role;
+      headers['x-user-username'] = currentUser.username;
+    }
   }
 
-  const data = await response.json();
-  if (!response.ok) {
-    throw new Error(data.message || data.error || 'API Request Failed');
+  const res = await fetch(`${API_BASE_URL}${endpoint}`, { ...options, headers });
+
+  if (!res.ok) {
+    if (res.status === 401) throw new Error('AUTH_FAILED');
+    const errorData = await res.json().catch(() => ({}));
+    const errorMessage = errorData.error || errorData.message || `Server Error: ${res.status}`;
+    if (errorData.error === 'PENDING_APPROVAL') throw new Error('PENDING_APPROVAL');
+    if (errorData.error === 'BANNED') throw new Error('BANNED');
+    if (errorData.error === 'CONFLICT') throw new Error(errorData.message); 
+    if (errorData.error === 'INVALID_PASSWORD') throw new Error('INVALID_PASSWORD');
+    throw new Error(errorMessage);
   }
-  return data;
-};
+  return res.json();
+}
 
 export const api = {
-  init: () => {
-      // Any initialization logic if needed
-  },
+  init: () => console.log('🔗 API:', API_BASE_URL),
+
   auth: {
-    // @ts-ignore
-    login: async (username, password) => {
-        const res = await request('/auth/login', { method: 'POST', body: JSON.stringify({ username, password }) });
-        localStorage.setItem('user', JSON.stringify(res.user));
-        localStorage.setItem('token', res.token);
-        return res.user;
+    login: async (username: string, password: string): Promise<User> => {
+      const user = await request('/auth/login', { method: 'POST', body: JSON.stringify({ username, password }) });
+      if (typeof window !== 'undefined') {
+        localStorage.setItem('user', JSON.stringify(user));
+        localStorage.removeItem('admin_view_school_id');
+      }
+      return user;
     },
-    // @ts-ignore
-    register: (data) => request('/auth/register', { method: 'POST', body: JSON.stringify(data) }),
-    getCurrentUser: () => {
-        const u = localStorage.getItem('user');
-        return u ? JSON.parse(u) : null;
+    refreshSession: async (): Promise<User | null> => {
+        try {
+            const user = await request('/auth/me');
+            if (typeof window !== 'undefined' && user) {
+                localStorage.setItem('user', JSON.stringify(user));
+            }
+            return user;
+        } catch (e) { return null; }
+    },
+    register: async (data: any): Promise<User> => {
+      return await request('/auth/register', { method: 'POST', body: JSON.stringify(data) });
+    },
+    updateProfile: async (data: any): Promise<any> => {
+      return await request('/auth/update-profile', { method: 'POST', body: JSON.stringify(data) });
     },
     logout: () => {
+      if (typeof window !== 'undefined') {
         localStorage.removeItem('user');
-        localStorage.removeItem('token');
         localStorage.removeItem('admin_view_school_id');
+      }
     },
-    refreshSession: async () => {
+    getCurrentUser: (): User | null => {
+      if (typeof window !== 'undefined') {
         try {
-            const res = await request('/auth/me');
-            localStorage.setItem('user', JSON.stringify(res));
-            return res;
-        } catch (e) { return null; }
-    },
-    // @ts-ignore
-    updateProfile: (data) => request('/auth/profile', { method: 'PUT', body: JSON.stringify(data) }),
+          const stored = localStorage.getItem('user');
+          if (stored) return JSON.parse(stored);
+        } catch (e) {
+          localStorage.removeItem('user');
+        }
+      }
+      return null;
+    }
+  },
+
+  schools: {
+    getPublic: () => request('/public/schools'),
+    getAll: () => request('/schools'),
+    add: (data: School) => request('/schools', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string, data: Partial<School>) => request(`/schools/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string) => request(`/schools/${id}`, { method: 'DELETE' })
   },
+
   users: {
     getAll: (options?: { global?: boolean; role?: string }) => {
        const params = new URLSearchParams();
@@ -81,139 +120,163 @@ export const api = {
     applyClass: (data: { userId: string, type: 'CLAIM'|'RESIGN', targetClass?: string, action: 'APPLY'|'APPROVE'|'REJECT' }) => 
         request('/users/class-application', { method: 'POST', body: JSON.stringify(data) }),
     getTeachersForClass: (className: string) => request(`/classes/${encodeURIComponent(className)}/teachers`),
-    saveMenuOrder: (userId: string, order: string[]) => request(`/users/${userId}/menu-order`, { method: 'PUT', body: JSON.stringify({ menuOrder: order }) }),
-    resetPassword: (id: string) => request(`/users/${id}/reset-password`, { method: 'POST' }),
+    saveMenuOrder: (userId: string, order: string[]) => request(`/users/${userId}/menu-order`, { method: 'PUT', body: JSON.stringify({ menuOrder: order }) }), // NEW
   },
+
   students: {
     getAll: () => request('/students'),
-    add: (data: Partial<Student>) => request('/students', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<Student>) => request(`/students/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/students/${id}`, { method: 'DELETE' }),
-    transfer: (data: { studentId: string, targetClass: string }) => request('/students/transfer', { method: 'POST', body: JSON.stringify(data) }),
-    promote: (options: { teacherFollows: boolean }) => request('/students/promote', { method: 'POST', body: JSON.stringify(options) }),
+    add: (data: any) => request('/students', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string, data: any) => request(`/students/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string | number) => request(`/students/${id}`, { method: 'DELETE' }),
+    promote: (data: { teacherFollows: boolean }) => request('/students/promote', { method: 'POST', body: JSON.stringify(data) }),
+    transfer: (data: { studentId: string, targetClass: string }) => request('/students/transfer', { method: 'POST', body: JSON.stringify(data) })
   },
+
   classes: {
     getAll: () => request('/classes'),
-    add: (data: Partial<ClassInfo>) => request('/classes', { method: 'POST', body: JSON.stringify(data) }),
-    delete: (id: string | number) => request(`/classes/${id}`, { method: 'DELETE' }),
+    add: (data: ClassInfo) => request('/classes', { method: 'POST', body: JSON.stringify(data) }),
+    delete: (id: string | number) => request(`/classes/${id}`, { method: 'DELETE' })
+  },
+
+  subjects: {
+    getAll: () => request('/subjects'),
+    add: (data: Subject) => request('/subjects', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string | number, data: Partial<Subject>) => request(`/subjects/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string | number) => request(`/subjects/${id}`, { method: 'DELETE' })
+  },
+
+  exams: {
+    getAll: () => request('/exams'),
+    save: (data: any) => request('/exams', { method: 'POST', body: JSON.stringify(data) })
   },
+
   courses: {
     getAll: () => request('/courses'),
-    add: (data: Partial<Course>) => request('/courses', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<Course>) => request(`/courses/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/courses/${id}`, { method: 'DELETE' }),
+    add: (data: any) => request('/courses', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string | number, data: any) => request(`/courses/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string | number) => request(`/courses/${id}`, { method: 'DELETE' })
   },
+
   scores: {
     getAll: () => request('/scores'),
-    add: (data: Partial<Score>) => request('/scores', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<Score>) => request(`/scores/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/scores/${id}`, { method: 'DELETE' }),
+    add: (data: any) => request('/scores', { method: 'POST', body: JSON.stringify(data) }),
+    update: (id: string | number, data: any) => request(`/scores/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string | number) => request(`/scores/${id}`, { method: 'DELETE' })
+  },
+  
+  schedules: {
+    get: (params: { className?: string; teacherName?: string; grade?: string }) => {
+       const qs = new URLSearchParams(params as any).toString();
+       return request(`/schedules?${qs}`);
+    },
+    save: (data: Schedule) => request('/schedules', { method: 'POST', body: JSON.stringify(data) }),
+    delete: (params: { className: string; dayOfWeek: number; period: number }) => {
+       const qs = new URLSearchParams(params as any).toString();
+       return request(`/schedules?${qs}`, { method: 'DELETE' });
+    }
   },
+
+  attendance: {
+    checkIn: (data: { studentId: string, date: string, status?: string }) => request('/attendance/check-in', { method: 'POST', body: JSON.stringify(data) }),
+    get: (params: { className?: string, date?: string, studentId?: string }) => {
+        const qs = new URLSearchParams(params as any).toString();
+        return request(`/attendance?${qs}`);
+    },
+    batch: (data: { className: string, date: string, status?: string }) => request('/attendance/batch', { method: 'POST', body: JSON.stringify(data) }),
+    update: (data: { studentId: string, date: string, status: string }) => request('/attendance/update', { method: 'PUT', body: JSON.stringify(data) }),
+    applyLeave: (data: { studentId: string, studentName: string, className: string, reason: string, startDate: string, endDate: string }) => request('/leave', { method: 'POST', body: JSON.stringify(data) }),
+  },
+  
+  calendar: {
+      get: (className: string) => request(`/attendance/calendar?className=${className}`),
+      add: (data: SchoolCalendarEntry) => request('/attendance/calendar', { method: 'POST', body: JSON.stringify(data) }),
+      delete: (id: string) => request(`/attendance/calendar/${id}`, { method: 'DELETE' })
+  },
+
   stats: {
-    getSummary: () => request('/stats/summary'),
+    getSummary: () => request('/stats')
   },
+
   config: {
-    get: () => request('/config'),
-    save: (data: Partial<SystemConfig>) => request('/config', { method: 'PUT', body: JSON.stringify(data) }),
+    get: () => request('/config'), 
     getPublic: () => request('/public/config'),
+    save: (data: SystemConfig) => request('/config', { method: 'POST', body: JSON.stringify(data) })
   },
-  schools: {
-    getAll: () => request('/schools'),
-    getPublic: () => request('/public/schools'),
-    add: (data: Partial<School>) => request('/schools', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<School>) => request(`/schools/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/schools/${id}`, { method: 'DELETE' }),
-  },
+  
   notifications: {
     getAll: (userId: string, role: string) => request(`/notifications?userId=${userId}&role=${role}`),
   },
+
   games: {
-    getMountainSession: (className: string) => request(`/games/mountain?className=${encodeURIComponent(className)}`),
+    getMountainSession: (className: string) => request(`/games/mountain?className=${className}`),
     saveMountainSession: (data: GameSession) => request('/games/mountain', { method: 'POST', body: JSON.stringify(data) }),
-    getLuckyConfig: (className: string, ownerId: string) => request(`/games/lucky/config?className=${encodeURIComponent(className)}&ownerId=${ownerId}`),
-    saveLuckyConfig: (data: LuckyDrawConfig) => request('/games/lucky/config', { method: 'POST', body: JSON.stringify(data) }),
-    drawLucky: (studentId: string) => request('/games/lucky/draw', { method: 'POST', body: JSON.stringify({ studentId }) }),
-    grantReward: (data: { studentId: string, count: number, rewardType: string, name: string }) => request('/games/rewards/grant', { method: 'POST', body: JSON.stringify(data) }),
-    getMonsterConfig: (className: string) => request(`/games/monster/config?className=${encodeURIComponent(className)}`),
-    saveMonsterConfig: (data: any) => request('/games/monster/config', { method: 'POST', body: JSON.stringify(data) }),
-    getZenConfig: (className: string) => request(`/games/zen/config?className=${encodeURIComponent(className)}`),
-    saveZenConfig: (data: any) => request('/games/zen/config', { method: 'POST', body: JSON.stringify(data) }),
+    getLuckyConfig: (className?: string, ownerId?: string) => request(`/games/lucky-config?className=${className || ''}${ownerId ? `&ownerId=${ownerId}` : ''}`),
+    saveLuckyConfig: (data: LuckyDrawConfig) => request('/games/lucky-config', { method: 'POST', body: JSON.stringify(data) }),
+    drawLucky: (studentId: string) => request('/games/lucky-draw', { method: 'POST', body: JSON.stringify({ studentId }) }),
+    grantReward: (data: { studentId: string, count: number, rewardType: string, name?: string }) => request('/games/grant-reward', { method: 'POST', body: JSON.stringify(data) }),
+    getMonsterConfig: (className: string) => request(`/games/monster-config?className=${className}`),
+    saveMonsterConfig: (data: any) => request('/games/monster-config', { method: 'POST', body: JSON.stringify(data) }),
+    getZenConfig: (className: string) => request(`/games/zen-config?className=${className}`),
+    saveZenConfig: (data: any) => request('/games/zen-config', { method: 'POST', body: JSON.stringify(data) }),
   },
+  
   achievements: {
-    getConfig: (className: string) => request(`/achievements/config?className=${encodeURIComponent(className)}`),
-    saveConfig: (data: AchievementConfig) => request('/achievements/config', { method: 'POST', body: JSON.stringify(data) }),
-    getMyRules: () => request('/achievements/my-rules'),
-    saveMyRules: (data: TeacherExchangeConfig) => request('/achievements/my-rules', { method: 'POST', body: JSON.stringify(data) }),
-    grant: (data: { studentId: string, achievementId: string, semester: string }) => request('/achievements/grant', { method: 'POST', body: JSON.stringify(data) }),
-    exchange: (data: { studentId: string, ruleId: string, teacherId?: string }) => request('/achievements/exchange', { method: 'POST', body: JSON.stringify(data) }),
-    getStudentAchievements: (studentId: string, semester: string) => request(`/achievements/student/${studentId}?semester=${encodeURIComponent(semester)}`),
-    getRulesByTeachers: (teacherIds: string[]) => request('/achievements/rules-by-teachers', { method: 'POST', body: JSON.stringify({ teacherIds }) }),
+      getConfig: (className: string) => request(`/achievements/config?className=${className}`),
+      saveConfig: (data: AchievementConfig) => request('/achievements/config', { method: 'POST', body: JSON.stringify(data) }),
+      getStudentAchievements: (studentId: string, semester?: string) => request(`/achievements/student?studentId=${studentId}${semester ? `&semester=${semester}` : ''}`),
+      grant: (data: { studentId: string, achievementId: string, semester: string }) => request('/achievements/grant', { method: 'POST', body: JSON.stringify(data) }),
+      exchange: (data: { studentId: string, ruleId: string, teacherId?: string }) => request('/achievements/exchange', { method: 'POST', body: JSON.stringify(data) }),
+      getMyRules: () => request('/achievements/teacher-rules'),
+      saveMyRules: (data: TeacherExchangeConfig) => request('/achievements/teacher-rules', { method: 'POST', body: JSON.stringify(data) }),
+      getRulesByTeachers: (teacherIds: string[]) => request(`/achievements/teacher-rules?teacherIds=${teacherIds.join(',')}`),
   },
+
   rewards: {
-    getClassRewards: (page: number, limit: number, className: string) => request(`/rewards?page=${page}&limit=${limit}&className=${encodeURIComponent(className)}`),
-    getMyRewards: (studentId: string, page: number, limit: number) => request(`/rewards/my/${studentId}?page=${page}&limit=${limit}`),
+    getMyRewards: (studentId: string, page = 1, limit = 20) => request(`/rewards?studentId=${studentId}&page=${page}&limit=${limit}&excludeType=CONSOLATION`),
+    getClassRewards: (page = 1, limit = 20, className?: string) => {
+        let qs = `scope=class&page=${page}&limit=${limit}&excludeType=CONSOLATION`;
+        if (className) qs += `&className=${className}`;
+        return request(`/rewards?${qs}`);
+    }, 
     addReward: (data: Partial<StudentReward>) => request('/rewards', { method: 'POST', body: JSON.stringify(data) }),
-    redeem: (id: string) => request(`/rewards/${id}/redeem`, { method: 'PUT' }),
-    delete: (id: string) => request(`/rewards/${id}`, { method: 'DELETE' }),
     update: (id: string, data: Partial<StudentReward>) => request(`/rewards/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+    delete: (id: string) => request(`/rewards/${id}`, { method: 'DELETE' }),
+    redeem: (id: string) => request(`/rewards/${id}/redeem`, { method: 'POST' }),
   },
-  calendar: {
-    get: (className?: string) => request(`/calendar?className=${encodeURIComponent(className || '')}`),
-    add: (data: Partial<SchoolCalendarEntry>) => request('/calendar', { method: 'POST', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/calendar/${id}`, { method: 'DELETE' }),
-  },
-  attendance: {
-    get: (params: { className?: string, date?: string, studentId?: string }) => {
-        const qs = new URLSearchParams(params as any).toString();
-        return request(`/attendance?${qs}`);
-    },
-    checkIn: (data: { studentId: string, date: string }) => request('/attendance/checkin', { method: 'POST', body: JSON.stringify(data) }),
-    applyLeave: (data: any) => request('/attendance/leave', { method: 'POST', body: JSON.stringify(data) }),
-    batch: (data: { className: string, date: string }) => request('/attendance/batch', { method: 'POST', body: JSON.stringify(data) }),
-    update: (data: Partial<Attendance>) => request('/attendance/update', { method: 'PUT', body: JSON.stringify(data) }),
-  },
-  schedules: {
-    get: (params: { className: string }) => request(`/schedules?className=${encodeURIComponent(params.className)}`),
-    save: (data: Partial<Schedule>) => request('/schedules', { method: 'POST', body: JSON.stringify(data) }),
-    delete: (params: { className: string, dayOfWeek: number, period: number }) => request(`/schedules/delete`, { method: 'POST', body: JSON.stringify(params) }),
+
+  batchDelete: (type: 'student' | 'score' | 'user', ids: string[]) => {
+    return request('/batch-delete', { method: 'POST', body: JSON.stringify({ type, ids }) });
   },
+
   wishes: {
-    getAll: (params: { studentId?: string, teacherId?: string }) => {
-        const qs = new URLSearchParams(params as any).toString();
-        return request(`/wishes?${qs}`);
-    },
-    create: (data: Partial<Wish>) => request('/wishes', { method: 'POST', body: JSON.stringify(data) }),
-    fulfill: (id: string) => request(`/wishes/${id}/fulfill`, { method: 'PUT' }),
-    randomFulfill: (teacherId: string) => request(`/wishes/random-fulfill`, { method: 'POST', body: JSON.stringify({ teacherId }) }),
+      getAll: (params: { teacherId?: string, studentId?: string, status?: string }) => {
+          const qs = new URLSearchParams(params as any).toString();
+          return request(`/wishes?${qs}`);
+      },
+      create: (data: Partial<Wish>) => request('/wishes', { method: 'POST', body: JSON.stringify(data) }),
+      fulfill: (id: string) => request(`/wishes/${id}/fulfill`, { method: 'POST' }),
+      randomFulfill: (teacherId: string) => request('/wishes/random-fulfill', { method: 'POST', body: JSON.stringify({ teacherId }) }),
   },
+
   feedback: {
-    getAll: (params: any) => {
-        const qs = new URLSearchParams(params).toString();
-        return request(`/feedback?${qs}`);
-    },
-    create: (data: Partial<Feedback>) => request('/feedback', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<Feedback>) => request(`/feedback/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    ignoreAll: (targetId: string) => request(`/feedback/ignore-all`, { method: 'POST', body: JSON.stringify({ targetId }) }),
-  },
-  todos: {
-    getAll: () => request('/todos'),
-    // @ts-ignore
-    add: (content: string) => request('/todos', { method: 'POST', body: JSON.stringify({ content }) }),
-    update: (id: string, data: Partial<Todo>) => request(`/todos/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/todos/${id}`, { method: 'DELETE' }),
-  },
-  subjects: {
-    getAll: () => request('/subjects'),
-    add: (data: Partial<Subject>) => request('/subjects', { method: 'POST', body: JSON.stringify(data) }),
-    update: (id: string, data: Partial<Subject>) => request(`/subjects/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/subjects/${id}`, { method: 'DELETE' }),
-  },
-  exams: {
-    getAll: () => request('/exams'),
-    save: (data: Partial<Exam>) => request('/exams', { method: 'POST', body: JSON.stringify(data) }),
+      getAll: (params: { targetId?: string, creatorId?: string, type?: string, status?: string }) => {
+          const qs = new URLSearchParams(params as any).toString();
+          return request(`/feedback?${qs}`);
+      },
+      create: (data: Partial<Feedback>) => request('/feedback', { method: 'POST', body: JSON.stringify(data) }),
+      update: (id: string, data: { status?: string, reply?: string }) => request(`/feedback/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+      ignoreAll: (targetId: string) => request('/feedback/ignore-all', { method: 'POST', body: JSON.stringify({ targetId }) }),
   },
+
   ai: {
-    evaluate: (data: { question: string, audio?: string, image?: string }) => request('/ai/evaluate', { method: 'POST', body: JSON.stringify(data) }),
+      chat: (data: { text?: string, audio?: string, history?: { role: string, text?: string }[] }) => request('/ai/chat', { method: 'POST', body: JSON.stringify(data) }),
+      evaluate: (data: { question: string, audio?: string, image?: string }) => request('/ai/evaluate', { method: 'POST', body: JSON.stringify(data) }),
   },
-  batchDelete: (type: string, ids: string[]) => request(`/batch-delete`, { method: 'POST', body: JSON.stringify({ type, ids }) }),
-};
+
+  todos: { // NEW
+      getAll: () => request('/todos'),
+      add: (content: string) => request('/todos', { method: 'POST', body: JSON.stringify({ content }) }),
+      update: (id: string, data: Partial<Todo>) => request(`/todos/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
+      delete: (id: string) => request(`/todos/${id}`, { method: 'DELETE' }),
+  }
+};