Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

hotcoffie

2021-12-01 a16b4f71ec5a4d3d526c9c35a1e1f7843a49e921

 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;