Merge branch 'refs/heads/2.7.1'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/OnStreamChangedHookParam.java

@@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.media.zlm.dto.hook;
 import com.genersoft.iot.vmp.vmanager.bean.StreamContent;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author lin
@@ -98,6 +99,16 @@ public class OnStreamChangedHookParam extends HookParam{
      */
     private String vhost;
 
+    /**
+     * 额外的参数字符串
+     */
+    private String params;
+
+    /**
+     * 额外的参数
+     */
+    private Map<String, String> paramMap;
+
     public boolean isRegist() {
         return regist;
     }
@@ -496,6 +507,23 @@ public class OnStreamChangedHookParam extends HookParam{
         this.callId = callId;
     }
 
+
+    public Map<String, String> getParamMap() {
+        return paramMap;
+    }
+
+    public void setParamMap(Map<String, String> paramMap) {
+        this.paramMap = paramMap;
+    }
+
+    public String getParams() {
+        return params;
+    }
+
+    public void setParams(String params) {
+        this.params = params;
+    }
+
     @Override
     public String toString() {
         return "OnStreamChangedHookParam{" +