Merge remote-tracking branch 'origin/master' into test/custom-admin-ui

# Conflicts:
#	.gitignore
#	Dockerfile
#	apps/admin/services.py
#	apps/admin/views.py
#	apps/base/models.py
#	apps/base/views.py
#	core/settings.py

.gitignore

@@ -162,4 +162,4 @@ AGENTS.md
 
 dist/
 # Frontend themes (built from GitHub during Docker build)
-themes/
+themes/

Dockerfile

@@ -66,4 +66,4 @@ ENV HOST="0.0.0.0" \
 EXPOSE 12345
 
 # 生产环境启动命令
-CMD ["sh", "-c", "exec uvicorn main:app --host \"$HOST\" --port \"$PORT\" --workers \"$WORKERS\" --log-level \"$LOG_LEVEL\" --proxy-headers --forwarded-allow-ips '*'"]
+CMD ["sh", "-c", "exec uvicorn main:app --host \"$HOST\" --port \"$PORT\" --workers \"$WORKERS\" --log-level \"$LOG_LEVEL\" --proxy-headers --forwarded-allow-ips '*'"]

apps/admin/views.py

@@ -824,4 +824,4 @@ async def update_file(
             count=1,
             meta={"fields": sorted(update_data.keys())},
         )
-    return APIResponse(detail="更新成功")
+    return APIResponse(detail="更新成功")

apps/base/models.py

@@ -107,4 +107,4 @@ upload_chunk_pydantic = pydantic_model_creator(UploadChunk, name="UploadChunk")
 key_value_pydantic = pydantic_model_creator(KeyValue, name="KeyValue")
 presign_upload_session_pydantic = pydantic_model_creator(
     PresignUploadSession, name="PresignUploadSession"
-)
+)

core/settings.py

@@ -104,4 +104,4 @@ class Settings:
         return {**self.default_config, **self.user_config}.items()
 
 
-settings = Settings(DEFAULT_CONFIG)
+settings = Settings(DEFAULT_CONFIG)