v2.3.7a

Author: KanoCifer

backend/app/configs/config.py

@@ -35,6 +35,7 @@ class Settings(BaseSettings):
     GITEE_WEBHOOK_SECRET: str | None = None
     SEND_BOOT_EMAIL: bool = True
     ADMIN_EMAIL: str = ""
+    FEISHU_WEBHOOK_URL: str = ""
 
     model_config = SettingsConfigDict(
         env_file=get_env_file_path(),
@@ -60,3 +61,4 @@ def get_settings() -> Settings:
     print(get_env_file_path())
     print(f"SEND_BOOT_EMAIL: {get_settings().SEND_BOOT_EMAIL}")
     print(f"ADMIN_EMAIL: {get_settings().ADMIN_EMAIL}")
+    print(f"FEISHU_WEBHOOK_URL: {get_settings().FEISHU_WEBHOOK_URL}")

backend/app/configs/logger.py

@@ -19,20 +19,20 @@
 )
 
 base = Path(__file__).parent.parent
-base = base.parent
+base: Path = base.parent
 
-log_path_env = os.getenv("LOG_PATH")
+log_path_env: str | None = os.getenv("LOG_PATH")
 if log_path_env:
     log_path = Path(log_path_env)
 else:
     log_dir = Path(os.getenv("LOG_DIR", base / "logs"))
-    log_path = log_dir / "app.log"
+    log_path: Path = log_dir / "app.log"
 
 with contextlib.suppress(FileNotFoundError):
     log_path.parent.mkdir(parents=True, exist_ok=True)
 
-info_log_path = log_path.with_stem(f"{log_path.stem}_info")
-error_log_path = log_path.with_stem(f"{log_path.stem}_error")
+info_log_path: Path = log_path.with_stem(f"{log_path.stem}_info")
+error_log_path: Path = log_path.with_stem(f"{log_path.stem}_error")
 
 # INFO <= 级别 < ERROR 写入 app_info.log
 logger.add(

backend/app/main.py

@@ -37,7 +37,7 @@
     users,
     weread,
 )
-from app.tasks import send_bootstrap_emails
+from app.tasks import send_bootstrap_emails, send_feishu_message
 from app.utils.cache import close_cache_redis
 
 
@@ -64,18 +64,20 @@ async def lifespan(app: FastAPI):
     logger.debug(f"Settings:{get_settings().model_dump()}")
     logger.info("FastAPI started successfully.")
 
-    # 发送引导邮件
+    # 发送引导邮件和飞书消息
     admin_email: str = get_settings().ADMIN_EMAIL
     bootstrap_key: str = f"bootstrap_email_sent:{admin_email}"
     if app.state.redis is not None and get_settings().SEND_BOOT_EMAIL:
         lock_acquired = await app.state.redis.set(
             name=bootstrap_key, value="1", ex=600, nx=True
         )
         if lock_acquired:
+            # 发送飞书消息
+            await send_feishu_message.kiq()
             await send_bootstrap_emails.kiq(admin_email=admin_email)
-            app_logger.info(f"引导邮件任务已添加到队列: {admin_email}")
+            app_logger.info("✅启动通知任务已添加到队列")
         else:
-            app_logger.info(f"引导邮件已在24小时内发送过，跳过: {admin_email}")
+            app_logger.info("✅引导邮件已发送")
 
     yield
 

backend/app/routers/admin.py

@@ -28,6 +28,7 @@
 from app.schemas import VisitorData
 from app.schemas.response import APIResponse
 from app.schemas.schemas import BlogPostIn, BlogPostUpdate
+from app.tasks import send_feishu_message
 from app.utils import redis_cache
 
 router = APIRouter(prefix="/admin", tags=["admin"])
