From d609f2741de57776bcfb32a2cfcd4251c85c01a8 Mon Sep 17 00:00:00 2001 From: email Date: Fri, 4 Feb 2022 17:06:04 +0800 Subject: [PATCH] feat: compose response data --- api/user.go | 2 +- server/auth.go | 4 ++-- server/common.go | 11 +++++++++++ server/memo.go | 8 ++++---- server/resource.go | 4 ++-- server/shortcut.go | 8 ++++---- server/user.go | 6 +++--- server/webhook.go | 2 +- 8 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 server/common.go diff --git a/api/user.go b/api/user.go index 4ba9169c..45839538 100644 --- a/api/user.go +++ b/api/user.go @@ -7,7 +7,7 @@ type User struct { OpenId string `json:"openId"` Name string `json:"name"` - Password string + Password string `json:"-"` } type UserCreate struct { diff --git a/server/auth.go b/server/auth.go index 85f8bf50..abe2ded3 100644 --- a/server/auth.go +++ b/server/auth.go @@ -40,7 +40,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal create user response").SetInternal(err) } @@ -88,7 +88,7 @@ func (s *Server) registerAuthRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal create user response").SetInternal(err) } diff --git a/server/common.go b/server/common.go new file mode 100644 index 00000000..033bc5d6 --- /dev/null +++ b/server/common.go @@ -0,0 +1,11 @@ +package server + +func composeResponse(data interface{}) interface{} { + type R struct { + Data interface{} `json:"data"` + } + + return R{ + Data: data, + } +} diff --git a/server/memo.go b/server/memo.go index 41bd7046..133df923 100644 --- a/server/memo.go +++ b/server/memo.go @@ -27,7 +27,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err) } @@ -52,7 +52,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err) } @@ -69,7 +69,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo list response").SetInternal(err) } @@ -93,7 +93,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err) } diff --git a/server/resource.go b/server/resource.go index e1dd4c0a..b4d05d4b 100644 --- a/server/resource.go +++ b/server/resource.go @@ -53,7 +53,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(resource); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(resource)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err) } @@ -70,7 +70,7 @@ func (s *Server) registerResourceRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal resource list response").SetInternal(err) } diff --git a/server/shortcut.go b/server/shortcut.go index c6afcbba..5d2063e9 100644 --- a/server/shortcut.go +++ b/server/shortcut.go @@ -26,7 +26,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err) } @@ -51,7 +51,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err) } @@ -68,7 +68,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(list); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(list)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut list response").SetInternal(err) } @@ -89,7 +89,7 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(shortcut); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(shortcut)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal shortcut response").SetInternal(err) } diff --git a/server/user.go b/server/user.go index b1ac50fe..907fa921 100644 --- a/server/user.go +++ b/server/user.go @@ -21,7 +21,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err) } @@ -46,7 +46,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err) } @@ -72,7 +72,7 @@ func (s *Server) registerUserRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(user); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(user)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal user response").SetInternal(err) } diff --git a/server/webhook.go b/server/webhook.go index b98216e1..097e2cc3 100644 --- a/server/webhook.go +++ b/server/webhook.go @@ -41,7 +41,7 @@ func (s *Server) registerWebhookRoutes(g *echo.Group) { } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) - if err := json.NewEncoder(c.Response().Writer).Encode(memo); err != nil { + if err := json.NewEncoder(c.Response().Writer).Encode(composeResponse(memo)); err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to marshal memo response").SetInternal(err) }