From 27306db9a074ea4ebdb5e75237f058e4e9af2167 Mon Sep 17 00:00:00 2001
From: 高胜 <gs@hdlchina.com.cn>
Date: 星期一, 08 五月 2023 11:25:45 +0800
Subject: [PATCH] 更新报警接口
---
HDLMonitorService/HDLMonitorService/HDLMonitorService/App.config | 6 +-
HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.exe | 0
HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csproj.FileListAbsolute.txt | 13 ++++++
HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.vshost.exe.config | 1
HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.pdb | 0
HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe | 0
/dev/null | 0
HDLMonitorService/HDLMonitorService/.vs/HDLMonitorService/v14/.suo | 0
HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
HDLMonitorService/HDLMonitorService/HDLMonitorService/Helper/AlarmHp.cs | 57 +++++++++++++++-------------
HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe.config | 6 +-
HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Debug/HDLMonitorService.csproj.FileListAbsolute.txt | 3 +
HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.pdb | 0
13 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/HDLMonitorService/HDLMonitorService/.vs/HDLMonitorService/v14/.suo b/HDLMonitorService/HDLMonitorService/.vs/HDLMonitorService/v14/.suo
index 71d50a3..5e8da4b 100644
--- a/HDLMonitorService/HDLMonitorService/.vs/HDLMonitorService/v14/.suo
+++ b/HDLMonitorService/HDLMonitorService/.vs/HDLMonitorService/v14/.suo
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/App.config b/HDLMonitorService/HDLMonitorService/HDLMonitorService/App.config
index 6f53e96..5f268dc 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/App.config
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/App.config
@@ -2,9 +2,9 @@
<configuration>
<appSettings>
<add key="ServerIp" value="118.31.3.103"/>
- <add key="ApplicationAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/applicationWarn"/>
- <add key="WechatAlarm" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>
- <add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>
+ <add key="ApplicationAlarm" value="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="WechatAlarm" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>-->
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="QueryHomeIdByGateway" value="https://developer.hdlcontrol.com/ProposedProductionApi/App/DetectionMacOfHomeId"/>
<add key="PushExUrl" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>
<add key="DuerOsApi" value="https://hdlcontrol.com/api/BaiduButtDuerOS.ashx"/>
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)
+ // {
+ // //鍙戦�佹垚鍔�
+ // }
+ //}
}
}
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe
index 68e66e2..701509f 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe.config b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe.config
index 6f53e96..5f268dc 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe.config
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.exe.config
@@ -2,9 +2,9 @@
<configuration>
<appSettings>
<add key="ServerIp" value="118.31.3.103"/>
- <add key="ApplicationAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/applicationWarn"/>
- <add key="WechatAlarm" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>
- <add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>
+ <add key="ApplicationAlarm" value="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="WechatAlarm" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>-->
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="QueryHomeIdByGateway" value="https://developer.hdlcontrol.com/ProposedProductionApi/App/DetectionMacOfHomeId"/>
<add key="PushExUrl" value="http://iot.hdlcontrol.com:8888/hdl-support-monitor/api/alarm/alarmPush"/>
<add key="DuerOsApi" value="https://hdlcontrol.com/api/BaiduButtDuerOS.ashx"/>
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.pdb b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.pdb
index 4ec2998..0cc5be8 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.pdb
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.pdb
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.vshost.exe.config b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.vshost.exe.config
index f525e0c..6f53e96 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.vshost.exe.config
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/bin/Release/HDLMonitorService.vshost.exe.config
@@ -17,6 +17,7 @@
<add key="LoopErrorCount" value="3"/>
<add key="LoopAlarmCount" value="5"/>
<add key="ListenerProt" value="1314"/>
+ <add key="ListenerAlarmProt" value="3344"/>
<add key="MqPath" value=".private$\MonitorAlarm"/>
</appSettings>
<startup>
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Debug/HDLMonitorService.csproj.FileListAbsolute.txt b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Debug/HDLMonitorService.csproj.FileListAbsolute.txt
index c79b826..bd97d88 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Debug/HDLMonitorService.csproj.FileListAbsolute.txt
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Debug/HDLMonitorService.csproj.FileListAbsolute.txt
@@ -12,3 +12,6 @@
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Debug\HDLMonitorService.pdb
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Debug\Json\GatewayReqPack.json
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Debug\HDLMonitorService.csprojResolveAssemblyReference.cache
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Debug\HDLMonitorService.exe.config
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Debug\HDLMonitorService.exe
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Debug\HDLMonitorService.pdb
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 7704473..06f5f60 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csproj.FileListAbsolute.txt b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csproj.FileListAbsolute.txt
index ab12c33..b30eb8a 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csproj.FileListAbsolute.txt
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csproj.FileListAbsolute.txt
@@ -12,3 +12,16 @@
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.pdb
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Json\GatewayReqPack.json
E:\鍏徃椤圭洰\鐗规畩搴旂敤\鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.csprojResolveAssemblyReference.cache
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\HDLMonitorService.exe.config
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.exe
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.pdb
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Json\AlexaReqPack.json
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Json\DuerOsReqPack.json
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Json\GatewayReqPack.json
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\HDLMonitorService.exe
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\HDLMonitorService.pdb
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Newtonsoft.Json.dll
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\bin\Release\Newtonsoft.Json.xml
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.HDLMonitorService.resources
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.ProjectInstaller.resources
+E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫HDLMonitorService\HDLMonitorService\HDLMonitorService\HDLMonitorService\obj\Release\HDLMonitorService.csproj.GenerateResource.Cache
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csprojResolveAssemblyReference.cache b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csprojResolveAssemblyReference.cache
deleted file mode 100644
index 280bb0c..0000000
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.exe b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.exe
index 68e66e2..701509f 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.exe
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.exe
Binary files differ
diff --git a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.pdb b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.pdb
index 4ec2998..0cc5be8 100644
--- a/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.pdb
+++ b/HDLMonitorService/HDLMonitorService/HDLMonitorService/obj/Release/HDLMonitorService.pdb
Binary files differ
--
Gitblit v1.8.0