From 11cc6f0de16849f03fe37d880268d51b0a4a7dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= <midnite@outlook.com>
Date: Thu, 29 Sep 2022 06:32:50 +0800
Subject: [PATCH] =?UTF-8?q?enhance(json):=E8=B0=83=E6=95=B4JSON=E7=BC=96?=
 =?UTF-8?q?=E8=A7=A3=E7=A0=81=E5=99=A8=E7=9A=84=E9=85=8D=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.go          |  6 ------
 router/router.go | 13 +++++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/main.go b/main.go
index 0ccc5f4..cb7965f 100644
--- a/main.go
+++ b/main.go
@@ -17,7 +17,6 @@ import (
 	"strconv"
 	"time"
 
-	jsontime "github.com/liamylian/jsontime/v2/v2"
 	"github.com/samber/lo"
 	"github.com/shopspring/decimal"
 	"github.com/uptrace/bun/migrate"
@@ -70,11 +69,6 @@ func init() {
 		l.Fatal("Singularity account intialize failed.", zap.Error(err))
 	}
 	l.Info("Singularity account intialized.")
-
-	timeZoneShanghai, _ := time.LoadLocation("Asia/Shanghai")
-	jsontime.AddTimeFormatAlias("simple_datetime", "2006-01-02 15:04:05")
-	jsontime.AddTimeFormatAlias("simple_date", "2006-01-02")
-	jsontime.AddLocaleAlias("shanghai", timeZoneShanghai)
 }
 
 func initializeRegions() error {
diff --git a/router/router.go b/router/router.go
index 319fdc9..070b4de 100644
--- a/router/router.go
+++ b/router/router.go
@@ -6,13 +6,24 @@ import (
 	"electricity_bill_calc/security"
 	"fmt"
 	"runtime"
+	"time"
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/compress"
 	"github.com/gofiber/fiber/v2/middleware/recover"
+	jsontime "github.com/liamylian/jsontime/v2/v2"
 	"go.uber.org/zap"
 )
 
+var json = jsontime.ConfigWithCustomTimeFormat
+
+func init() {
+	timeZoneShanghai, _ := time.LoadLocation("Asia/Shanghai")
+	jsontime.AddTimeFormatAlias("simple_datetime", "2006-01-02 15:04:05")
+	jsontime.AddTimeFormatAlias("simple_date", "2006-01-02")
+	jsontime.AddLocaleAlias("shanghai", timeZoneShanghai)
+}
+
 func App() *fiber.App {
 	app := fiber.New(fiber.Config{
 		BodyLimit:               10 * 1024 * 1024,
@@ -20,6 +31,8 @@ func App() *fiber.App {
 		EnableTrustedProxyCheck: false,
 		Prefork:                 false,
 		ErrorHandler:            errorHandler,
+		JSONEncoder:             json.Marshal,
+		JSONDecoder:             json.Unmarshal,
 	})
 	app.Use(compress.New())
 	app.Use(recover.New(recover.Config{