Merge branch 'refs/heads/master' into 1078

# Conflicts:
#	src/main/resources/application.yml

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

@@ -27,19 +27,19 @@ public class MediaConfig{
     @Value("${media.ip}")
     private String ip;
 
-    @Value("${media.hook-ip:}")
-    private String hookIp;
+    @Value("${media.wan_ip:}")
+    private String wanIp;
 
-    @Value("${sip.ip}")
-    private String sipIp;
+    @Value("${media.hook-ip:127.0.0.1}")
+    private String hookIp;
 
     @Value("${sip.domain}")
     private String sipDomain;
 
-    @Value("${media.sdp-ip:${media.ip}}")
+    @Value("${media.sdp-ip:${media.wan_ip:}}")
     private String sdpIp;
 
-    @Value("${media.stream-ip:${media.ip}}")
+    @Value("${media.stream-ip:${media.wan_ip:}}")
     private String streamIp;
 
     @Value("${media.http-port:0}")
@@ -111,20 +111,7 @@ public class MediaConfig{
     }
 
     public String getHookIp() {
-        if (ObjectUtils.isEmpty(hookIp)){
-            return sipIp;
-        }else {
-            return hookIp;
-        }
-
-    }
-
-    public String getSipIp() {
-        if (sipIp == null) {
-            return this.ip;
-        }else {
-            return sipIp;
-        }
+        return hookIp;
     }
 
     public int getHttpPort() {
@@ -296,4 +283,12 @@ public class MediaConfig{
         }
         return false;
     }
+
+    public String getWanIp() {
+        return wanIp;
+    }
+
+    public void setWanIp(String wanIp) {
+        this.wanIp = wanIp;
+    }
 }

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

@@ -98,9 +98,6 @@ public class SipConfig {
 	}
 
 	public String getShowIp() {
-		if (this.showIp == null) {
-			return this.ip;
-		}
 		return showIp;
 	}
 

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

@@ -21,7 +21,7 @@ public class UserSetting {
 
     private Boolean seniorSdp = Boolean.FALSE;
 
-    private Integer playTimeout = 18000;
+    private Integer playTimeout = 10000;
 
     private int platformPlayTimeout = 20000;
 
@@ -74,7 +74,7 @@ public class UserSetting {
 
     private boolean registerKeepIntDialog = false;
 
-    private int gbDeviceOnline = 0;
+    private int gbDeviceOnline = 1;
 
     public Boolean getSavePositionHistory() {
         return savePositionHistory;

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

@@ -22,7 +22,7 @@ public class WVPTimerTask {
     @Scheduled(fixedRate = 2 * 1000)   //每3秒执行一次
     public void execute(){
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("ip", sipConfig.getIp());
+        jsonObject.put("ip", sipConfig.getShowIp());
         jsonObject.put("port", serverPort);
         redisCatchStorage.updateWVPInfo(jsonObject, 3);
     }