From 4df47be5213f848731b66333598abcf4b631ea04 Mon Sep 17 00:00:00 2001 From: COoL Date: Sat, 7 Nov 2020 18:32:50 +0800 Subject: [PATCH] Make it work when the xml content end with `\s*` --- encoding/gjson/gjson_api_new_load.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/encoding/gjson/gjson_api_new_load.go b/encoding/gjson/gjson_api_new_load.go index 3e57def8a..e0b2d52a1 100644 --- a/encoding/gjson/gjson_api_new_load.go +++ b/encoding/gjson/gjson_api_new_load.go @@ -228,7 +228,7 @@ func IsValidDataType(dataType string) bool { func checkDataType(content []byte) string { if json.Valid(content) { return "json" - } else if gregex.IsMatch(`^<.+>[\S\s]+<.+>$`, content) { + } else if gregex.IsMatch(`^<.+>[\S\s]+<.+>\s*$`, content) { return "xml" } else if !gregex.IsMatch(`[\n\r]*[\s\t\w\-\."]+\s*=\s*"""[\s\S]+"""`, content) && !gregex.IsMatch(`[\n\r]*[\s\t\w\-\."]+\s*=\s*'''[\s\S]+'''`, content) && ((gregex.IsMatch(`^[\n\r]*[\w\-\s\t]+\s*:\s*".+"`, content) || gregex.IsMatch(`^[\n\r]*[\w\-\s\t]+\s*:\s*\w+`, content)) ||