fix issue #1227 #1617

database/gdb/gdb.go

@@ -408,11 +408,9 @@ func doNewByNode(node ConfigNode, group string) (db DB, err error) {
 		}
 		return c.db, nil
 	}
-	return nil, gerror.NewCodef(
-		gcode.CodeInvalidConfiguration,
-		`cannot find database driver for specified database type "%s", did you misspell type name "%s" or forget importing the database driver?`,
-		node.Type, node.Type,
-	)
+	errorMsg := `cannot find database driver for specified database type "%s"`
+	errorMsg += `, did you misspell type name "%s" or forget importing the database driver?`
+	return nil, gerror.NewCodef(gcode.CodeInvalidConfiguration, errorMsg, node.Type, node.Type)
 }
 
 // Instance returns an instance for DB operations.

encoding/gjson/gjson_z_unit_test.go

@@ -552,3 +552,27 @@ func TestJson_Options(t *testing.T) {
 		t.Assert(fmt.Sprintf(`%v`, m["Id"]), `53687091200`)
 	})
 }
+
+// https://github.com/gogf/gf/issues/1617
+func Test_Issue1617(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type MyJsonName struct {
+			F中文   int64 `json:"F中文"`
+			F英文   int64 `json:"F英文"`
+			F法文   int64 `json:"F法文"`
+			F西班牙语 int64 `json:"F西班牙语"`
+		}
+		jso := `{"F中文":1,"F英文":2,"F法文":3,"F西班牙语":4}`
+		var a MyJsonName
+		json, err := gjson.DecodeToJson(jso)
+		t.AssertNil(err)
+		err = json.Scan(&a)
+		t.AssertNil(err)
+		t.Assert(a, MyJsonName{
+			F中文:   1,
+			F英文:   2,
+			F法文:   3,
+			F西班牙语: 4,
+		})
+	})
+}

internal/utils/utils_str.go

@@ -101,10 +101,12 @@ func ReplaceByMap(origin string, replaces map[string]string) string {
 
 // RemoveSymbols removes all symbols from string and lefts only numbers and letters.
 func RemoveSymbols(s string) string {
-	var b []byte
+	var b = make([]rune, 0, len(s))
 	for _, c := range s {
-		if (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') {
-			b = append(b, byte(c))
+		if c > 127 {
+			b = append(b, c)
+		} else if (c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') {
+			b = append(b, c)
 		}
 	}
 	return string(b)

internal/utils/utils_z_unit_test.go

@@ -69,6 +69,7 @@ func Test_ReadCloser(t *testing.T) {
 func Test_RemoveSymbols(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		t.Assert(utils.RemoveSymbols(`-a-b._a c1!@#$%^&*()_+:";'.,'01`), `abac101`)
+		t.Assert(utils.RemoveSymbols(`-a-b我._a c1!@#$%^&*是()_+:帅";'.,哥'01`), `ab我ac1是帅哥01`)
 	})
 }
 

test/gtest/gtest_util.go

@@ -29,7 +29,7 @@ const (
 func C(t *testing.T, f func(t *T)) {
 	defer func() {
 		if err := recover(); err != nil {
-			fmt.Fprintf(os.Stderr, "%v\n%s", err, gdebug.StackWithFilter([]string{pathFilterKey}))
+			_, _ = fmt.Fprintf(os.Stderr, "%v\n%s", err, gdebug.StackWithFilter([]string{pathFilterKey}))
 			t.Fail()
 		}
 	}()

util/gconv/gconv_z_unit_all_test.go

@@ -36,6 +36,103 @@ func (s1 S1) Error() string {
 	return "22222"
 }
 
+// https://github.com/gogf/gf/issues/1227
+func Test_Issue1227(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type StructFromIssue1227 struct {
+			Name string `json:"n1"`
+		}
+		tests := []struct {
+			name   string
+			origin interface{}
+			want   string
+		}{
+			{
+				name:   "Case1",
+				origin: `{"n1":"n1"}`,
+				want:   "n1",
+			},
+			{
+				name:   "Case2",
+				origin: `{"name":"name"}`,
+				want:   "",
+			},
+			{
+				name:   "Case3",
+				origin: `{"NaMe":"NaMe"}`,
+				want:   "",
+			},
+			{
+				name:   "Case4",
+				origin: g.Map{"n1": "n1"},
+				want:   "n1",
+			},
+			{
+				name:   "Case5",
+				origin: g.Map{"NaMe": "n1"},
+				want:   "n1",
+			},
+		}
+		for _, tt := range tests {
+			p := StructFromIssue1227{}
+			if err := gconv.Struct(tt.origin, &p); err != nil {
+				t.Error(err)
+			}
+			t.Assert(p.Name, tt.want)
+		}
+	})
+
+	// Chinese key.
+	gtest.C(t, func(t *gtest.T) {
+		type StructFromIssue1227 struct {
+			Name string `json:"中文Key"`
+		}
+		tests := []struct {
+			name   string
+			origin interface{}
+			want   string
+		}{
+			{
+				name:   "Case1",
+				origin: `{"中文Key":"n1"}`,
+				want:   "n1",
+			},
+			{
+				name:   "Case2",
+				origin: `{"Key":"name"}`,
+				want:   "",
+			},
+			{
+				name:   "Case3",
+				origin: `{"NaMe":"NaMe"}`,
+				want:   "",
+			},
+			{
+				name:   "Case4",
+				origin: g.Map{"中文Key": "n1"},
+				want:   "n1",
+			},
+			{
+				name:   "Case5",
+				origin: g.Map{"中文KEY": "n1"},
+				want:   "n1",
+			},
+			{
+				name:   "Case5",
+				origin: g.Map{"KEY": "n1"},
+				want:   "",
+			},
+		}
+		for _, tt := range tests {
+			p := StructFromIssue1227{}
+			if err := gconv.Struct(tt.origin, &p); err != nil {
+				t.Error(err)
+			}
+			t.Assert(p.Name, tt.want)
+		}
+	})
+}
+
 func Test_Bool_All(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var any interface{} = nil