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

648540858

2022-01-26 f9b8ea6573126f913da80be5c507c21c907246ee

 src/main/java/com/genersoft/iot/vmp/service/bean/CatalogSubscribeTask.java

@@ -26,20 +26,8 @@
            ResponseEvent event = (ResponseEvent) eventResult.event;
            Element rootElement = null;
            if (event.getResponse().getRawContent() != null) {
                try {
                    rootElement = XmlUtil.getRootElement(event.getResponse().getRawContent(), "gb2312");
                } catch (DocumentException e) {
                    e.printStackTrace();
                }
                Element resultElement = rootElement.element("Result");
                String result = resultElement.getText();
                if (result.toUpperCase().equals("OK")){
                    // 成功
                    logger.info("[目录订阅]成功： {}", device.getDeviceId());
                }else {
                    // 失败
                    logger.info("[目录订阅]失败： {}-{}", device.getDeviceId(), result);
                }
                // 成功
                logger.info("[目录订阅]成功： {}", device.getDeviceId());
            }else {
                // 成功
                logger.info("[目录订阅]成功： {}", device.getDeviceId());