Merge b20abe8a76 into c395cf42d1

src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java

@@ -76,6 +76,9 @@ public class MediaConfig{
     @Value("${media.record-assist-port:0}")
     private Integer recordAssistPort = 0;
 
+    @Value("${media.record-hook-prefix:}")
+    private String recordHookPrefix;
+
     public String getId() {
         return id;
     }
@@ -182,6 +185,10 @@ public class MediaConfig{
         return sendRtpPortRange;
     }
 
+    public String getRecordHookPrefix() {
+        return recordHookPrefix;
+    }
+
     public MediaServerItem getMediaSerItem(){
         MediaServerItem mediaServerItem = new MediaServerItem();
         mediaServerItem.setId(id);

src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
+import com.genersoft.iot.vmp.conf.MediaConfig;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@@ -89,6 +90,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
     @Autowired
     JedisUtil jedisUtil;
 
+    @Autowired
+    private MediaConfig mediaConfig;
+
     private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     /**
@@ -491,6 +495,8 @@ public class MediaServerServiceImpl implements IMediaServerService {
         String recordHookPrex = null;
         if (mediaServerItem.getRecordAssistPort() != 0) {
             recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort());
+        } else if (StringUtils.hasText(mediaConfig.getRecordHookPrefix())) {
+            recordHookPrex = mediaConfig.getRecordHookPrefix();
         }
         Map<String, Object> param = new HashMap<>();
         param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline