优化日志加载功能，支持日期范围过滤并增强前端日期选择器

logging_helper.py

@@ -196,39 +196,128 @@ class LoggingHelper:
         )
         self.scheduler.start()
 
-    def _load_all_logs(self) -> pd.DataFrame:
-        """加载所有日志文件并返回合并后的DataFrame"""
-        print("[_load_all_logs] Starting to load all logs")
-        files = glob.glob("**/*.json", root_dir=self.local_dir, recursive=True)
-        filepathes = [os.sep.join([self.local_dir, file]) for file in files]
+    def _load_all_logs(self, from_date=None, to_date=None) -> pd.DataFrame:
+        """
+        加载日志文件并返回合并后的DataFrame
+
+        使用直接路径构造方式高效地检索特定日期范围内的文件
+
+        :param from_date: 开始日期（格式：YYYY-MM-DD或datetime.date），默认为None
+        :param to_date: 结束日期（格式：YYYY-MM-DD或datetime.date），默认为None
+        """
+        import datetime
+
+        print("[_load_all_logs] Starting to load logs")
+        print(f"[_load_all_logs] Date range: {from_date} to {to_date}")
+
+        filepathes = []
+
+        # 确定日期范围
+        if from_date is None and to_date is None:
+            # 如果没有指定范围，扫描所有目录
+            files = glob.glob("**/*.json", root_dir=self.local_dir, recursive=True)
+            filepathes = [os.path.join(self.local_dir, file) for file in files]
+        else:
+            # 将日期参数转换为 datetime.date 对象
+            start_date = from_date
+            end_date = to_date
+
+            if isinstance(start_date, str):
+                start_date = datetime.datetime.strptime(start_date, "%Y-%m-%d").date()
+            if isinstance(end_date, str):
+                end_date = datetime.datetime.strptime(end_date, "%Y-%m-%d").date()
+
+            # 如果只指定了一个日期，设置默认值
+            if start_date is None:
+                start_date = end_date
+            if end_date is None:
+                end_date = start_date
+
+            # 确保日期不为 None 的类型检查
+            if start_date is not None and end_date is not None:
+                # 直接构造日期范围内的目录路径，避免 glob 遍历
+                current_date = start_date
+                date_dirs = []
+                while current_date <= end_date:
+                    year = str(current_date.year)
+                    month = str(current_date.month)
+                    day = str(current_date.day)
+                    date_dir = os.path.join(self.local_dir, year, month, day)
+                    date_dirs.append((date_dir, year, month, day))
+                    current_date += datetime.timedelta(days=1)
+
+                print(
+                    f"[_load_all_logs] Constructed {len(date_dirs)} date directories"
+                )
+
+                # 从指定日期目录中查找 JSON 文件
+                for date_dir, year, month, day in date_dirs:
+                    if os.path.isdir(date_dir):
+                        json_files = glob.glob("*.json", root_dir=date_dir)
+                        for json_file in json_files:
+                            filepathes.append(os.path.join(date_dir, json_file))
+
+        print(f"[_load_all_logs] Found {len(filepathes)} files in date range")
+
+        # 加载所有日志文件
         datasets = []
         for path in tqdm(filepathes):
             path = str(path)
-            datasets.append(ds.Dataset.from_json(path))
+            try:
+                datasets.append(ds.Dataset.from_json(path))
+            except Exception as e:
+                print(f"[_load_all_logs] Error loading {path}: {e}")
+                continue
+
+        # 合并数据集并排序
         df = pd.DataFrame()
         if datasets:
             dataset: ds.Dataset = ds.concatenate_datasets(datasets)
             df = dataset.to_pandas()
             assert isinstance(df, pd.DataFrame)
             df = df.sort_values(by="timestamp", ascending=False)
+
         print(f"[_load_all_logs] Loaded {len(df)} logs")
-        self.loaded_files = set(files)
+        self.loaded_files = set([os.path.relpath(p, self.local_dir) for p in filepathes])
         return df
 
