add json decode.

zhuxiujia · Jun 6, 2020 · a7a3001 · a7a3001
1 parent 39b5244
commit a7a3001
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/XmlCreate.go b/XmlCreate.go
@@ -22,8 +22,8 @@ var _XmlData = `<?xml version="1.0" encoding="UTF-8"?>
 `
 var _XmlLogicEnable = `logic_enable="true" logic_undelete="1" logic_deleted="0"`
 var _XmlVersionEnable = `version_enable="true"`
-var _XmlIdItem = `<id column="id" property="id"/>`
-var _ResultItem = `<result column="#{column}" property="#{property}" langType="#{langType}" #{version} #{logic} />`
+var _XmlIdItem = `  <id column="id"/>`
+var _ResultItem = `  <result column="#{column}" langType="#{langType}" #{version} #{logic} />`
 
 /**
 //例子
@@ -48,7 +48,7 @@ func TestUserAddres(t *testing.T)  {
 	utils.OutPutXml("D:/GOPATH/src/dao/ActivityMapper.xml",[]byte(s))//写入磁盘
 }
 */
-//根据结构体 创建xml文件.注意 结构体json对应的是数据库的column，结构体Field 对应的是property
+//根据结构体 创建xml文件.注意 结构体json对应的是数据库的column
 func CreateXml(tableName string, bean interface{}) []byte {
 	var content = ""
 	var tv = reflect.TypeOf(bean)
@@ -57,13 +57,11 @@ func CreateXml(tableName string, bean interface{}) []byte {
 	}
 	for i := 0; i < tv.NumField(); i++ {
 		var item = tv.Field(i)
-		var property = item.Name
 		var jsonName = item.Tag.Get("json")
-		var itemStr = strings.Replace(_ResultItem, "#{property}", property, -1)
-		itemStr = strings.Replace(itemStr, "#{column}", jsonName, -1)
+		var itemStr = strings.Replace(_ResultItem, "#{column}", jsonName, -1)
 		itemStr = strings.Replace(itemStr, "#{langType}", item.Type.Name(), -1)
 		var gm = item.Tag.Get("gm")
-		if gm == "id" || jsonName == "id" || strings.EqualFold(property, "id") {
+		if gm == "id" || jsonName == "id" {
 			content += _XmlIdItem
 			content += "\n"
 			continue

diff --git a/example/Example_ActivityMapper.xml b/example/Example_ActivityMapper.xml
@@ -7,15 +7,15 @@
     <!--logic_undelete 逻辑删除 未删除字段-->
     <!--version_enable 乐观锁版本字段,支持int,int8,int16,int32,int64-->
     <resultMap id="BaseResultMap" tables="biz_activity">
-        <id column="id" property="id"/>
-        <result column="name" property="Name" langType="string"/>
-        <result column="pc_link" property="PcLink" langType="string"/>
-        <result column="h5_link" property="H5Link" langType="string"/>
-        <result column="remark" property="Remark" langType="string"/>
-        <result column="version" property="Version" langType="int"
+        <id column="id"/>
+        <result column="name" langType="string"/>
+        <result column="pc_link" langType="string"/>
+        <result column="h5_link" langType="string"/>
+        <result column="remark" langType="string"/>
+        <result column="version" langType="int"
                 version_enable="true"/>
-        <result column="create_time" property="CreateTime" langType="time.Time"/>
-        <result column="delete_flag" property="DeleteFlag" langType="int"
+        <result column="create_time" langType="time.Time"/>
+        <result column="delete_flag" langType="int"
                 logic_enable="true"
                 logic_undelete="1"
                 logic_deleted="0"/>

diff --git a/mybatis-3-mapper.dtd b/mybatis-3-mapper.dtd
@@ -28,14 +28,12 @@
 
         <!ELEMENT id EMPTY>
         <!ATTLIST id
-                property CDATA #IMPLIED
                 langType CDATA #IMPLIED
                 column CDATA #IMPLIED
                 >
 
         <!ELEMENT result EMPTY>
         <!ATTLIST result
-                property CDATA #IMPLIED
                 langType CDATA #IMPLIED
                 column CDATA #IMPLIED
 
@@ -54,12 +52,6 @@
                 name CDATA #IMPLIED
                 >
 
-        <!ELEMENT property EMPTY>
-        <!ATTLIST property
-                name CDATA #REQUIRED
-                value CDATA #REQUIRED
-                >
-
         <!ELEMENT typeAlias EMPTY>
         <!ATTLIST typeAlias
                 alias CDATA #REQUIRED