Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

zhubaomin

昨天 70f61b0638e32274d0e5f9b972ce2a18f139f1b4

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java

@@ -474,6 +474,7 @@
            if(mqVo.poolMaxSize <= 1 || mqVo.poolMaxSize > 1000){
               throw new Exception("config.mqtt.poolMaxSize配置的连接池连接最大数量不合法") ;
            }
            mqVo.useMemoryPersistence = conf.getSetAttrBoolean(doc, "config.mqtt", "useMemoryPersistence", null, null) ;
            String proAndDevIds = conf.getSetAttrTxt(doc, "config.mqtt", "protocolAndDeviceIds", null, false, null) ;
            if(proAndDevIds == null || proAndDevIds.trim().equals("")){
               throw new Exception("config.mqtt.protocolAndDeviceIds配置不合法") ;