Merge pull request #72 from gujiangjiang/main

feat: 新增通知功能的用户隔离

Author: zaunist

backend/src/api/agents.ts

@@ -55,8 +55,9 @@ agents.put("/:id", async (c) => {
 agents.delete("/:id", async (c) => {
   try {
     const agentId = Number(c.req.param("id"));
+    const payload = c.get("jwtPayload"); // 获取用户信息
 
-    await deleteAgentService(agentId);
+    await deleteAgentService(agentId, payload.id); // 传入 userId
 
     return c.json(
       {
@@ -76,6 +77,7 @@ agents.delete("/:id", async (c) => {
   }
 });
 
+
 // 生成客户端Token
 agents.post("/token/generate", async (c) => {
   // 生成新令牌

backend/src/api/notifications.ts

@@ -3,12 +3,13 @@ import { z } from "zod";
 import { Bindings } from "../models/db";
 import * as NotificationService from "../services/NotificationService";
 
-const notifications = new Hono<{ Bindings: Bindings }>();
+const notifications = new Hono<{ Bindings: Bindings; Variables: { jwtPayload: any } }>();
 
 // 获取通知配置
 notifications.get("/", async (c) => {
   try {
-    const config = await NotificationService.getNotificationConfig();
+    const userId = c.get("jwtPayload").id;
+    const config = await NotificationService.getNotificationConfig(userId);
 
     return c.json({
       success: true,
@@ -30,7 +31,8 @@ notifications.get("/", async (c) => {
 // 获取通知渠道列表
 notifications.get("/channels", async (c) => {
   try {
-    const channels = await NotificationService.getNotificationChannels();
+    const userId = c.get("jwtPayload").id;
+    const channels = await NotificationService.getNotificationChannels(userId);
 
     return c.json({
       success: true,
@@ -53,6 +55,7 @@ notifications.get("/channels", async (c) => {
 notifications.get("/channels/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id;
 
     if (isNaN(id)) {
       return c.json(
@@ -64,7 +67,7 @@ notifications.get("/channels/:id", async (c) => {
       );
     }
 
-    const channel = await NotificationService.getNotificationChannelById(id);
+    const channel = await NotificationService.getNotificationChannelById(id, userId);
 
     if (!channel) {
       return c.json(
@@ -96,15 +99,14 @@ notifications.get("/channels/:id", async (c) => {
 // 创建通知渠道
 notifications.post("/channels", async (c) => {
   try {
-    const db = c.env.DB;
     const userId = c.get("jwtPayload").id;
     const body = await c.req.json();
 
     // 验证请求数据
     const schema = z.object({
       name: z.string().min(1, "名称不能为空"),
       type: z.string().min(1, "类型不能为空"),
-      config: z.string().min(1, "配置不能为空"),
+      config: z.any(),
       enabled: z.boolean().optional(),
     });
 
@@ -114,7 +116,7 @@ notifications.post("/channels", async (c) => {
     const result = await NotificationService.createNotificationChannel({
       name: validatedData.name,
       type: validatedData.type,
-      config: validatedData.config,
+      config: JSON.stringify(validatedData.config),
       enabled:
         validatedData.enabled !== undefined ? validatedData.enabled : true,
       created_by: userId,
@@ -153,10 +155,12 @@ notifications.post("/channels", async (c) => {
   }
 });
 
+
 // 更新通知渠道
 notifications.put("/channels/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id;
 
     if (isNaN(id)) {
       return c.json(
@@ -174,15 +178,19 @@ notifications.put("/channels/:id", async (c) => {
     const schema = z.object({
       name: z.string().min(1, "名称不能为空").optional(),
       type: z.string().min(1, "类型不能为空").optional(),
-      config: z.string().min(1, "配置不能为空").optional(),
+      config: z.any().optional(),
       enabled: z.boolean().optional(),
     });
 
     const validatedData = schema.parse(body);
+    if (validatedData.config) {
+        validatedData.config = JSON.stringify(validatedData.config)
+    }
 
     // 更新渠道
     const result = await NotificationService.updateNotificationChannel(
       id,
+      userId,
       validatedData
     );
 
@@ -217,6 +225,7 @@ notifications.put("/channels/:id", async (c) => {
 notifications.delete("/channels/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id;
 
     if (isNaN(id)) {
       return c.json(
@@ -228,7 +237,7 @@ notifications.delete("/channels/:id", async (c) => {
       );
     }
 
-    const result = await NotificationService.deleteNotificationChannel(id);
+    const result = await NotificationService.deleteNotificationChannel(id, userId);
 
     if (!result.success) {
       return c.json(
@@ -257,10 +266,12 @@ notifications.delete("/channels/:id", async (c) => {
   }
 });
 
+
 // 获取通知模板列表
 notifications.get("/templates", async (c) => {
   try {
-    const templates = await NotificationService.getNotificationTemplates();
+    const userId = c.get("jwtPayload").id;
+    const templates = await NotificationService.getNotificationTemplates(userId);
 
     return c.json({
       success: true,
@@ -283,6 +294,7 @@ notifications.get("/templates", async (c) => {
 notifications.get("/templates/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id; // 获取 userId
 
     if (isNaN(id)) {
       return c.json(
@@ -294,7 +306,7 @@ notifications.get("/templates/:id", async (c) => {
       );
     }
 
-    const template = await NotificationService.getNotificationTemplateById(id);
+    const template = await NotificationService.getNotificationTemplateById(id, userId); // 传入 userId
 
     if (!template) {
       return c.json(
@@ -390,6 +402,7 @@ notifications.post("/templates", async (c) => {
 notifications.put("/templates/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id; // 获取 userId
 
     if (isNaN(id)) {
       return c.json(
@@ -417,6 +430,7 @@ notifications.put("/templates/:id", async (c) => {
     // 更新模板
     const result = await NotificationService.updateNotificationTemplate(
       id,
+      userId, // 传入 userId
       validatedData
     );
 
@@ -451,6 +465,7 @@ notifications.put("/templates/:id", async (c) => {
 notifications.delete("/templates/:id", async (c) => {
   try {
     const id = parseInt(c.req.param("id"));
+    const userId = c.get("jwtPayload").id; // 获取 userId
 
     if (isNaN(id)) {
       return c.json(
@@ -462,7 +477,7 @@ notifications.delete("/templates/:id", async (c) => {
       );
     }
 
-    const result = await NotificationService.deleteNotificationTemplate(id);
+    const result = await NotificationService.deleteNotificationTemplate(id, userId); // 传入 userId
 
     if (!result.success) {
       return c.json(
@@ -491,6 +506,7 @@ notifications.delete("/templates/:id", async (c) => {
   }
 });
 
+
 // 保存通知设置
 notifications.post("/settings", async (c) => {
   try {

backend/src/jobs/agent-task.ts

@@ -19,6 +19,7 @@ interface AgentResult {
   status: string;
   updated_at: string;
   keepalive: string;
+  created_by: number; // 添加 created_by 以便获取 userId
 }
 
 export const checkAgentsStatus = async (c: any) => {
@@ -53,7 +54,7 @@ export const checkAgentsStatus = async (c: any) => {
         await setAgentInactive(agent.id);
 
         // 处理通知
-        await handleAgentOfflineNotification(c.env, agent.id, agent.name);
+        await handleAgentOfflineNotification(c.env, agent.id, agent.name, agent.created_by);
       }
     }
   } catch (error) {
@@ -66,15 +67,18 @@ export const checkAgentsStatus = async (c: any) => {
  * @param env 环境变量
  * @param agentId 客户端ID
  * @param agentName 客户端名称
+ * @param userId 用户ID
  */
 async function handleAgentOfflineNotification(
   env: any,
   agentId: number,
-  agentName: string
+  agentName: string,
+  userId: number
 ) {
   try {
     // 检查是否需要发送通知
     const notificationCheck = await shouldSendNotification(
+      userId, // 修复: 传入 userId
       "agent",
       agentId,
       "online", // 上一个状态
@@ -125,7 +129,8 @@ async function handleAgentOfflineNotification(
       "agent",
       agentId,
       variables,
-      notificationCheck.channels
+      notificationCheck.channels,
+      userId // 修复: 传入 userId
     );
 
     if (notificationResult.success) {
@@ -158,6 +163,9 @@ export async function handleAgentThresholdNotification(
       console.error(`找不到客户端 (ID: ${agentId})`);
       throw new Error(`找不到客户端 (ID: ${agentId})`);
     }
+    
+    // @ts-ignore
+    const userId = agent.created_by; // 获取 userId
 
     // 根据具体的指标类型
     let metricName = "";
@@ -172,7 +180,8 @@ export async function handleAgentThresholdNotification(
         and(
           eq(notificationSettings.enabled, 1),
           eq(notificationSettings.target_id, agentId),
-          eq(notificationSettings.target_type, "agent")
+          eq(notificationSettings.target_type, "agent"),
+          eq(notificationSettings.user_id, userId) // 增加 userId 过滤
         )
       );
 
@@ -184,7 +193,8 @@ export async function handleAgentThresholdNotification(
           .where(
             and(
               eq(notificationSettings.enabled, 1),
-              eq(notificationSettings.target_type, "global-agent")
+              eq(notificationSettings.target_type, "global-agent"),
+              eq(notificationSettings.user_id, userId) // 增加 userId 过滤
             )
           )
       : null;
@@ -272,7 +282,8 @@ export async function handleAgentThresholdNotification(
       "agent",
       agentId,
       variables,
-      channels
+      channels,
+      userId // 修复: 传入 userId
     );
 
     if (notificationResult.success) {

backend/src/jobs/monitor-task.ts

@@ -77,6 +77,7 @@ async function handleMonitorNotification(
     // 检查是否需要发送通知
     console.log(`检查通知设置...`);
     const notificationCheck = await shouldSendNotification(
+      monitor.created_by, // 修复: 传入 userId
       "monitor",
       monitor.id,
       checkResult.previous_status,
@@ -132,7 +133,8 @@ async function handleMonitorNotification(
       "monitor",
       monitor.id,
       variables,
-      notificationCheck.channels
+      notificationCheck.channels,
+      monitor.created_by // 修复: 传入 userId
     );
 
     console.log(`通知发送结果: ${JSON.stringify(notificationResult)}`);