From 211840b64fa1132d76d6dff6c779e9ba2c0c450f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:13:54 +0800
Subject: [PATCH] 优化自动化代码

---
 src/main/java/org/yeshi/utils/generater/vo/xmlconfig/XmlConfigParseUtil.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/yeshi/utils/generater/vo/xmlconfig/XmlConfigParseUtil.java b/src/main/java/org/yeshi/utils/generater/vo/xmlconfig/XmlConfigParseUtil.java
index a14bee6..c7bffe1 100644
--- a/src/main/java/org/yeshi/utils/generater/vo/xmlconfig/XmlConfigParseUtil.java
+++ b/src/main/java/org/yeshi/utils/generater/vo/xmlconfig/XmlConfigParseUtil.java
@@ -7,6 +7,7 @@
 import org.yeshi.utils.generater.annotation.admin.DaoQueryCondition;
 import org.yeshi.utils.generater.annotation.admin.Show;
 import org.yeshi.utils.generater.annotation.admin.form.Text;
+import org.yeshi.utils.generater.entity.ClassInfo;
 import org.yeshi.utils.generater.entity.admin.FormVerifyType;
 import org.yeshi.utils.generater.vo.xmlconfig.admin.*;
 import org.yeshi.utils.generater.vo.xmlconfig.admin.form.*;
@@ -36,7 +37,7 @@
  */
 public class XmlConfigParseUtil {
 
-    public static GenertorConfig parse(InputStream inputStream) throws Exception {
+    public static GenertorConfig parse(InputStream inputStream, ClassLoader classLoader) throws Exception {
         if (inputStream == null) {
             throw new FileNotFoundException();
         }
@@ -50,7 +51,7 @@
         }
         Node rootNode = nodelist.item(0);
         String clazz = rootNode.getAttributes().getNamedItem("class").getNodeValue();
-        genertorConfig.setEntity(Class.forName(clazz));
+        genertorConfig.setEntity(classLoader.loadClass(clazz));
 
         nodelist = rootNode.getChildNodes();
         for (int i = 0; i < nodelist.getLength(); i++) {
@@ -69,8 +70,6 @@
                     genertorConfig.setAdmin(parseAdmin(node));
                 }
                 break;
-
-
             }
 
 
@@ -110,6 +109,7 @@
         data.setInterPackage(getNodeAttributeValue(node, "interPackage"));
         data.setImplPackage(getNodeAttributeValue(node, "implPackage"));
         data.setQueryPackage(getNodeAttributeValue(node, "queryPackage"));
+        data.setAdminVOPackage(getNodeAttributeValue(node, "adminVOPackage"));
 
         NodeList nodeList = node.getChildNodes();
         for (int i = 0; i < nodeList.getLength(); i++) {
@@ -117,6 +117,10 @@
                 ExceptionData exceptionData = new ExceptionData();
                 exceptionData.setPkg(getNodeAttributeValue(nodeList.item(i), "package"));
                 exceptionData.setName(getNodeAttributeValue(nodeList.item(i), "name"));
+                String base = getNodeAttributeValue(nodeList.item(i), "base");
+                if (base != null) {
+                    exceptionData.setBase(new ClassInfo(base.split("\\.")[base.split("\\.").length - 1], base));
+                }
                 data.setException(exceptionData);
                 break;
             }
@@ -418,7 +422,7 @@
 
 
     public static void main(String[] args) throws Exception {
-        GenertorConfig config = XmlConfigParseUtil.parse(new FileInputStream("D:\\workspace\\server\\utils\\src\\test\\test.xml"));
+        GenertorConfig config = XmlConfigParseUtil.parse(new FileInputStream("D:\\workspace\\server\\utils\\src\\test\\test.xml"), null);
         GeneraterManagerV2.getInstance().init("D:\\workspace\\server\\utils\\src\\test\\java", config);
         GeneraterManagerV2.getInstance().createWholeFunction();
         System.out.println(config);

--
Gitblit v1.8.0