From ae9227024388ae067114392d58e8ecb6ae5ffa03 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sun, 22 Dec 2024 01:26:05 +0800 Subject: [PATCH] fix: make mod --- go.mod | 2 +- go.sum | 4 +-- vendor/modules.txt | 2 +- vendor/yunion.io/x/jsonutils/jsonutils.go | 33 ++++++++++++----------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 85c9ae095..df3d21ac9 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( golang.org/x/text v0.14.0 gopkg.in/fatih/set.v0 v0.2.1 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 + yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 yunion.io/x/pkg v1.10.2 yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 diff --git a/go.sum b/go.sum index 2b47c276d..793a947a5 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs= moul.io/http2curl/v2 v2.3.0/go.mod h1:RW4hyBjTWSYDOxapodpNEtX0g5Eb16sxklBqmd2RHcE= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= -yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 h1:4l6ELFSQ0MBVInscZ8/yOtSWF0cwH5BT1ATN6dCtAqc= -yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401/go.mod h1:VK4Z93dgiKgAijcSqbMKmGaBMJuHulR16Hz4K015ZPo= +yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f h1:N7V0uLqX9mED1HEPeIKcYpkWglnHL5hyn4ENX+VBeqM= +yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f/go.mod h1:VK4Z93dgiKgAijcSqbMKmGaBMJuHulR16Hz4K015ZPo= yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXcevLsJLKixV+sR/E7WSYTSx1fE= yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 h1:inY5o3LDa/zgsIZuPN0HmpzKIsu/lLgsBmMttuDPGj4= yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U= diff --git a/vendor/modules.txt b/vendor/modules.txt index 74c13f21d..34672f03f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -662,7 +662,7 @@ gopkg.in/yaml.v2 # moul.io/http2curl/v2 v2.3.0 ## explicit; go 1.13 moul.io/http2curl/v2 -# yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 +# yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f ## explicit; go 1.18 yunion.io/x/jsonutils # yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/vendor/yunion.io/x/jsonutils/jsonutils.go b/vendor/yunion.io/x/jsonutils/jsonutils.go index ae51a9086..ab0d60607 100644 --- a/vendor/yunion.io/x/jsonutils/jsonutils.go +++ b/vendor/yunion.io/x/jsonutils/jsonutils.go @@ -27,6 +27,7 @@ import ( "yunion.io/x/pkg/sortedmap" ) +// swagger:type object type JSONObject interface { gotypes.ISerializable @@ -68,6 +69,7 @@ var ( JSONFalse = &JSONBool{data: false} ) +// swagger:type object type JSONDict struct { JSONValue data sortedmap.SSortedMap @@ -294,26 +296,25 @@ func (s *sJsonParseSession) parseJSONValue(str []byte, offset int) (JSONObject, // https://www.ietf.org/rfc/rfc4627.txt // -// string = quotation-mark *char quotation-mark +// string = quotation-mark *char quotation-mark // -// char = unescaped / -// escape ( -// %x22 / ; " quotation mark U+0022 -// %x5C / ; \ reverse solidus U+005C -// %x2F / ; / solidus U+002F -// %x62 / ; b backspace U+0008 -// %x66 / ; f form feed U+000C -// %x6E / ; n line feed U+000A -// %x72 / ; r carriage return U+000D -// %x74 / ; t tab U+0009 -// %x75 4HEXDIG ) ; uXXXX U+XXXX +// char = unescaped / +// escape ( +// %x22 / ; " quotation mark U+0022 +// %x5C / ; \ reverse solidus U+005C +// %x2F / ; / solidus U+002F +// %x62 / ; b backspace U+0008 +// %x66 / ; f form feed U+000C +// %x6E / ; n line feed U+000A +// %x72 / ; r carriage return U+000D +// %x74 / ; t tab U+0009 +// %x75 4HEXDIG ) ; uXXXX U+XXXX // -// escape = %x5C ; \ +// escape = %x5C ; \ // -// quotation-mark = %x22 ; " -// -// unescaped = %x20-21 / %x23-5B / %x5D-10FFFF +// quotation-mark = %x22 ; " // +// unescaped = %x20-21 / %x23-5B / %x5D-10FFFF func escapeJsonChar(sb *strings.Builder, ch byte) { switch ch { case '"':