From ff06df82631cad5db6d62d2a026d80cad87920e8 Mon Sep 17 00:00:00 2001
From: windows11 <windows11@pc>
Date: Mon, 9 Oct 2023 13:05:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=91=8A=E8=AD=A6=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E5=92=8CURL=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
=?UTF-8?q?=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/src/main.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 4ad00e0..61ab9fa 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -325,11 +325,10 @@ void CMain::WatchdogMessage(int ClientNetID, double load_1, double load_5, doubl
char standardTime[32]= { 0 };
strftime(standardTime, sizeof(standardTime), "%Y-%m-%d %H:%M:%S",localtime(¤tStamp));
- //url encode
+ //url encode, Rules conflict with url special characters，eg：&, del rules, by https://cpp.la, 2023-10-09
char encodeBuffer[2048] = { 0 };
- sprintf(encodeBuffer, " \n\n【告警名称】 %s \n\n【告警规则】 %s \n\n【告警时间】 %s \n\n ---------------- \n\n【用户名】 %s \n\n【节点名】 %s \n\n【虚拟化】 %s \n\n【主机名】 %s \n\n【位 置】 %s",
+ sprintf(encodeBuffer, "【告警名称】 %s \n\n【告警时间】 %s \n\n【用户名】 %s \n\n【节点名】 %s \n\n【虚拟化】 %s \n\n【主机名】 %s \n\n【位 置】 %s",
Watchdog(ID)->m_aName,
- Watchdog(ID)->m_aRule,
standardTime,
Client(ClientID)->m_aUsername,
Client(ClientID)->m_aName,