@@ -448,8 +449,10 @@ async def track_visitor(
 async def run_deployment() -> None:
     """异步执行部署脚本不阻塞HTTP请求"""
     try:
-        logger.info("Starting deployment process...")
+        logger.info("启动自动化部署...")
+        import time
 
+        start_time = time.time()
         # 部署脚本路径，根据你的实际情况修改
         deploy_script = "/home/kano/blog/backend/deploy.sh"
 
@@ -468,12 +471,12 @@ async def run_deployment() -> None:
         stdout, stderr = await process.communicate()
 
         if process.returncode == 0:
-            logger.info("Deployment completed successfully!")
-            logger.debug(f"Deploy output: {stdout.decode()}")
+            end_time: float = time.time()
+            elapsed_time: float = end_time - start_time
+            logger.info(f"✅自动化部署完成，耗时 {elapsed_time:.2f} 秒")
+            logger.debug(f"✅Deploy output: {stdout.decode()}")
         else:
-            logger.error(
-                f"Deployment failed with exit code {process.returncode}"
-            )
+            logger.error(f"❌自动化部署失败，退出码: {process.returncode}")
             logger.error(f"STDOUT: {stdout.decode()}")
             logger.error(f"STDERR: {stderr.decode()}")
 
@@ -490,7 +493,7 @@ async def webhook_deploy(
     Gitee Webhook 自动部署接口
     """
     # 从环境变量获取webhook密钥，需要在.env中配置
-    webhook_secret = get_settings().GITEE_WEBHOOK_SECRET
+    webhook_secret: str | None = get_settings().GITEE_WEBHOOK_SECRET
     if not webhook_secret:
         logger.error(
             "GITEE_WEBHOOK_SECRET is not set in environment variables"
@@ -557,9 +560,29 @@ async def webhook_deploy(
         f"Deployment triggered by webhook from {get_remote_address(request)}"
     )
 
-    # 使用asyncio.create_task在后台执行部署，不阻塞请求
-    asyncio.create_task(run_deployment())  # noqa: RUF006
-
-    return APIResponse.ok(
-        message="Deployment triggered successfully", data={"status": "pending"}
+    lock_acquired = await redis.set(
+        name="deploy_lock", value="1", ex=300, nx=True
     )
+    if not lock_acquired:
+        logger.info("Deployment already in progress, skipping")
+        return APIResponse.ok(
+            message="Deployment already in progress",
+            data={"status": "in_progress"},
+        )
+    try:
+        logger.info(
+            f"Deployment triggered by webhook from {get_remote_address(request)}"
+        )
+        await send_feishu_message.kiq("API服务正在部署中，请稍候...")
+        asyncio.create_task(run_deployment())  # noqa: RUF006
+        return APIResponse.ok(
+            message="Deployment triggered successfully",
+            data={"status": "pending"},
+        )
+    except Exception as e:
+        await redis.delete("deploy_lock")
+        logger.error(f"Failed to trigger deployment: {e!s}")
+        return APIResponse.error(
+            message="Failed to trigger deployment",
+            code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        )

backend/app/tasks/__init__.py

@@ -6,6 +6,7 @@
     save_to_mongo,
     send_bootstrap_emails,
     send_code,
+    send_feishu_message,
 )
 
 __all__ = [
@@ -17,4 +18,5 @@
     "scheduler",
     "send_bootstrap_emails",
     "send_code",
+    "send_feishu_message",
 ]

backend/app/tasks/broker.py

@@ -1,3 +1,4 @@
+from taskiq.middlewares import SmartRetryMiddleware
 from taskiq_redis import RedisAsyncResultBackend, RedisStreamBroker
 
 from app.configs.logger import logger
@@ -7,8 +8,20 @@
     result_ex_time=86400,
 )
 
-broker: RedisStreamBroker = RedisStreamBroker(
-    url="redis://localhost:6379/3",
-).with_result_backend(result_backend=result_backend)
+broker: RedisStreamBroker = (
+    RedisStreamBroker(
+        url="redis://localhost:6379/3",
+    )
+    .with_result_backend(result_backend=result_backend)
+    .with_middlewares(
+        SmartRetryMiddleware(
+            default_retry_count=5,
+            default_delay=10,
+            use_jitter=True,
+            use_delay_exponent=True,
+            max_delay_exponent=120,
+        )
+    )
+)
 
-logger.info("[Taskiq] ✅ Broker initialized successfully")
+logger.info("[Taskiq]✅Broker初始化成功")

backend/app/tasks/task.py

@@ -1,5 +1,6 @@
 from datetime import UTC, datetime
 
+import httpx
 from beanie import init_beanie
 from email_validator import EmailNotValidError, ValidatedEmail, validate_email
 from fastapi_mail import FastMail, MessageSchema, MessageType
@@ -216,3 +217,33 @@ async def save_cache_to_redis(
         await context.state.redis.set(key, value, ex=expire)
     except Exception as e:
         logger.error(f"❌Failed to save cache to Redis: {e!r}")
+
+
+class FeishuMessageContent(BaseModel):
+    """飞书消息内容模型"""
+
+    msg_type: str = "text"
+    content: dict
+
+
+@broker.task
+async def send_feishu_message(message: str | None = None):
+    """发送飞书消息"""
+    url: str = get_settings().FEISHU_WEBHOOK_URL
+    now: str = datetime.now().strftime(format="%Y-%m-%d %H:%M:%S")
+    if message is None:
+        message = f"KUROOME BLOG API 已成功启动！时间：{now}"
+    message = message.strip()
+    if not url:
+        return
+    payload = FeishuMessageContent(
+        msg_type="text",
+        content={"text": message},
+    )
+    try:
+        async with httpx.AsyncClient() as client:
+            response = await client.post(url, json=payload)
+            response.raise_for_status()
+            logger.info("飞书消息已发送")
+    except Exception as e:
+        logger.error(f"发送飞书消息失败: {e!s}")

backend/app/utils/__init__.py

@@ -1,3 +1,9 @@
 from app.utils.cache import get_redis_cache, redis_cache
+from app.utils.mailservice import send_bootstrap_emails, send_feishu_message
 
-__all__ = ["get_redis_cache", "redis_cache"]
+__all__ = [
+    "get_redis_cache",
+    "redis_cache",
+    "send_bootstrap_emails",
+    "send_feishu_message",
+]

backend/app/utils/mailservice.py

@@ -1,5 +1,6 @@
 import datetime
 
+import httpx
 from email_validator import EmailNotValidError, ValidatedEmail, validate_email
 from fastapi_mail import FastMail, MessageSchema, MessageType
 from pydantic import BaseModel, EmailStr
@@ -61,3 +62,21 @@ async def send_bootstrap_emails(admin_email: str):
         logger.error(f"发送引导邮件失败: {e!s}")
         # print(f"[red]发送引导邮件失败: {e!s}[/red]")
         raise e
+
+
+async def send_feishu_message():
+    """发送飞书消息"""
+    url = get_settings().FEISHU_WEBHOOK_URL
+    if not url:
+        return
+    payload = {
+        "msg_type": "text",
+        "content": {"text": "KUROOME BLOG API 已成功启动！"},
+    }
+    try:
+        async with httpx.AsyncClient() as client:
+            response = await client.post(url, json=payload)
+            response.raise_for_status()
+            logger.info("飞书消息已发送")
+    except Exception as e:
+        logger.error(f"发送飞书消息失败: {e!s}")

frontend/src/components/article/ArticleDetailLayout.vue

@@ -47,19 +47,13 @@ const goBack = () => {
 };
 
 const displayDate = computed(() => {
-  if (
-    props.publishedDate &&
-    props.updatedDate &&
-    props.updatedDate !== props.publishedDate
-  ) {
+  if (props.publishedDate && props.updatedDate && props.updatedDate !== props.publishedDate) {
     return formatDate(props.updatedDate);
   }
   return props.publishedDate ? formatDate(props.publishedDate) : "";
 });
 
-const formattedDate = computed(() =>
-  props.publishedDate ? formatDate(props.publishedDate) : "",
-);
+const formattedDate = computed(() => (props.publishedDate ? formatDate(props.publishedDate) : ""));
 </script>
 
 <template>
@@ -70,48 +64,30 @@ const formattedDate = computed(() =>
       :style="titleStyle"
     >
       <!-- Loading State -->
-      <div
-        v-if="isLoading"
-        class="flex min-h-[60vh] flex-col items-center justify-center"
-      >
+      <div v-if="isLoading" class="flex min-h-[60vh] flex-col items-center justify-center">
         <div
           class="h-12 w-12 animate-spin rounded-full border-4 border-blue-200 border-t-blue-600"
         ></div>
         <p class="mt-4 text-gray-600 dark:text-gray-400">加载中...</p>
       </div>
 
       <div v-else>
-        <h1
-          class="max-w-6xl text-center font-serif text-7xl text-gray-50 max-sm:text-3xl"
-        >
+        <h1 class="max-w-6xl text-center font-serif text-7xl text-gray-50 max-sm:text-3xl">
           {{ title }}
         </h1>
         <!-- Author and Date Info -->
-        <div
-          class="flex flex-wrap items-center justify-center gap-4 text-sm text-gray-400"
-        >
+        <div class="flex flex-wrap items-center justify-center gap-4 text-sm text-gray-400">
           <div class="flex items-center gap-2">
             <div
               class="flex h-10 w-10 items-center justify-center rounded-full bg-linear-to-br from-blue-500 to-sky-600 text-lg font-bold text-white"
             >
-              {{
-                author?.charAt(0).toUpperCase() ||
-                authorInitial?.charAt(0).toUpperCase() ||
-                "K"
-              }}
+              {{ author?.charAt(0).toUpperCase() || authorInitial?.charAt(0).toUpperCase() || "K" }}
             </div>
-            <span class="font-medium text-gray-200"
-              >@{{ author || "Kurroome" }}</span
-            >
+            <span class="font-medium text-gray-200">@{{ author || "Kurroome" }}</span>
           </div>
           <span class="text-gray-50">·</span>
           <div class="flex items-center gap-1">
-            <svg
-              class="h-4 w-4 text-gray-50"
-              fill="none"
-              stroke="currentColor"
-              viewBox="0 0 24 24"
-            >
+            <svg class="h-4 w-4 text-gray-50" fill="none" stroke="currentColor" viewBox="0 0 24 24">
               <path
                 stroke-linecap="round"
                 stroke-linejoin="round"
@@ -124,12 +100,7 @@ const formattedDate = computed(() =>
             </span>
           </div>
           <span v-if="showCategory && category" class="flex items-center gap-1">
-            <svg
-              class="h-4 w-4 text-gray-50"
-              fill="none"
-              stroke="currentColor"
-              viewBox="0 0 24 24"
-            >
+            <svg class="h-4 w-4 text-gray-50" fill="none" stroke="currentColor" viewBox="0 0 24 24">
               <path
                 stroke-linecap="round"
                 stroke-linejoin="round"
@@ -153,7 +124,7 @@ const formattedDate = computed(() =>
       <!-- 背景层 -->
       <div
         :style="sectionStyle"
-        class="absolute inset-y-0 left-1/2 -z-5 -translate-x-1/2 rounded-t-[40px] bg-blue-50 backdrop-blur-sm dark:bg-slate-900"
+        class="absolute inset-y-0 left-1/2 -z-5 -translate-x-1/2 rounded-t-[40px] bg-blue-50 dark:bg-slate-900"
       />
 
       <div class="mx-auto mt-20 max-w-4xl">
@@ -223,9 +194,7 @@ const formattedDate = computed(() =>
               d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"
             />
           </svg>
-          <p class="text-lg font-medium text-red-600 dark:text-red-400">
-            加载失败
-          </p>
+          <p class="text-lg font-medium text-red-600 dark:text-red-400">加载失败</p>
           <p class="mt-1 text-sm text-red-500">{{ errorMessage }}</p>
           <button
             class="mt-4 cursor-pointer rounded-lg bg-red-600 px-4 py-2 text-sm font-medium text-white hover:bg-red-700"