From a5cc03ff252b9aa2a0dce59c4f5a37f239b03296 Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Wed, 16 Feb 2022 00:47:23 +0800
Subject: [PATCH] fix issue #1563

---
 internal/utils/utils_map.go            | 11 +++++++++++
 util/gconv/gconv_struct.go             |  8 +++++---
 util/gconv/gconv_z_unit_struct_test.go | 19 +++++++++++++++++++
 util/gutil/gutil_map.go                |  5 +----
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/internal/utils/utils_map.go b/internal/utils/utils_map.go
index 6cb1b6067..fba7da77c 100644
--- a/internal/utils/utils_map.go
+++ b/internal/utils/utils_map.go
@@ -24,3 +24,14 @@ func MapPossibleItemByKey(data map[string]interface{}, key string) (foundKey str
 	}
 	return "", nil
 }
+
+// MapContainsPossibleKey checks if the given `key` is contained in given map `data`.
+// It checks the key ignoring cases and symbols.
+//
+// Note that this function might be of low performance.
+func MapContainsPossibleKey(data map[string]interface{}, key string) bool {
+	if k, _ := MapPossibleItemByKey(data, key); k != "" {
+		return true
+	}
+	return false
+}
diff --git a/util/gconv/gconv_struct.go b/util/gconv/gconv_struct.go
index 23a5c2595..381642a38 100644
--- a/util/gconv/gconv_struct.go
+++ b/util/gconv/gconv_struct.go
@@ -241,6 +241,7 @@ func doStruct(params interface{}, pointer interface{}, mapping map[string]string
 	if err != nil {
 		return err
 	}
+	var foundKey string
 	for tagName, attributeName := range tagToNameMap {
 		// If there's something else in the tag string,
 		// it uses the first part which is split using char ','.
@@ -248,11 +249,12 @@ func doStruct(params interface{}, pointer interface{}, mapping map[string]string
 		// orm:"id, priority"
 		// orm:"name, with:uid=id"
 		tagMap[attributeName] = utils.RemoveSymbols(strings.Split(tagName, ",")[0])
-
 		// If tag and attribute values both exist in `paramsMap`,
 		// it then uses the tag value overwriting the attribute value in `paramsMap`.
-		if paramsMap[tagName] != nil && paramsMap[attributeName] != nil {
-			paramsMap[attributeName] = paramsMap[tagName]
+		if paramsMap[tagName] != nil {
+			if foundKey, _ = utils.MapPossibleItemByKey(paramsMap, attributeName); foundKey != "" {
+				paramsMap[foundKey] = paramsMap[tagName]
+			}
 		}
 	}
 
diff --git a/util/gconv/gconv_z_unit_struct_test.go b/util/gconv/gconv_z_unit_struct_test.go
index 75e8adbb7..e912936d2 100644
--- a/util/gconv/gconv_z_unit_struct_test.go
+++ b/util/gconv/gconv_z_unit_struct_test.go
@@ -1258,3 +1258,22 @@ func Test_Struct_Empty_MapStringString(t *testing.T) {
 		t.AssertNil(err)
 	})
 }
+
+// https://github.com/gogf/gf/issues/1563
+func Test_Struct_Issue1563(t *testing.T) {
+	type User struct {
+		Pass1 string `c:"password1"`
+	}
+	gtest.C(t, func(t *gtest.T) {
+		for i := 0; i < 100; i++ {
+			user := new(User)
+			params2 := g.Map{
+				"password1": "111",
+				"PASS1":     "222",
+			}
+			if err := gconv.Struct(params2, user); err == nil {
+				t.Assert(user.Pass1, `111`)
+			}
+		}
+	})
+}
diff --git a/util/gutil/gutil_map.go b/util/gutil/gutil_map.go
index 8be8af5a6..92e470434 100644
--- a/util/gutil/gutil_map.go
+++ b/util/gutil/gutil_map.go
@@ -76,10 +76,7 @@ func MapPossibleItemByKey(data map[string]interface{}, key string) (foundKey str
 //
 // Note that this function might be of low performance.
 func MapContainsPossibleKey(data map[string]interface{}, key string) bool {
-	if k, _ := MapPossibleItemByKey(data, key); k != "" {
-		return true
-	}
-	return false
+	return utils.MapContainsPossibleKey(data, key)
 }
 
 // MapOmitEmpty deletes all empty values from given map.