From ae0001f3ab34d05b33b11870dfaed6f53f3bcb54 Mon Sep 17 00:00:00 2001
From: jinql <jinqilin721@163.com>
Date: Mon, 1 Sep 2025 20:54:04 +0800
Subject: [PATCH] 25.09.01

---
 Dockerfile                            |  2 +-
 favicon_app/routes/favicon_service.py | 13 +++++++------
 favicon_app/utils/file_util.py        |  7 +++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7c58ac1..0ef8b51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-slim
+FROM python:3.13-slim
 
 WORKDIR /app
 
diff --git a/favicon_app/routes/favicon_service.py b/favicon_app/routes/favicon_service.py
index 948b8b7..b2b3626 100644
--- a/favicon_app/routes/favicon_service.py
+++ b/favicon_app/routes/favicon_service.py
@@ -18,7 +18,8 @@ from fastapi import Request
 from fastapi.responses import Response
 
 from favicon_app.models import Favicon
-from favicon_app.utils import header, file_util
+from favicon_app.utils import header
+from favicon_app.utils.file_util import FileUtil
 from favicon_app.utils.filetype import helpers, filetype
 
 urllib3.disable_warnings()
@@ -30,7 +31,7 @@ current_dir = os.path.dirname(os.path.abspath(__file__))
 # icon 存储的绝对路径，上两级目录
 icon_root_path = os.path.abspath(os.path.join(current_dir, '..', '..'))
 default_icon_path = os.path.join(icon_root_path, 'favicon.png')
-default_icon_content = file_util.read_file(default_icon_path, mode='rb')
+default_icon_content = FileUtil.read_file(default_icon_path, mode='rb')
 
 
 class FaviconService:
@@ -133,7 +134,7 @@ class FaviconService:
         cache_path = os.path.join(icon_root_path, 'icon', domain + '.png')
         if os.path.exists(cache_path) and os.path.isfile(cache_path) and os.path.getsize(cache_path) > 0:
             try:
-                cached_icon = file_util.read_file(cache_path, mode='rb')
+                cached_icon = FileUtil.read_file(cache_path, mode='rb')
                 file_time = int(os.path.getmtime(cache_path))
 
                 # 验证是否为有效的图片文件
@@ -284,7 +285,7 @@ class FaviconService:
                 if _referrer not in self.href_referrer:
                     self.href_referrer.add(_referrer)
                     try:
-                        file_util.write_file(_path, f'{_referrer}\n', mode='a')
+                        FileUtil.write_file(_path, f'{_referrer}\n', mode='a')
                     except Exception as e:
                         logger.error(f"写入referrer文件失败: {e}")
 
@@ -345,8 +346,8 @@ class FaviconService:
                     os.makedirs(os.path.dirname(md5_path), exist_ok=True)
 
                     # 写入缓存文件
-                    file_util.write_file(cache_path, icon_content, mode='wb')
-                    file_util.write_file(md5_path, entity.domain, mode='w')
+                    FileUtil.write_file(cache_path, icon_content, mode='wb')
+                    FileUtil.write_file(md5_path, entity.domain, mode='w')
                 except Exception as e:
                     logger.error(f"写入缓存文件失败: {e}")
 
diff --git a/favicon_app/utils/file_util.py b/favicon_app/utils/file_util.py
index 611aec9..c0df3b6 100644
--- a/favicon_app/utils/file_util.py
+++ b/favicon_app/utils/file_util.py
@@ -5,9 +5,12 @@ import os
 from pathlib import Path
 from typing import List, Dict, Any, Optional, Union
 
+import urllib3
+
 # 配置日志
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
+urllib3.disable_warnings()
+logging.captureWarnings(True)
+logger = logging.getLogger()
 
 
 class FileUtil: