Merge branch 'master' of https://github.com/swwheihei/wvp.git

songww

2020-05-11 d072017bdc40ac9e4c5f521cad34cb63783097e1

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

@@ -3,7 +3,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;

@Configuration
@Configuration("sipConfig")
public class SipConfig {

   @Value("${sip.ip}")
@@ -16,7 +16,6 @@
   String sipPassword;
   @Value("${media.ip}")
   String mediaIp;
	
   @Value("${media.port}")
   Integer mediaPort;