Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-03 43ef195543c087d88ac3eea98067b81d7e2b10c2

 src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java

@@ -7,6 +7,8 @@
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
@@ -44,10 +46,10 @@
@RequestMapping("/api/rtp")
public class RtpController {

    private final static Logger logger = LoggerFactory.getLogger(RtpController.class);

    @Autowired
    private ZLMRTPServerFactory zlmServerFactory;
    private ZLMServerFactory zlmServerFactory;

    private final static Logger logger = LoggerFactory.getLogger(RtpController.class);

    @Autowired
    private ZlmHttpHookSubscribe hookSubscribe;