diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-07-25 00:03:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 18:03:58 +0200 |
| commit | 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 (patch) | |
| tree | 6f27dc68a35d1f9d806c632e36f0edc8543184ea /cmd | |
| parent | e0f9635c0691cb67f0fcbb758cabba801d9fc51b (diff) | |
| download | gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.tar.gz gitea-9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88.zip | |
Add an abstract json layout to make it's easier to change json library (#16528)
* Add an abstract json layout to make it's easier to change json library
* Fix import
* Fix import sequence
* Fix blank lines
* Fix blank lines
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dump.go | 3 | ||||
| -rw-r--r-- | cmd/serv.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cmd/dump.go b/cmd/dump.go index 629993b6c8..9ce7c2636a 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -15,13 +15,13 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/util" "gitea.com/go-chi/session" - jsoniter "github.com/json-iterator/go" archiver "github.com/mholt/archiver/v3" "github.com/urfave/cli" ) @@ -306,7 +306,6 @@ func runDump(ctx *cli.Context) error { var excludes []string if setting.Cfg.Section("session").Key("PROVIDER").Value() == "file" { var opts session.Options - json := jsoniter.ConfigCompatibleWithStandardLibrary if err = json.Unmarshal([]byte(setting.SessionConfig.ProviderConfig), &opts); err != nil { return err } diff --git a/cmd/serv.go b/cmd/serv.go index 3b180fc626..4479902ea1 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -17,6 +17,7 @@ import ( "time" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/pprof" "code.gitea.io/gitea/modules/private" @@ -24,7 +25,6 @@ import ( "code.gitea.io/gitea/services/lfs" "github.com/golang-jwt/jwt" - jsoniter "github.com/json-iterator/go" "github.com/kballard/go-shellquote" "github.com/urfave/cli" ) @@ -265,7 +265,6 @@ func runServ(c *cli.Context) error { } tokenAuthentication.Header["Authorization"] = fmt.Sprintf("Bearer %s", tokenString) - json := jsoniter.ConfigCompatibleWithStandardLibrary enc := json.NewEncoder(os.Stdout) err = enc.Encode(tokenAuthentication) if err != nil { |