Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2023-02-09 48fad3582d81dd79423db1db5402d9f47fd5f30f

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

@@ -25,7 +25,7 @@
    @Value("${media.ip}")
    private String ip;

    @Value("${media.hook-ip:${sip.ip}}")
    @Value("${media.hook-ip:}")
    private String hookIp;

    @Value("${sip.ip}")
@@ -86,7 +86,7 @@

    public String getHookIp() {
        if (ObjectUtils.isEmpty(hookIp)){
            return sipIp;
            return sipIp.split(",")[0];
        }else {
            return hookIp;
        }