diff --git a/inc/hgl/util/xml/TreeXML.h b/inc/hgl/util/xml/TreeXML.h
index 4a6db64..2690df6 100644
--- a/inc/hgl/util/xml/TreeXML.h
+++ b/inc/hgl/util/xml/TreeXML.h
@@ -1,9 +1,9 @@
-#pragma once
+#pragma once
 
-#include<hgl/type/List.h>
+#include<hgl/type/Map.h>
 #include<hgl/type/String.h>
 #include<hgl/type/StringView.h>
-#include<hgl/type/KeyValue.h>
+#include<hgl/type/Pair.h>
 
 namespace hgl
 {
@@ -32,20 +32,20 @@ namespace hgl
         class TreeXMLNode
         {
             /**
-                <node atts="info">
+                <node number="123456">
                     abcdefg
                 </root>
 
-                element_name    root
-                atts            atts=info
-                data            abcdefg
+                name    root
+                atts    number=123456
+                data    abcdefg
             */
 
             TreeXMLData *   xml_raw_data;
 
-            int                 element_name;      ///<元素点名字视图
-            List<KeyValue<int,int>> atts;              ///<属性点文字视图
-            int                 data;              ///<数据文本视图
+            int             name;               ///<元素点名字视图
+            Map<int,int>    atts;              ///<属性点文字视图
+            int             data;              ///<数据文本视图
 
         private:
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b58918e..368d0d4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-#################################################################################################### XML
+#################################################################################################### XML
 option(CM_UTIL_SUPPORT_XML "Build XML Parse module." ON)
 
 if(CM_UTIL_SUPPORT_XML)
@@ -27,7 +27,7 @@ if(CM_UTIL_SUPPORT_XML)
                                     ${XML_ELEMENT_PARSE_SOURCE}
 
                                     ${XML_PARSE_CLASS_SOURCE}
-                                    ${TREE_XML_SOURCE}
+                                    #${TREE_XML_SOURCE}
     )
 
     SOURCE_GROUP("XML\\ElementParse\\KV" FILES ${XML_ELEMENT_PARSE_KV})
diff --git a/src/json/JsonTool.cpp b/src/json/JsonTool.cpp
index ef7a2ec..4a589f1 100644
--- a/src/json/JsonTool.cpp
+++ b/src/json/JsonTool.cpp
@@ -28,7 +28,7 @@ namespace hgl
             writer->write(jv_root,&json_result);
             result=true;
 
-            str=ToUTF8String(json_result.str());
+            str=ToU8String(json_result.str());
         }
         catch(std::exception &e)
         {
diff --git a/src/xml/TreeXML.cpp b/src/xml/TreeXML.cpp
index 61d6682..f90a52a 100644
--- a/src/xml/TreeXML.cpp
+++ b/src/xml/TreeXML.cpp
@@ -1,4 +1,4 @@
-#include<hgl/util/xml/TreeXML.h>
+#include<hgl/util/xml/TreeXML.h>
 #include<hgl/type/Stack.h>
 #include<expat.h>
 
@@ -9,7 +9,7 @@ namespace hgl
         TreeXMLNode::TreeXMLNode(TreeXMLData *xdata,int name)
         {
             xml_raw_data=xdata;
-            element_name=name;
+            name=name;
 
             data=-1;
         }
@@ -26,10 +26,10 @@ namespace hgl
 
         const U8StringView *TreeXMLNode::GetElementName()const
         {
-            if(!xml_raw_data||element_name<0)
+            if(!xml_raw_data||name<0)
                 return nullptr;
 
-            return xml_raw_data->ElementNameList.At(element_name);
+            return xml_raw_data->ElementNameList.At(name);
         }
 
         const U8StringView *TreeXMLNode::GetAtts(const U8String &name)