-    def refresh(self) -> list[dict]:
-        """获取刷新后的日志列表，使用缓存机制加速"""
+    def refresh(self, from_date=None, to_date=None) -> list[dict]:
+        """
+        获取刷新后的日志列表，支持日期范围过滤
+
+        :param from_date: 开始日期（格式：YYYY-MM-DD或datetime.date），默认为None
+        :param to_date: 结束日期（格式：YYYY-MM-DD或datetime.date），默认为None
+        :return: 日志字典列表
+        """
+        import datetime
+
         self.push()
 
-        # 如果缓存需要刷新或者缓存为空，重新加载所有日志
-        if self.cache_needs_refresh or self.cached_df is None:
-            print("[refresh] Cache miss, reloading all logs")
-            self.cached_df = self._load_all_logs()
-            self.cache_needs_refresh = False
-        else:
-            print("[refresh] Using cached data")
+        # 将字符串日期转换为 datetime.date 对象
+        if isinstance(from_date, str):
+            from_date = datetime.datetime.strptime(from_date, "%Y-%m-%d").date()
+        if isinstance(to_date, str):
+            to_date = datetime.datetime.strptime(to_date, "%Y-%m-%d").date()
+
+        # 如果没有指定日期范围，使用缓存机制
+        if from_date is None and to_date is None:
+            # 如果缓存需要刷新或者缓存为空，重新加载所有日志
+            if self.cache_needs_refresh or self.cached_df is None:
+                print("[refresh] Cache miss, reloading all logs")
+                self.cached_df = self._load_all_logs()
+                self.cache_needs_refresh = False
+            else:
+                print("[refresh] Using cached data")
 
-        # 返回缓存的DataFrame
-        if self.cached_df is None or self.cached_df.empty:
-            return []
+            # 返回缓存的DataFrame
+            if self.cached_df is None or self.cached_df.empty:
+                return []
 
-        return self.cached_df.to_dict(orient="records")
+            return self.cached_df.to_dict(orient="records")
+        else:
+            # 如果指定了日期范围，直接加载不使用缓存
+            print("[refresh] Date range specified, loading without cache")
+            df = self._load_all_logs(from_date=from_date, to_date=to_date)
+            if df is None or df.empty:
+                return []
+            return df.to_dict(orient="records")

main.py

@@ -1,8 +1,9 @@
-from fastapi import FastAPI, Body, Header, Request
+from fastapi import FastAPI, Body, Header, Request, Query
 from fastapi.middleware.cors import CORSMiddleware
 from utils import beijing, parse_token
 from logging_helper import LoggingHelper
 from fastapi.templating import Jinja2Templates
+import datetime
 
 
 app = FastAPI(
@@ -65,8 +66,26 @@ templates = Jinja2Templates(directory="static")
 
 @app.get("")
 @app.get("/")
-async def root(request: Request):
-    data = logger.refresh()
+async def root(
+    request: Request,
+    from_date: str | None = Query(None),
+    to_date: str | None = Query(None),
+):
+    """
+    首页端点，支持日期范围查询
+
+    查询参数：
+    - from_date: 开始日期（格式：YYYY-MM-DD），不指定时默认加载最近7天
+    - to_date: 结束日期（格式：YYYY-MM-DD），不指定时默认为今天
+    """
+    # 如果没有指定日期范围，默认加载最近7天的日志
+    if from_date is None and to_date is None:
+        today = beijing().date()
+        from_date = str(today - datetime.timedelta(days=6))  # 最近7天（包括今天）
+        to_date = str(today)
+        print(f"[root] No date range specified, using last 7 days: {from_date} to {to_date}")
+
+    data = logger.refresh(from_date=from_date, to_date=to_date)
     return templates.TemplateResponse(
         "index.html",
         {"request": request, "data": data},

static/index.html

@@ -134,6 +134,71 @@
             box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
         }
 
+        .date-filter-container {
+            display: flex;
+            align-items: center;
+            gap: 15px;
+            margin-top: 20px;
+            flex-wrap: wrap;
+        }
+
+        .date-input-group {
+            display: flex;
+            align-items: center;
+            gap: 8px;
+        }
+
+        .date-input-group label {
+            font-weight: 500;
+            color: #495057;
+            min-width: 60px;
+        }
+
+        .date-input-group input[type="date"] {
+            padding: 10px 15px;
+            border: 2px solid #e9ecef;
+            border-radius: 8px;
+            font-size: 14px;
+            background: white;
+            cursor: pointer;
+            transition: all 0.3s ease;
+        }
+
+        .date-input-group input[type="date"]:focus {
+            outline: none;
+            border-color: #667eea;
+            box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+        }
+
+        .date-shortcuts {
+            display: flex;
+            gap: 8px;
+            flex-wrap: wrap;
+        }
+
+        .date-shortcut-btn {
+            padding: 8px 15px;
+            border: 1px solid #e9ecef;
+            background: white;
+            border-radius: 8px;
+            cursor: pointer;
+            font-size: 13px;
+            color: #495057;
+            transition: all 0.3s ease;
+        }
+
+        .date-shortcut-btn:hover {
+            background: #667eea;
+            color: white;
+            border-color: #667eea;
+        }
+
+        .date-shortcut-btn.active {
+            background: #667eea;
+            color: white;
+            border-color: #667eea;
+        }
+
         .main {
             padding: 30px;
         }
@@ -228,8 +293,6 @@
             line-height: 1.4;
         }
 
