默认hook地址置空，方便关闭hook

同时整理简化代码

server/WebHook.cpp

@@ -9,8 +9,6 @@
  */
 
 #include <sstream>
-#include <unordered_map>
-#include <mutex>
 #include "jsoncpp/json.h"
 #include "Util/logger.h"
 #include "Util/util.h"
@@ -23,7 +21,6 @@
 #include "Rtsp/RtspSession.h"
 #include "Http/HttpSession.h"
 #include "WebHook.h"
-#include "Record/MP4Recorder.h"
 
 using namespace Json;
 using namespace toolkit;
@@ -63,19 +60,20 @@ const string kAdminParams = HOOK_FIELD"admin_params";
 onceToken token([](){
     mINI::Instance()[kEnable] = false;
     mINI::Instance()[kTimeoutSec] = 10;
-    mINI::Instance()[kOnPublish] = "https://127.0.0.1/index/hook/on_publish";
+    //默认hook地址设置为空，采用默认行为(例如不鉴权)
-    mINI::Instance()[kOnPlay] = "https://127.0.0.1/index/hook/on_play";
+    mINI::Instance()[kOnPublish] = "";
-    mINI::Instance()[kOnFlowReport] = "https://127.0.0.1/index/hook/on_flow_report";
+    mINI::Instance()[kOnPlay] = "";
-    mINI::Instance()[kOnRtspRealm] = "https://127.0.0.1/index/hook/on_rtsp_realm";
+    mINI::Instance()[kOnFlowReport] = "";
-    mINI::Instance()[kOnRtspAuth] = "https://127.0.0.1/index/hook/on_rtsp_auth";
+    mINI::Instance()[kOnRtspRealm] = "";
-    mINI::Instance()[kOnStreamChanged] = "https://127.0.0.1/index/hook/on_stream_changed";
+    mINI::Instance()[kOnRtspAuth] = "";
-    mINI::Instance()[kOnStreamNotFound] = "https://127.0.0.1/index/hook/on_stream_not_found";
+    mINI::Instance()[kOnStreamChanged] = "";
-    mINI::Instance()[kOnRecordMp4] = "https://127.0.0.1/index/hook/on_record_mp4";
+    mINI::Instance()[kOnStreamNotFound] = "";
-    mINI::Instance()[kOnRecordTs] = "https://127.0.0.1/index/hook/on_record_ts";
+    mINI::Instance()[kOnRecordMp4] = "";
-    mINI::Instance()[kOnShellLogin] = "https://127.0.0.1/index/hook/on_shell_login";
+    mINI::Instance()[kOnRecordTs] = "";
-    mINI::Instance()[kOnStreamNoneReader] = "https://127.0.0.1/index/hook/on_stream_none_reader";
+    mINI::Instance()[kOnShellLogin] = "";
-    mINI::Instance()[kOnHttpAccess] = "https://127.0.0.1/index/hook/on_http_access";
+    mINI::Instance()[kOnStreamNoneReader] = "";
-    mINI::Instance()[kOnServerStarted] = "https://127.0.0.1/index/hook/on_server_started";
+    mINI::Instance()[kOnHttpAccess] = "";
+    mINI::Instance()[kOnServerStarted] = "";
     mINI::Instance()[kAdminParams] = "secret=035c73f7-bb6b-4889-a715-d9eb2d1925cc";
 },nullptr);
 }//namespace Hook
