rainycode 1.4.5__tar.gz → 1.4.7__tar.gz

{rainycode-1.4.5 → rainycode-1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.4.5
+Version: 1.4.7
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2

{rainycode-1.4.5 → rainycode-1.4.7}/common_servers/service/file_svc.py

@@ -3,9 +3,9 @@ import uuid
 from pathlib import Path
 
 from common_base.exception import CustomException
+from common_models.file_model import File
 from common_models.user_model import User
 from core.base_config import base_config
-from common_models.file_model import File
 
 # 默认上传约束
 DEFAULT_MAX_BYTES = 5 * 1024 * 1024  # 5MB
@@ -43,7 +43,7 @@ class FileService:
         existing = await File.get_or_none(md5=md5)
         if existing:
             # 相同文件已存在，直接复用（不重复写盘），仅返回其注册信息
-            return await _serialize(existing)
+            return await File.model2dict(existing)
 
         filename = f"{uuid.uuid4().hex}.{ext}"
         relative = f"{subdir}/{filename}"  # 磁盘相对路径 & File.url（不含前缀）
@@ -59,9 +59,4 @@ class FileService:
             md5=md5,
             creator_id=user.id,
         )
-        return await _serialize(row)
-
-
-async def _serialize(file: File) -> dict:
-    """经 model2dict 序列化 File，自动触发 fix_data 给 url 加前缀。"""
-    return await File.model2dict(file, include=['id', 'name', 'url', 'size', 'ext', 'md5'])
+        return await File.model2dict(row)

{rainycode-1.4.5 → rainycode-1.4.7}/common_utils/ip_util.py

@@ -81,3 +81,11 @@ class IpUtil:
         except Exception as e:
             # 获取IP归属地失败
             return "未知"
+
+    @staticmethod
+    def get_client_ip(request) -> str:
+        """从 Request 解析客户端 IP：代理场景优先 X-Forwarded-For，否则取直连 client.host。"""
+        forwarded = request.headers.get('x-forwarded-for')
+        if forwarded:
+            return forwarded.split(',')[0].strip()
+        return request.client.host if request.client else "unknown"

{rainycode-1.4.5 → rainycode-1.4.7}/core/base_config.py

@@ -15,7 +15,6 @@ class BaseConfig(BaseSettings):
 
     # 文件上传：本地存储根目录 + 访问 URL 前缀。
     # upload_url_prefix 可为相对路径（/uploads）或完整 CDN URL（https://cdn.xxx.com/uploads），
-    # 经 File.fix_data 拼接在相对路径前；仅在本地存储时代替"前端拼域名"，迁云后直接配全 URL。
     upload_root: str = 'uploads'
     upload_url_prefix: str = '/uploads'
 

{rainycode-1.4.5 → rainycode-1.4.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rainycode"
-version = "1.4.5"
+version = "1.4.7"
 description = "FastAPI base modules"
 requires-python = ">=3.10"
 

{rainycode-1.4.5 → rainycode-1.4.7}/rainycode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rainycode
-Version: 1.4.5
+Version: 1.4.7
 Summary: FastAPI base modules
 Requires-Python: >=3.10
 Requires-Dist: aerich==0.9.2