-
-
         .timestamp {
             color: #6c757d;
             font-size: 0.9rem;
@@ -324,6 +387,19 @@
                 min-width: auto;
             }
 
+            .date-filter-container {
+                flex-direction: column;
+                align-items: stretch;
+            }
+
+            .date-input-group {
+                flex-direction: column;
+            }
+
+            .date-input-group label {
+                min-width: auto;
+            }
+
             .stats {
                 justify-content: center;
             }
@@ -360,7 +436,24 @@
                 <button class="btn btn-secondary" onclick="refreshLogs()">刷新</button>
             </div>
 
+            <div class="date-filter-container">
+                <div class="date-input-group">
+                    <label for="fromDate">开始日期：</label>
+                    <input type="date" id="fromDate">
+                </div>
+                <div class="date-input-group">
+                    <label for="toDate">结束日期：</label>
+                    <input type="date" id="toDate">
+                </div>
+                <button class="btn btn-primary" onclick="filterByDate()">过滤</button>
 
+                <div class="date-shortcuts">
+                    <button class="date-shortcut-btn" onclick="setDateRange('today')">今天</button>
+                    <button class="date-shortcut-btn" onclick="setDateRange('week')">最近7天</button>
+                    <button class="date-shortcut-btn" onclick="setDateRange('month')">最近30天</button>
+                    <button class="date-shortcut-btn" onclick="setDateRange('all')">全部</button>
+                </div>
+            </div>
         </div>
 
         <div class="main">
@@ -383,7 +476,7 @@
             <div class="no-data" id="noData" style="display: none;">
                 <div>📋</div>
                 <h3>暂无数据</h3>
-                <p>没有找到匹配的错误日志</p>
+                <p>没有找到匹配的日志</p>
             </div>
 
             <div class="pagination" id="pagination">
@@ -414,13 +507,124 @@
         let totalPages = 1;
         let filteredLogs = [...data];
         let searchTerm = '';
+        let currentDateFilter = null; // 记录当前的日期过滤范围
 
         // 初始化页面
         function initPage() {
+            // 从URL参数中读取日期范围
+            const urlParams = new URLSearchParams(window.location.search);
+            const fromDate = urlParams.get('from_date');
+            const toDate = urlParams.get('to_date');
+
+            if (fromDate) {
+                document.getElementById('fromDate').value = fromDate;
+            }
+            if (toDate) {
+                document.getElementById('toDate').value = toDate;
+            }
+
             renderLogs();
             updatePagination();
         }
 