@@ -186,21 +184,10 @@ static void reportServerStarted(){
 
 void installWebHook(){
     GET_CONFIG(bool,hook_enable,Hook::kEnable);
-    GET_CONFIG(string,hook_publish,Hook::kOnPublish);
-    GET_CONFIG(string,hook_play,Hook::kOnPlay);
-    GET_CONFIG(string,hook_flowreport,Hook::kOnFlowReport);
     GET_CONFIG(string,hook_adminparams,Hook::kAdminParams);
-    GET_CONFIG(string,hook_rtsp_realm,Hook::kOnRtspRealm);
-    GET_CONFIG(string,hook_rtsp_auth,Hook::kOnRtspAuth);
-    GET_CONFIG(string,hook_stream_chaned,Hook::kOnStreamChanged);
-    GET_CONFIG(string,hook_stream_not_found,Hook::kOnStreamNotFound);
-    GET_CONFIG(string,hook_record_mp4,Hook::kOnRecordMp4);
-    GET_CONFIG(string,hook_record_ts,Hook::kOnRecordTs);
-    GET_CONFIG(string,hook_shell_login,Hook::kOnShellLogin);
-    GET_CONFIG(string,hook_stream_none_reader,Hook::kOnStreamNoneReader);
-    GET_CONFIG(string,hook_http_access,Hook::kOnHttpAccess);
 
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaPublish,[](BroadcastMediaPublishArgs){
+        GET_CONFIG(string,hook_publish,Hook::kOnPublish);
         GET_CONFIG(bool,toHls,General::kPublishToHls);
         GET_CONFIG(bool,toMP4,General::kPublishToMP4);
         if(!hook_enable || args._param_strs == hook_adminparams || hook_publish.empty() || sender.get_peer_ip() == "127.0.0.1"){
@@ -236,6 +223,7 @@ void installWebHook(){
     });
 
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaPlayed,[](BroadcastMediaPlayedArgs){
+        GET_CONFIG(string,hook_play,Hook::kOnPlay);
         if(!hook_enable || args._param_strs == hook_adminparams || hook_play.empty() || sender.get_peer_ip() == "127.0.0.1"){
             invoker("");
             return;
@@ -251,6 +239,7 @@ void installWebHook(){
     });
 
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastFlowReport,[](BroadcastFlowReportArgs){
+        GET_CONFIG(string,hook_flowreport,Hook::kOnFlowReport);
         if(!hook_enable || args._param_strs == hook_adminparams || hook_flowreport.empty() || sender.get_peer_ip() == "127.0.0.1"){
             return;
         }
@@ -270,6 +259,7 @@ void installWebHook(){
 
     //监听kBroadcastOnGetRtspRealm事件决定rtsp链接是否需要鉴权(传统的rtsp鉴权方案)才能访问
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastOnGetRtspRealm,[](BroadcastOnGetRtspRealmArgs){
+        GET_CONFIG(string,hook_rtsp_realm,Hook::kOnRtspRealm);
         if(!hook_enable || args._param_strs == hook_adminparams || hook_rtsp_realm.empty() || sender.get_peer_ip() == "127.0.0.1"){
             //无需认证
             invoker("");
@@ -292,6 +282,7 @@ void installWebHook(){
 
     //监听kBroadcastOnRtspAuth事件返回正确的rtsp鉴权用户密码
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastOnRtspAuth,[](BroadcastOnRtspAuthArgs){
+        GET_CONFIG(string,hook_rtsp_auth,Hook::kOnRtspAuth);
         if(unAuthedRealm == realm || !hook_enable || hook_rtsp_auth.empty()){
             //认证失败
             invoker(false,makeRandStr(12));
@@ -318,6 +309,7 @@ void installWebHook(){
 
     //监听rtsp、rtmp源注册或注销事件
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastMediaChanged,[](BroadcastMediaChangedArgs){
+        GET_CONFIG(string,hook_stream_chaned,Hook::kOnStreamChanged);
         if(!hook_enable || hook_stream_chaned.empty()){
             return;
         }
@@ -333,8 +325,10 @@ void installWebHook(){
 
     //监听播放失败(未找到特定的流)事件
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastNotFoundStream,[](BroadcastNotFoundStreamArgs){
+        GET_CONFIG(string,hook_stream_not_found,Hook::kOnStreamNotFound);
         if(!hook_enable || hook_stream_not_found.empty()){
-//            closePlayer();
+            //如果确定这个流不存在，可以closePlayer()返回播放器流不存在
+            //closePlayer();
             return;
         }
         auto body = make_json(args);
@@ -363,6 +357,7 @@ void installWebHook(){
 #ifdef ENABLE_MP4
     //录制mp4文件成功后广播
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastRecordMP4,[](BroadcastRecordMP4Args){
+        GET_CONFIG(string,hook_record_mp4,Hook::kOnRecordMp4);
         if (!hook_enable || hook_record_mp4.empty()) {
             return;
         }
@@ -372,6 +367,7 @@ void installWebHook(){
 #endif //ENABLE_MP4
 
     NoticeCenter::Instance().addListener(nullptr, Broadcast::kBroadcastRecordTs, [](BroadcastRecordTsArgs) {
+        GET_CONFIG(string,hook_record_ts,Hook::kOnRecordTs);
         if (!hook_enable || hook_record_ts.empty()) {
             return;
         }
@@ -380,6 +376,7 @@ void installWebHook(){
     });
 
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastShellLogin,[](BroadcastShellLoginArgs){
+        GET_CONFIG(string,hook_shell_login,Hook::kOnShellLogin);
         if(!hook_enable || hook_shell_login.empty() || sender.get_peer_ip() == "127.0.0.1"){
             invoker("");
             return;
@@ -398,6 +395,7 @@ void installWebHook(){
     });
 
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastStreamNoneReader,[](BroadcastStreamNoneReaderArgs){
+        GET_CONFIG(string,hook_stream_none_reader,Hook::kOnStreamNoneReader);
         if(!hook_enable || hook_stream_none_reader.empty()){
             return;
         }
@@ -435,6 +433,7 @@ void installWebHook(){
     //如果没有url参数，客户端又不支持cookie，那么会根据ip和端口追踪用户
     //追踪用户的目的是为了缓存上次鉴权结果，减少鉴权次数，提高性能
     NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastHttpAccess,[](BroadcastHttpAccessArgs){
+        GET_CONFIG(string,hook_http_access,Hook::kOnHttpAccess);
         if(sender.get_peer_ip() == "127.0.0.1" || parser.Params() == hook_adminparams){
             //如果是本机或超级管理员访问，那么不做访问鉴权；权限有效期1个小时
             invoker("","",60 * 60);