diff --git a/config/logging.py b/config/logging.py index 079c195..78815e3 100644 --- a/config/logging.py +++ b/config/logging.py @@ -75,15 +75,16 @@ logger.add( diagnose=True, # 显示详细异常信息 ) -logger.add( - log_to_fluent, - level=LOG_LEVEL, # 处理 INFO 及以上级别 - format="{message}", # 原始消息(实际使用结构化数据) - backtrace=True, # 启用堆栈回溯 - diagnose=True # 显示诊断信息 -) +if settings.ENVIRONMENT == 'docker': + logger.add( + log_to_fluent, + level=LOG_LEVEL, # 处理 INFO 及以上级别 + format="{message}", # 原始消息(实际使用结构化数据) + backtrace=True, # 启用堆栈回溯 + diagnose=True # 显示诊断信息 + ) -atexit.register(fluent_sender.close) + atexit.register(fluent_sender.close) # 导出配置好的logger __all__ = ["logger"] diff --git a/service/blog_service.py b/service/blog_service.py index cb09974..ff891e8 100644 --- a/service/blog_service.py +++ b/service/blog_service.py @@ -35,7 +35,7 @@ def query_blog_by_page(db: Session, current_page: int = 1, page_size: int = 10, ).outerjoin(BlogCategory, Blog.category_id == BlogCategory.id) .outerjoin(BlogVisit, Blog.id == BlogVisit.blog_id) .group_by(Blog.id, BlogCategory.name) - .order_by(desc(Blog.top_value), desc(Blog.update_time))) + .order_by(desc(Blog.is_great), desc(Blog.top_value), desc(Blog.update_time))) if not is_all: stmt = stmt.where(Blog.is_approved == 1) @@ -75,7 +75,7 @@ def query_blog_by_condition(db: Session, blog_query: BlogQuery) -> List[BlogResp if conditions: stmt = stmt.where(and_(*conditions)) - stmt = stmt.order_by(desc(Blog.update_time)) + stmt = stmt.order_by(desc(Blog.is_great), desc(Blog.update_time)) results = db.execute(stmt).fetchall()