XML 解析工具类修改

byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/utils/XmlParseUtil.java

@@ -11,7 +11,6 @@ import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -42,14 +41,15 @@ public class XmlParseUtil {
             throw new LauncherException(LauncherEnum.XML_DATA_ERROR.getMsg());
         }
         //开始解析内部数据 serverConfiguration
-        Element autoScanElement = rootElement.element("autoScan");
-        String value = autoScanElement.attributeValue("value");
-        serviceConfigModel.setAutoScan(Boolean.parseBoolean(value));
-        //开始解析内部数据 serverConfiguration
         Element serverConfigurationElement = rootElement.element("serverConfiguration");
         Element classNamesElement = rootElement.element("classNames");
-        parseServerConfiguration(serverConfigurationElement,serviceConfigModel);
-        packageScanValueParse(classNamesElement,serviceConfigModel);
+        if (serverConfigurationElement!=null) {
+            parseServerConfiguration(serverConfigurationElement,serviceConfigModel);
+        }
+
+        if(classNamesElement != null){
+            packageScanValueParse(classNamesElement,serviceConfigModel);
+        }
         return serviceConfigModel;
     }
 
@@ -68,15 +68,19 @@ public class XmlParseUtil {
         Element pluginServiceRegistryElement = serverConfigurationElement.element("pluginServiceRegistry");
         Element pluginServerClassElement = serverConfigurationElement.element("pluginServerClass");
         portParse(portElement,serverConfigurationModel);
-        serverStringParse(registryUrlElement,value -> {
-            serverConfigurationModel.setRegistryUrl(value);
-        });
-        serverStringParse(serverBizElement, value -> {
-            serverConfigurationModel.setServerBiz(value);
-        });
-        serverStringParse(serverEnvElement, value -> {
-            serverConfigurationModel.setServerEnv(value);
-        });
+
+        if (registryUrlElement != null) {
+            serverStringParse(registryUrlElement, serverConfigurationModel::setRegistryUrl);
+        }
+
+        if (serverBizElement != null) {
+            serverStringParse(serverBizElement, serverConfigurationModel::setServerBiz);
+        }
+
+        if (serverEnvElement != null) {
+            serverStringParse(serverEnvElement, serverConfigurationModel::setServerEnv);
+        }
+
         serverThreadParse(serverThreadElement,serverConfigurationModel);
 
         if (pluginServiceRegistryElement != null) {
@@ -157,12 +161,15 @@ public class XmlParseUtil {
         Iterator<Element> elementIterator = packageRootElement.elementIterator();
         while (elementIterator.hasNext()) {
             Element packageElement = elementIterator.next();
-            String packageElementText = packageElement.attributeValue("class");
-            String jobNameText = packageElement.attributeValue("jobName");
-            if(serviceConfigModel.getClassNames() == null){
-                serviceConfigModel.setClassNames(new ConcurrentHashMap<>(8));
+            if (packageElement!=null) {
+                String packageElementText = packageElement.attributeValue("class");
+                String jobNameText = packageElement.attributeValue("jobName");
+                if(serviceConfigModel.getClassNames() == null){
+                    serviceConfigModel.setClassNames(new ConcurrentHashMap<>(8));
+                }
+                serviceConfigModel.getClassNames().put(jobNameText,packageElementText);
             }
-            serviceConfigModel.getClassNames().put(jobNameText,packageElementText);
+
         }
     }