Skip to content

Commit 83fa2b0

Browse files
committed
fix(server/config): 注册 toml 的 mimetype
1 parent d38cecd commit 83fa2b0

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module github.com/issue9/web
33
go 1.24.0
44

55
require (
6-
github.com/BurntSushi/toml v1.4.0
6+
github.com/BurntSushi/toml v1.5.0
77
github.com/andybalholm/brotli v1.1.1
88
github.com/fxamacker/cbor/v2 v2.7.0
99
github.com/issue9/assert/v4 v4.3.1
10-
github.com/issue9/cache v0.19.0
10+
github.com/issue9/cache v0.19.1
1111
github.com/issue9/config v0.9.0
1212
github.com/issue9/conv v1.3.5
1313
github.com/issue9/errwrap v0.3.2
@@ -40,7 +40,7 @@ require (
4040
github.com/issue9/rands/v3 v3.1.0 // indirect
4141
github.com/kr/pretty v0.3.1 // indirect
4242
github.com/mailru/easyjson v0.7.7 // indirect
43-
github.com/redis/go-redis/v9 v9.7.1 // indirect
43+
github.com/redis/go-redis/v9 v9.7.3 // indirect
4444
github.com/rogpeppe/go-internal v1.12.0 // indirect
4545
github.com/x448/float16 v0.8.4 // indirect
4646
golang.org/x/mod v0.24.0 // indirect

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
2-
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
1+
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
2+
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
33
github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
44
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
55
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
@@ -23,8 +23,8 @@ github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv
2323
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
2424
github.com/issue9/assert/v4 v4.3.1 h1:dHYODk1yV7j/1baIB6K6UggI4r1Hfuljqic7PaDbwLg=
2525
github.com/issue9/assert/v4 v4.3.1/go.mod h1:v7qDRXi7AsaZZNh8eAK2rkLJg5/clztqQGA1DRv9Lv4=
26-
github.com/issue9/cache v0.19.0 h1:tBj7GdlEFf4u1YDm2fMaBDUC6nYVWpXqF6WjFlJuNkQ=
27-
github.com/issue9/cache v0.19.0/go.mod h1:rw4oyxL5riQFL11S9zkenb0H5OuKIN3nwx1n7gitHAo=
26+
github.com/issue9/cache v0.19.1 h1:7fV0bmOBtnsilZ/cWC8NMW9MJVThGDCzDcJwWiBlo/E=
27+
github.com/issue9/cache v0.19.1/go.mod h1:kQFJYfeblZ43oNU/6VAo7K1c/CmGEaKANlmqG7UPWvE=
2828
github.com/issue9/config v0.9.0 h1:2HGtEUvK8ujvNXIHtgfjdxogzCBLLsVtjX+DnCb647g=
2929
github.com/issue9/config v0.9.0/go.mod h1:iz2F+zv1dTYgR7M7eNUyUEk0RKCSXPnlSQF7W6YGYHA=
3030
github.com/issue9/conv v1.3.5 h1:UWeA+Zqp5vjNDLrmhLhaXPjS1hL8gh4quX6Shk5njKQ=
@@ -72,8 +72,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
7272
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
7373
github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
7474
github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
75-
github.com/redis/go-redis/v9 v9.7.1 h1:4LhKRCIduqXqtvCUlaq9c8bdHOkICjDMrr1+Zb3osAc=
76-
github.com/redis/go-redis/v9 v9.7.1/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
75+
github.com/redis/go-redis/v9 v9.7.3 h1:YpPyAayJV+XErNsatSElgRZZVCwXX9QzkKYNvO7x0wM=
76+
github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA=
7777
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
7878
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
7979
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=

server/config/register.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616
"time"
1717

18-
"github.com/BurntSushi/toml"
18+
st "github.com/BurntSushi/toml"
1919
"github.com/andybalholm/brotli"
2020
"github.com/issue9/cache"
2121
"github.com/issue9/cache/caches/memcache"
@@ -24,7 +24,7 @@ import (
2424
"github.com/issue9/config"
2525
"github.com/issue9/mux/v9"
2626
"github.com/issue9/unique/v2"
27-
"gopkg.in/yaml.v3"
27+
sy "gopkg.in/yaml.v3"
2828

2929
"github.com/issue9/web"
3030
"github.com/issue9/web/compressor"
@@ -34,8 +34,9 @@ import (
3434
"github.com/issue9/web/mimetype/html"
3535
"github.com/issue9/web/mimetype/json"
3636
"github.com/issue9/web/mimetype/nop"
37+
"github.com/issue9/web/mimetype/toml"
3738
"github.com/issue9/web/mimetype/xml"
38-
mtYAML "github.com/issue9/web/mimetype/yaml"
39+
"github.com/issue9/web/mimetype/yaml"
3940
"github.com/issue9/web/server"
4041
"github.com/issue9/web/server/registry"
4142
)
@@ -198,9 +199,10 @@ func init() {
198199
// RegisterMimetype
199200

200201
RegisterMimetype(json.Marshal, json.Unmarshal, "json")
201-
RegisterMimetype(mtYAML.Marshal, mtYAML.Unmarshal, "yaml")
202+
RegisterMimetype(yaml.Marshal, yaml.Unmarshal, "yaml")
202203
RegisterMimetype(cbor.Marshal, cbor.Unmarshal, "cbor")
203204
RegisterMimetype(xml.Marshal, xml.Unmarshal, "xml")
205+
RegisterMimetype(toml.Marshal, toml.Unmarshal, "toml")
204206
RegisterMimetype(html.Marshal, html.Unmarshal, "html")
205207
RegisterMimetype(form.Marshal, form.Unmarshal, "form")
206208
RegisterMimetype(gob.Marshal, gob.Unmarshal, "gob")
@@ -210,8 +212,8 @@ func init() {
210212

211213
RegisterFileSerializer("json", sj.Marshal, sj.Unmarshal, ".json")
212214
RegisterFileSerializer("xml", sx.Marshal, sx.Unmarshal, ".xml")
213-
RegisterFileSerializer("yaml", yaml.Marshal, yaml.Unmarshal, ".yaml", ".yml")
214-
RegisterFileSerializer("toml", toml.Marshal, toml.Unmarshal, ".toml")
215+
RegisterFileSerializer("yaml", sy.Marshal, sy.Unmarshal, ".yaml", ".yml")
216+
RegisterFileSerializer("toml", st.Marshal, st.Unmarshal, ".toml")
215217

216218
// micro
217219

web.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
)
2626

2727
// Version 当前框架的版本
28-
const Version = "0.102.8"
28+
const Version = "0.102.9"
2929

3030
type (
3131
Logger = logs.Logger

0 commit comments

Comments
 (0)