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

648540858

2021-12-02 a1398a56cc3587f08c28032a5c00f4c71b48e4f7

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

@@ -47,7 +47,7 @@
    private boolean sslEnabled;

    @Value("${server.port}")
    private String serverPort;
    private Integer serverPort;

    @Autowired
    private MediaConfig mediaConfig;