+        // 获取今天的日期（YYYY-MM-DD格式）
+        function getTodayDate() {
+            const today = new Date();
+            return today.toISOString().split('T')[0];
+        }
+
+        // 获取指定天数前的日期
+        function getDateBefore(days) {
+            const date = new Date();
+            date.setDate(date.getDate() - days);
+            return date.toISOString().split('T')[0];
+        }
+
+        // 设置日期范围快捷选项
+        function setDateRange(range) {
+            const today = getTodayDate();
+
+            switch(range) {
+                case 'today':
+                    document.getElementById('fromDate').value = today;
+                    document.getElementById('toDate').value = today;
+                    break;
+                case 'week':
+                    document.getElementById('fromDate').value = getDateBefore(6);
+                    document.getElementById('toDate').value = today;
+                    break;
+                case 'month':
+                    document.getElementById('fromDate').value = getDateBefore(29);
+                    document.getElementById('toDate').value = today;
+                    break;
+                case 'all':
+                    document.getElementById('fromDate').value = '';
+                    document.getElementById('toDate').value = '';
+                    break;
+            }
+
+            // 更新快捷按钮的active状态
+            updateShortcutButtons(range);
+        }
+
+        // 更新快捷按钮的样式
+        function updateShortcutButtons(active) {
+            const buttons = document.querySelectorAll('.date-shortcut-btn');
+            buttons.forEach((btn, index) => {
+                const ranges = ['today', 'week', 'month', 'all'];
+                btn.classList.remove('active');
+                if (ranges[index] === active) {
+                    btn.classList.add('active');
+                }
+            });
+        }
+
+        // 按日期过滤
+        function filterByDate() {
+            const fromDate = document.getElementById('fromDate').value;
+            const toDate = document.getElementById('toDate').value;
+
+            if (!fromDate && !toDate) {
+                // 如果两个都为空，加载所有数据
+                currentDateFilter = null;
+                refreshFromServer(null, null);
+                return;
+            }
+
+            if (fromDate && toDate) {
+                if (fromDate > toDate) {
+                    alert('开始日期不能晚于结束日期');
+                    return;
+                }
+            }
+
+            // 记录当前的日期过滤
+            currentDateFilter = { from_date: fromDate, to_date: toDate };
+
+            // 刷新并带上日期参数
+            refreshFromServer(fromDate, toDate);
+        }
+
+        // 从服务器刷新数据，支持日期参数
+        function refreshFromServer(fromDate, toDate) {
+            let url = window.location.pathname;
+            const params = new URLSearchParams();
+
+            if (fromDate) {
+                params.append('from_date', fromDate);
+            }
+            if (toDate) {
+                params.append('to_date', toDate);
+            }
+
+            if (params.toString()) {
+                url += '?' + params.toString();
+            }
+
+            // 重新加载页面
+            window.location.href = url;
+        }
+
         // 改变每页显示数量
         function changePageSize() {
             const select = document.getElementById('pageSize');
@@ -533,11 +737,11 @@
         // 搜索日志
         function searchLogs() {
             searchTerm = document.getElementById('searchInput').value.trim();
-            
+
             if (searchTerm === '') {
                 filteredLogs = [...data];
             } else {
-                filteredLogs = data.filter(log => 
+                filteredLogs = data.filter(log =>
                     log.username.toLowerCase().includes(searchTerm.toLowerCase())
                 );
             }
@@ -549,9 +753,25 @@
 
         // 刷新日志
         function refreshLogs() {
-            // 模拟刷新数据
-            console.log('刷新日志数据...');
-            initPage();
+            // 如果有日期过滤，使用带日期参数的刷新
+            if (currentDateFilter) {
+                refreshFromServer(currentDateFilter.from_date, currentDateFilter.to_date);
+            } else {
+                // 获取当前的URL参数
+                const urlParams = new URLSearchParams(window.location.search);
+                const fromDate = urlParams.get('from_date');
+                const toDate = urlParams.get('to_date');
+
+                if (fromDate || toDate) {
+                    refreshFromServer(fromDate, toDate);
+                } else {
+                    // 模拟刷新数据
+                    console.log('刷新日志数据...');
+                    currentPage = 1;
+                    renderLogs();
+                    updatePagination();
+                }
+            }
         }
 
         // 监听回车键搜索
@@ -561,8 +781,21 @@
             }
         });
 
+        // 监听日期输入框的回车键
+        document.getElementById('fromDate').addEventListener('keypress', function(e) {
+            if (e.key === 'Enter') {
+                filterByDate();
+            }
+        });
+
+        document.getElementById('toDate').addEventListener('keypress', function(e) {
+            if (e.key === 'Enter') {
+                filterByDate();
+            }
+        });
+
         // 页面加载完成后初始化
         document.addEventListener('DOMContentLoaded', initPage);
     </script>
 </body>
-</html>
+</html>