diff --git a/routes.go b/routes.go index b60911bc3f96ffa10c8f132f65a3a721a32a2f00..95ee4ebd7bb6f5323fcc98e1d60b7fd16820e662 100644 --- a/routes.go +++ b/routes.go @@ -11,5 +11,6 @@ func Register(c *gin.Engine) { utils.HandlerRoute(c, "api/tag", routes.TagRegister) utils.HandlerRoute(c, "api/talking", routes.TalkingRegister) utils.HandlerRoute(c, "api/admin", routes.AdminRegister) + utils.HandlerRoute(c, "api/friendship", routes.FriendShipRoutes) } diff --git a/src/check/check.go b/src/check/article.go similarity index 87% rename from src/check/check.go rename to src/check/article.go index fc95edbed59727874c077a013375b1ce5eeaeb03..ce485c60d11a33e315749d6a139446c6043b3127 100644 --- a/src/check/check.go +++ b/src/check/article.go @@ -9,7 +9,7 @@ import ( "net/http" ) -func CheckList(ctx *gin.Context) (utils.RespHeader, error) { +func ListCheck(ctx *gin.Context) (utils.RespHeader, error) { req := new(message.ListReq) var resp *message.BaseRespHeader err := ctx.ShouldBindJSON(&req) diff --git a/src/routes/article.go b/src/routes/article.go index dddb12ed3c5b1a8427ac865cffece5dbf1fbcc95..ca5fac83d5d4d07c68440c12183e61175320fc27 100644 --- a/src/routes/article.go +++ b/src/routes/article.go @@ -8,9 +8,9 @@ import ( ) func ArticleRegister(rg *gin.RouterGroup) { - rg.POST("/list", utils.EasyHandler(&utils.LogicContext{CheckFunc: check.CheckList, LogicFunc: server.ListLogic})) - rg.POST("/add", utils.EasyHandler(&utils.LogicContext{CheckFunc: check.CheckList, LogicFunc: server.ListLogic})) - rg.POST("/update", utils.EasyHandler(&utils.LogicContext{CheckFunc: check.CheckList, LogicFunc: server.ListLogic})) - rg.POST("/delete", utils.EasyHandler(&utils.LogicContext{CheckFunc: check.CheckList, LogicFunc: server.ListLogic})) - rg.POST("/detail", utils.EasyHandler(&utils.LogicContext{CheckFunc: check.CheckList, LogicFunc: server.ListLogic})) + rg.POST("/list", utils.EasyHandler(check.ListCheck, server.ListLogic)) + rg.POST("/add", utils.EasyHandler(check.ListCheck, server.ListLogic)) + rg.POST("/update", utils.EasyHandler(check.ListCheck, server.ListLogic)) + rg.POST("/delete", utils.EasyHandler(check.ListCheck, server.ListLogic)) + rg.POST("/detail", utils.EasyHandler(check.ListCheck, server.ListLogic)) } diff --git a/src/utils/context.go b/src/utils/context.go index 0754e741152d5f7919b126dbb840b60127a64c87..ff89451a6702973f05250f75711b8df9783bbd9e 100644 --- a/src/utils/context.go +++ b/src/utils/context.go @@ -5,25 +5,19 @@ import ( "net/http" ) -type RespHeader interface {} +type RespHeader interface{} -type LogicContext struct { - CheckFunc func(ctx *gin.Context) (RespHeader, error) - LogicFunc func(ctx *gin.Context) RespHeader -} +type CheckFunc func(ctx *gin.Context) (RespHeader, error) +type LogicFunc func(ctx *gin.Context) RespHeader -func (lc *LogicContext) do() gin.HandlerFunc { - return func(context *gin.Context) { +func EasyHandler(cf CheckFunc, lf LogicFunc) gin.HandlerFunc { + return func(context *gin.Context) { var resp interface{} - if checkResp, err := lc.CheckFunc(context); err != nil { + if checkResp, err := cf(context); err != nil { resp = checkResp } else { - resp = lc.LogicFunc(context) + resp = lf(context) } context.JSON(http.StatusOK, resp) } } - -func EasyHandler(lc *LogicContext) gin.HandlerFunc { - return lc.do() -}