From 9f31f3aa8ac4f6bfc8390c9ae63b2a387b414c88 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 25 Jul 2021 00:03:58 +0800 Subject: 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 --- modules/private/hook.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/private/hook.go') diff --git a/modules/private/hook.go b/modules/private/hook.go index 79fae052dd..9596f5f4da 100644 --- a/modules/private/hook.go +++ b/modules/private/hook.go @@ -6,15 +6,14 @@ package private import ( "context" - "encoding/json" "fmt" "net/http" "net/url" "strconv" "time" + "code.gitea.io/gitea/modules/json" "code.gitea.io/gitea/modules/setting" - jsoniter "github.com/json-iterator/go" ) // Git environment variables @@ -88,7 +87,6 @@ func HookPreReceive(ctx context.Context, ownerName, repoName string, opts HookOp ) req := newInternalRequest(ctx, reqURL, "POST") req = req.Header("Content-Type", "application/json") - json := jsoniter.ConfigCompatibleWithStandardLibrary jsonBytes, _ := json.Marshal(opts) req.Body(jsonBytes) req.SetTimeout(60*time.Second, time.Duration(60+len(opts.OldCommitIDs))*time.Second) @@ -115,7 +113,6 @@ func HookPostReceive(ctx context.Context, ownerName, repoName string, opts HookO req := newInternalRequest(ctx, reqURL, "POST") req = req.Header("Content-Type", "application/json") req.SetTimeout(60*time.Second, time.Duration(60+len(opts.OldCommitIDs))*time.Second) - json := jsoniter.ConfigCompatibleWithStandardLibrary jsonBytes, _ := json.Marshal(opts) req.Body(jsonBytes) resp, err := req.Response() -- cgit v1.2.3