From 2d80ee122541898b7e3e4dc5507997498be9b484 Mon Sep 17 00:00:00 2001
From: 高胜 <gs@hdlchina.com.cn>
Date: 星期二, 23 五月 2023 13:46:13 +0800
Subject: [PATCH] 更新链接
---
RestartService/RestartService/obj/Debug/RestartService.csproj.GenerateResource.cache | 0
RestartService/RestartService/obj/Debug/RestartService.csprojResolveAssemblyReference.cache | 0
RestartService/RestartService/obj/Release/RestartService.csproj.GenerateResource.cache | 0
RestartService/RestartService/Monitor/Packet.cs | 2
RestartService/RestartService/bin/Debug/RestartService.vshost.exe.manifest | 11 +++++
RestartService/RestartService/obj/Debug/RestartService.pdb | 0
RestartService/RestartService/bin/Release/RestartService.exe.config | 6 +-
RestartService/.vs/RestartService/v14/.suo | 0
RestartService/RestartService/obj/Debug/RestartService.exe | 0
RestartService/RestartService/Alarm/AlarmHp.cs | 22 ++++++++++-
RestartService/RestartService/App.config | 6 +-
RestartService/RestartService/bin/Release/RestartService.exe | 0
/dev/null | 0
RestartService/RestartService/obj/Release/RestartService.csproj.FileListAbsolute.txt | 1
RestartService/RestartService/bin/Debug/RestartService.exe.config | 17 ++++----
RestartService/RestartService/obj/Release/RestartService.exe | 0
RestartService/RestartService/bin/Debug/RestartService.pdb | 0
RestartService/RestartService/bin/Release/RestartService.vshost.exe.config | 6 +-
RestartService/RestartService/obj/Release/RestartService.pdb | 0
RestartService/RestartService/bin/Debug/RestartService.exe | 0
RestartService/RestartService/bin/Release/RestartService.pdb | 0
21 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/RestartService/.vs/RestartService/v14/.suo b/RestartService/.vs/RestartService/v14/.suo
index d5dd03a..2848315 100644
--- a/RestartService/.vs/RestartService/v14/.suo
+++ b/RestartService/.vs/RestartService/v14/.suo
Binary files differ
diff --git a/RestartService/RestartService/Alarm/AlarmHp.cs b/RestartService/RestartService/Alarm/AlarmHp.cs
index 0ed9a80..798603c 100644
--- a/RestartService/RestartService/Alarm/AlarmHp.cs
+++ b/RestartService/RestartService/Alarm/AlarmHp.cs
@@ -31,7 +31,7 @@
//var result = HttpHp.Post<ResponseData<object>>(ConfigurationManager.AppSettings["ApplicationAlarm"].ToString(), data);
//if (result != null && result.code == 0)
{
- WechatAlarm(serviceName, "CUSTOM_ALARM", content, ip, "HIGH", title);
+ WechatAlarm(serviceName, "warn-system", content, ip, "HIGH", title);
}
}
@@ -51,12 +51,30 @@
//var result = HttpHp.Post<ResponseData<object>>(ConfigurationManager.AppSettings["ServiceAlarm"].ToString(), data);
//if (result != null && result.code == 0)
{
- WechatAlarm(serviceName, "SPRING_BOOT_ADMIN", content, ip, "HIGH", title);
+ WechatAlarm(serviceName, "OFFLINE", content, ip, "HIGH", title);
}
}
public static void WechatAlarm(string serviceName, string alarmType, string content, string ip, string alarmLevel, string subType)
{
+ //var dto = new
+ //{
+ // alarmType = alarmType,
+ // content = content,
+ // serviceIp = ip,
+ // serviceName = serviceName,
+ // trace = Guid.NewGuid().ToString().Replace("-", string.Empty),
+ // alarmLevel = alarmLevel
+ //};
+
+ //var data = HttpHp.GetSignRequestJson(dto);
+
+ //var result = HttpHp.Post<ResponseData<object>>(ConfigurationManager.AppSettings["ApplicationAlarm"].ToString(), data);
+ //if (result != null && result.code == 0)
+ //{
+ // //WechatAlarm(serviceName, "SPRING_BOOT_ADMIN", content, ip, "HIGH", title);
+ //}
+
var wechatDto = new
{
alarmType = alarmType,
diff --git a/RestartService/RestartService/App.config b/RestartService/RestartService/App.config
index 8073d92..0eda72d 100644
--- a/RestartService/RestartService/App.config
+++ b/RestartService/RestartService/App.config
@@ -10,9 +10,9 @@
<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="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="AppKey" value="HDL-HOME-APP-TEST"/>
<add key="SecretKey" value="WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"/>
diff --git a/RestartService/RestartService/Monitor/Packet.cs b/RestartService/RestartService/Monitor/Packet.cs
index 15b2948..fa68c2f 100644
--- a/RestartService/RestartService/Monitor/Packet.cs
+++ b/RestartService/RestartService/Monitor/Packet.cs
@@ -60,7 +60,7 @@
//PointLogUtil.LogsUtil.WriteLog("鏁版嵁杞彂鏈嶅姟宸叉仮澶嶆甯革紝涓嶅彲鐢ㄧ姸鎬佹寔缁�" + minuite + "鍒嗛挓锛�");
}
- System.IO.File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + $"UDPStart.txt", "鏁版嵁杞彂鏈嶅姟锛乗r\n\r\n");
+ //System.IO.File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + $"UDPStart.txt", "鏁版嵁杞彂鏈嶅姟锛乗r\n\r\n");
//鏀跺埌鏁版嵁娓呴浂
ServerMonitor.ServerSendCount = 0;
diff --git a/RestartService/RestartService/bin/Debug/RestartService.exe b/RestartService/RestartService/bin/Debug/RestartService.exe
index 2a95465..989767d 100644
--- a/RestartService/RestartService/bin/Debug/RestartService.exe
+++ b/RestartService/RestartService/bin/Debug/RestartService.exe
Binary files differ
diff --git a/RestartService/RestartService/bin/Debug/RestartService.exe.config b/RestartService/RestartService/bin/Debug/RestartService.exe.config
index 452e66f..0eda72d 100644
--- a/RestartService/RestartService/bin/Debug/RestartService.exe.config
+++ b/RestartService/RestartService/bin/Debug/RestartService.exe.config
@@ -2,23 +2,22 @@
<configuration>
<appSettings>
<add key="RunAfter" value="MSMQ"/>
- <add key="Servers" value="Server,FtpServer,闄堣吹鍐涚壒娈婃湇鍔″櫒,PushServer,娓呯悊宸ュ叿"/>
- <add key="Server" value="D:\Servers\GateWayServer\Server.exe"/>
- <add key="闄堣吹鍐涚壒娈婃湇鍔″櫒" value="D:\Servers\鐗规畩搴旂敤\闄堣吹鍐沑闄堣吹鍐涚壒娈婃湇鍔″櫒.exe"/>
- <add key="FtpServer" value="D:\Servers\FtpServer\FtpServer.exe"/>
- <add key="PushServer" value="D:\Servers\PushServer\PushServer.exe"/>
- <add key="娓呯悊宸ュ叿" value="D:\FTP\娓呯悊宸ュ叿\娓呯悊宸ュ叿.exe"/>
+ <add key="Servers" value="Server,MQTTPush,MQTTPenetrate"/>
+ <add key="Server" value="D:\Server(New)\Server.exe"/>
+ <add key="MQTTPush" value="D:\MQTTPush\MQTTPush.exe"/>
+ <add key="MQTTPenetrate" value="D:\MQTTPenetrate\MQTTPenetrate.exe"/>
<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="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="AppKey" value="HDL-HOME-APP-TEST"/>
<add key="SecretKey" value="WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"/>
<add key="EmqClientUrl" value="http://15.185.137.39:8081/api/v4/clients/ForeignPenetrateService"/>
+ <add key="EmqPushUrl" value="http://15.185.137.39:8081/api/v4/clients/ForeignPenetrateService1"/>
<add key="EmqAuthToken" value="Basic MmY1ZjEyZmVkYzFlOk16QTVPREE1TURrM056a3pNemt3TWpnMk9EZ3dORGt4TnpJeU1EWTBOVEkzTXpH"/>
</appSettings>
diff --git a/RestartService/RestartService/bin/Debug/RestartService.pdb b/RestartService/RestartService/bin/Debug/RestartService.pdb
index 4e54d1e..0361913 100644
--- a/RestartService/RestartService/bin/Debug/RestartService.pdb
+++ b/RestartService/RestartService/bin/Debug/RestartService.pdb
Binary files differ
diff --git a/RestartService/RestartService/bin/Debug/RestartService.vshost.exe.manifest b/RestartService/RestartService/bin/Debug/RestartService.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/RestartService/RestartService/bin/Debug/RestartService.vshost.exe.manifest
@@ -0,0 +1,11 @@
+锘�<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+ <security>
+ <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+ <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+</assembly>
diff --git a/RestartService/RestartService/bin/Release/RestartService.exe b/RestartService/RestartService/bin/Release/RestartService.exe
index 529132b..80fcbe1 100644
--- a/RestartService/RestartService/bin/Release/RestartService.exe
+++ b/RestartService/RestartService/bin/Release/RestartService.exe
Binary files differ
diff --git a/RestartService/RestartService/bin/Release/RestartService.exe.config b/RestartService/RestartService/bin/Release/RestartService.exe.config
index 8073d92..0eda72d 100644
--- a/RestartService/RestartService/bin/Release/RestartService.exe.config
+++ b/RestartService/RestartService/bin/Release/RestartService.exe.config
@@ -10,9 +10,9 @@
<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="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="AppKey" value="HDL-HOME-APP-TEST"/>
<add key="SecretKey" value="WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"/>
diff --git a/RestartService/RestartService/bin/Release/RestartService.pdb b/RestartService/RestartService/bin/Release/RestartService.pdb
index 7e91f5f..cee1c34 100644
--- a/RestartService/RestartService/bin/Release/RestartService.pdb
+++ b/RestartService/RestartService/bin/Release/RestartService.pdb
Binary files differ
diff --git a/RestartService/RestartService/bin/Release/RestartService.vshost.exe.config b/RestartService/RestartService/bin/Release/RestartService.vshost.exe.config
index 8073d92..0eda72d 100644
--- a/RestartService/RestartService/bin/Release/RestartService.vshost.exe.config
+++ b/RestartService/RestartService/bin/Release/RestartService.vshost.exe.config
@@ -10,9 +10,9 @@
<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="https://china-gateway.hdlcontrol.com/support-monitor/webhook/cloudmonitor/applicationWarn"/>
+ <!--<add key="ServiceAlarm" value="https://test-gz.hdlcontrol.com/iot-cloud/webhook/cloudmonitor/supportMonitor"/>-->
<add key="AppKey" value="HDL-HOME-APP-TEST"/>
<add key="SecretKey" value="WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"/>
diff --git a/RestartService/RestartService/obj/Debug/RestartService.csproj.GenerateResource.cache b/RestartService/RestartService/obj/Debug/RestartService.csproj.GenerateResource.cache
index bca7a8f..4e1f1c3 100644
--- a/RestartService/RestartService/obj/Debug/RestartService.csproj.GenerateResource.cache
+++ b/RestartService/RestartService/obj/Debug/RestartService.csproj.GenerateResource.cache
Binary files differ
diff --git a/RestartService/RestartService/obj/Debug/RestartService.csprojResolveAssemblyReference.cache b/RestartService/RestartService/obj/Debug/RestartService.csprojResolveAssemblyReference.cache
index 06dec9c..d4cdba2 100644
--- a/RestartService/RestartService/obj/Debug/RestartService.csprojResolveAssemblyReference.cache
+++ b/RestartService/RestartService/obj/Debug/RestartService.csprojResolveAssemblyReference.cache
Binary files differ
diff --git a/RestartService/RestartService/obj/Debug/RestartService.exe b/RestartService/RestartService/obj/Debug/RestartService.exe
index 2a95465..989767d 100644
--- a/RestartService/RestartService/obj/Debug/RestartService.exe
+++ b/RestartService/RestartService/obj/Debug/RestartService.exe
Binary files differ
diff --git a/RestartService/RestartService/obj/Debug/RestartService.pdb b/RestartService/RestartService/obj/Debug/RestartService.pdb
index 4e54d1e..0361913 100644
--- a/RestartService/RestartService/obj/Debug/RestartService.pdb
+++ b/RestartService/RestartService/obj/Debug/RestartService.pdb
Binary files differ
diff --git a/RestartService/RestartService/obj/Release/RestartService.csproj.FileListAbsolute.txt b/RestartService/RestartService/obj/Release/RestartService.csproj.FileListAbsolute.txt
index 956604f..ff184a2 100644
--- a/RestartService/RestartService/obj/Release/RestartService.csproj.FileListAbsolute.txt
+++ b/RestartService/RestartService/obj/Release/RestartService.csproj.FileListAbsolute.txt
@@ -17,4 +17,3 @@
E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫RestartService\RestartService\RestartService\obj\Release\RestartService.c.resources
E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫RestartService\RestartService\RestartService\obj\Release\RestartService.csproj.GenerateResource.Cache
E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫RestartService\RestartService\RestartService\obj\Release\RestartService.RestartService.resources
-E:\鍏徃椤圭洰\鏈嶅姟鍣ㄤ唬鐮乗鏈嶅姟鍣ㄧ洃鎺х▼搴廫RestartService\RestartService\RestartService\obj\Release\RestartService.csprojResolveAssemblyReference.cache
diff --git a/RestartService/RestartService/obj/Release/RestartService.csproj.GenerateResource.cache b/RestartService/RestartService/obj/Release/RestartService.csproj.GenerateResource.cache
index 8ecd853..4e1f1c3 100644
--- a/RestartService/RestartService/obj/Release/RestartService.csproj.GenerateResource.cache
+++ b/RestartService/RestartService/obj/Release/RestartService.csproj.GenerateResource.cache
Binary files differ
diff --git a/RestartService/RestartService/obj/Release/RestartService.csprojResolveAssemblyReference.cache b/RestartService/RestartService/obj/Release/RestartService.csprojResolveAssemblyReference.cache
deleted file mode 100644
index dc1524e..0000000
--- a/RestartService/RestartService/obj/Release/RestartService.csprojResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/RestartService/RestartService/obj/Release/RestartService.exe b/RestartService/RestartService/obj/Release/RestartService.exe
index 529132b..80fcbe1 100644
--- a/RestartService/RestartService/obj/Release/RestartService.exe
+++ b/RestartService/RestartService/obj/Release/RestartService.exe
Binary files differ
diff --git a/RestartService/RestartService/obj/Release/RestartService.pdb b/RestartService/RestartService/obj/Release/RestartService.pdb
index 7e91f5f..cee1c34 100644
--- a/RestartService/RestartService/obj/Release/RestartService.pdb
+++ b/RestartService/RestartService/obj/Release/RestartService.pdb
Binary files differ
--
Gitblit v1.8.0