From ec44a32ae9698d48f600170aeed7ceaacb2f2857 Mon Sep 17 00:00:00 2001
From: zhuxiujia <zhuxiujia@qq.com>
Date: Sun, 7 Jun 2020 02:02:03 +0800
Subject: [PATCH] add json decode.

---
 GoMybatis.go                       |  1 -
 GoMybatisSqlResultDecoder_test.go  |  4 ----
 README-ch.md                       | 16 ++++++++--------
 README.md                          | 16 ++++++++--------
 ResultMap.go                       |  1 -
 example/Example_ActivityMapper.xml | 26 +++++++++++++-------------
 example/Example_test.go            |  2 +-
 7 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/GoMybatis.go b/GoMybatis.go
index 4527db7..aa6109b 100644
--- a/GoMybatis.go
+++ b/GoMybatis.go
@@ -231,7 +231,6 @@ func makeResultMaps(xmls map[string]etree.Token) map[string]map[string]*ResultPr
 					var property = ResultProperty{
 						XMLName:  elementItem.Tag,
 						Column:   elementItem.SelectAttrValue("column", ""),
-						Property: elementItem.SelectAttrValue("property", ""),
 						LangType: elementItem.SelectAttrValue("langType", ""),
 					}
 					resultPropertyMap[property.Column] = &property
diff --git a/GoMybatisSqlResultDecoder_test.go b/GoMybatisSqlResultDecoder_test.go
index c67b00c..7df2cd0 100644
--- a/GoMybatisSqlResultDecoder_test.go
+++ b/GoMybatisSqlResultDecoder_test.go
@@ -225,25 +225,21 @@ func Test_Decode_Interface(t *testing.T) {
 	resultMap["id"] = &ResultProperty{
 		XMLName:  "id",
 		Column:   "id",
-		Property: "id",
 		LangType: "string",
 	}
 	resultMap["name"] = &ResultProperty{
 		XMLName:  "result",
 		Column:   "name",
-		Property: "Name",
 		LangType: "string",
 	}
 	resultMap["Amount_1"] = &ResultProperty{
 		XMLName:  "result",
 		Column:   "Amount_1",
-		Property: "amount_1",
 		LangType: "string",
 	}
 	resultMap["amount_2"] = &ResultProperty{
 		XMLName:  "result",
 		Column:   "Amount_2",
-		Property: "amount_2",
 		LangType: "string",
 	}
 	var result map[string]string
diff --git a/README-ch.md b/README-ch.md
index 4070017..a36cf77 100644
--- a/README-ch.md
+++ b/README-ch.md
@@ -126,15 +126,15 @@ func main() {
     <!--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/README.md b/README.md
index 369ecdc..288a679 100644
--- a/README.md
+++ b/README.md
@@ -112,15 +112,15 @@ func main() {
     <!--logic_undelete Logically Delete Undeleted Fields-->
     <!--version_enable Optimistic lock version field, support 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/ResultMap.go b/ResultMap.go
index 9f8793d..15f28bb 100644
--- a/ResultMap.go
+++ b/ResultMap.go
@@ -3,6 +3,5 @@ package GoMybatis
 type ResultProperty struct {
 	XMLName  string //`xml:"result/id"`
 	Column   string
-	Property string
 	LangType string
 }
diff --git a/example/Example_ActivityMapper.xml b/example/Example_ActivityMapper.xml
index a4e6745..6afdd42 100644
--- a/example/Example_ActivityMapper.xml
+++ b/example/Example_ActivityMapper.xml
@@ -7,7 +7,7 @@
     <!--logic_undelete 逻辑删除 未删除字段-->
     <!--version_enable 乐观锁版本字段,支持int,int8,int16,int32,int64-->
     <resultMap id="BaseResultMap" tables="biz_activity">
-        <id column="id"/>
+        <id column="id" langType="string"/>
         <result column="name" langType="string"/>
         <result column="pc_link" langType="string"/>
         <result column="h5_link" langType="string"/>
@@ -105,11 +105,11 @@
         update biz_activity
         <set>
             <if test="name != nil">name = #{name},</if>
-            <if test="pcLink != nil">pc_link = #{pcLink},</if>
-            <if test="h5Link != nil">h5_link = #{h5Link},</if>
+            <if test="pc_link != nil">pc_link = #{pc_link},</if>
+            <if test="h5_link != nil">h5_link = #{h5_link},</if>
             <if test="remark != nil">remark = #{remark},</if>
-            <if test="createTime != nil">create_time = #{createTime},</if>
-            <if test="deleteFlag != nil ">delete_flag = #{deleteFlag},</if>
+            <if test="create_time != nil">create_time = #{create_time},</if>
+            <if test="delete_flag != nil ">delete_flag = #{delete_flag},</if>
         </set>
         where id = #{id} and delete_flag = 1
     </update>
@@ -118,21 +118,21 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != nil">id,</if>
             <if test="name != nil">name,</if>
-            <if test="pcLink != nil">pc_link,</if>
-            <if test="h5Link != nil">h5_link,</if>
+            <if test="pc_link != nil">pc_link,</if>
+            <if test="h5_link != nil">h5_link,</if>
             <if test="remark != nil">remark,</if>
-            <if test="createTime != nil">create_time,</if>
-            <if test="deleteFlag != nil">delete_flag,</if>
+            <if test="create_time != nil">create_time,</if>
+            <if test="delete_flag != nil">delete_flag,</if>
         </trim>
 
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != nil">#{id},</if>
             <if test="name != nil">#{name},</if>
-            <if test="pcLink != nil">#{pcLink},</if>
-            <if test="h5Link != nil">#{h5Link},</if>
+            <if test="pc_link != nil">#{pc_link},</if>
+            <if test="h5_link != nil">#{h5_link},</if>
             <if test="remark != nil">#{remark},</if>
-            <if test="createTime != nil">#{createTime},</if>
-            <if test="deleteFlag != nil">#{deleteFlag},</if>
+            <if test="create_time != nil">#{create_time},</if>
+            <if test="delete_flag != nil">#{delete_flag},</if>
         </trim>
     </insert>
 
diff --git a/example/Example_test.go b/example/Example_test.go
index d78dd9f..e13218e 100644
--- a/example/Example_test.go
+++ b/example/Example_test.go
@@ -116,7 +116,7 @@ func Test_inset(t *testing.T) {
 	//推荐使用snowflake雪花算法 代替uuid防止ID碰撞,id最好用string类型. 否则客户端有可能不支持long类型例如JavaScript
 	var id = SnowflakeNode.Generate().String()
 	//使用mapper
-	var result, err = exampleActivityMapper.Insert(Activity{Id: id, Name: "test_insert", CreateTime: time.Now(), DeleteFlag: 1})
+	var result, err = exampleActivityMapper.Insert(Activity{Id: id, Name: "test_insert", PcLink: "ssss", CreateTime: time.Now(), DeleteFlag: 1})
 	if err != nil {
 		panic(err)
 	}