From cf31c5a262ad9f8fe66e884c4ca82d6c060422ff Mon Sep 17 00:00:00 2001
From: 高胜 <gs@hdlchina.com.cn>
Date: 星期二, 23 五月 2023 13:45:52 +0800
Subject: [PATCH] 1
---
HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs b/HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs
index 71a2104..1f406e4 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs
@@ -24,7 +24,9 @@
alarmType = alarmType,
content = content,
serviceIp = ip,
- serviceName = serviceName
+ serviceName = serviceName,
+ trace = Guid.NewGuid().ToString().Replace("-", string.Empty),
+ alarmLevel = "HIGH"
};
var data = HttpHp.GetSignRequestJson(dto);
@@ -32,7 +34,7 @@
var result = HttpHp.Post<ResponseData>(ConfigurationManager.AppSettings["ApplicationAlarm"].ToString(), data);
if (result != null && result.code == 0)
{
- WechatAlarm(serviceName, "CUSTOM_ALARM", content, ip, "HIGH", title);
+ //WechatAlarm(serviceName, "CUSTOM_ALARM", content, ip, "HIGH", title);
}
}
@@ -40,41 +42,42 @@
{
var dto = new
{
- alarmType = "SPRING_BOOT_ADMIN",
+ alarmType = "OFFLINE",
content = content,
- server = ip,
- application = serviceName,
- subType = "OFFLINE"
+ serviceIp = ip,
+ serviceName = serviceName,
+ trace = Guid.NewGuid().ToString().Replace("-", string.Empty),
+ alarmLevel = "HIGH"
};
var data = HttpHp.GetSignRequestJson(dto);
- var result = HttpHp.Post<ResponseData>(ConfigurationManager.AppSettings["ServiceAlarm"].ToString(), data);
+ var result = HttpHp.Post<ResponseData>(ConfigurationManager.AppSettings["ApplicationAlarm"].ToString(), data);
if (result != null && result.code == 0)
{
- WechatAlarm(serviceName, "SPRING_BOOT_ADMIN", content, ip, "HIGH", title);
+ //WechatAlarm(serviceName, "SPRING_BOOT_ADMIN", content, ip, "HIGH", title);
}
}
- public static void WechatAlarm(string serviceName, string alarmType, string content, string ip, string alarmLevel, string subType)
- {
- var wechatDto = new
- {
- alarmType = alarmType,
- alarmLevel = alarmLevel,
- server = ip,
- application = serviceName,
- subType = subType,
- time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- trace = Guid.NewGuid().ToString().Replace("-", string.Empty),
- content = content
- };
+ //public static void WechatAlarm(string serviceName, string alarmType, string content, string ip, string alarmLevel, string subType)
+ //{
+ // var wechatDto = new
+ // {
+ // alarmType = alarmType,
+ // alarmLevel = alarmLevel,
+ // server = ip,
+ // application = serviceName,
+ // subType = subType,
+ // time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ // trace = Guid.NewGuid().ToString().Replace("-", string.Empty),
+ // content = content
+ // };
- var wechatResult = HttpHp.Post<ResponseData>(ConfigurationManager.AppSettings["WechatAlarm"], Newtonsoft.Json.JsonConvert.SerializeObject(wechatDto));
- if (wechatResult != null && wechatResult.code == 0)
- {
- //鍙戦�佹垚鍔�
- }
- }
+ // var wechatResult = HttpHp.Post<ResponseData>(ConfigurationManager.AppSettings["WechatAlarm"], Newtonsoft.Json.JsonConvert.SerializeObject(wechatDto));
+ // if (wechatResult != null && wechatResult.code == 0)
+ // {
+ // //鍙戦�佹垚鍔�
+ // }
+ //}
}
}
--
Gitblit v1.8.0