From 9d03532a1bc83c534551e4490a6073ca6a9d1224 Mon Sep 17 00:00:00 2001 From: Yuan Si Date: Sat, 24 Jun 2023 18:36:24 +0800 Subject: [PATCH] sif: Fix parsing multipart again Signed-off-by: Yuan Si --- handler/download.go | 8 ++++---- middleware/login.go | 2 +- router/router.go | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/handler/download.go b/handler/download.go index 051e221..8985698 100644 --- a/handler/download.go +++ b/handler/download.go @@ -23,7 +23,7 @@ type PkgInfo struct { func DownloadAdditional(ctx *gin.Context) { downloadReq := model.AdditionalReq{} - if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil { + if err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq); err != nil { panic(err) } pkgList := []model.AdditionalRes{} @@ -63,7 +63,7 @@ func DownloadAdditional(ctx *gin.Context) { func DownloadBatch(ctx *gin.Context) { downloadReq := model.BatchReq{} - if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil { + if err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq); err != nil { panic(err) } pkgList := []model.BatchRes{} @@ -103,7 +103,7 @@ func DownloadBatch(ctx *gin.Context) { func DownloadUpdate(ctx *gin.Context) { downloadReq := model.UpdateReq{} - if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil { + if err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq); err != nil { panic(err) } pkgList := []model.UpdateRes{} @@ -146,7 +146,7 @@ func DownloadUrl(ctx *gin.Context) { // Extract SQL: SELECT CAST(pkg_type AS TEXT) || '_' || CAST(pkg_id AS TEXT) || '_' || CAST(pkg_order AS TEXT) || '.zip' AS zip_name FROM download_m ORDER BY pkg_type ASC,pkg_id ASC, pkg_order ASC; // Extract Cmd: cat list.txt | while read line; do; unzip -o $line; done downloadReq := model.UrlReq{} - if err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &downloadReq); err != nil { + if err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq); err != nil { panic(err) } urlList := []string{} diff --git a/middleware/login.go b/middleware/login.go index cce6d9a..5e8f863 100644 --- a/middleware/login.go +++ b/middleware/login.go @@ -22,7 +22,7 @@ func Login(ctx *gin.Context) { xmcKey := utils.SliceXor(clientToken, serverToken) aesKey := xmcKey[0:16] - req := gjson.Parse(ctx.PostForm("request_data")) + req := gjson.Parse(ctx.GetString("request_data")) tKey, err := base64.StdEncoding.DecodeString(req.Get("login_key").String()) CheckErr(err) loginKey := utils.Sub16(encrypt.AES_CBC_Decrypt(tKey, aesKey)) diff --git a/router/router.go b/router/router.go index 0232989..44894a4 100644 --- a/router/router.go +++ b/router/router.go @@ -65,10 +65,10 @@ func SifRouter(r *gin.Engine) { m.POST("/award/set", handler.AwardSet) m.POST("/background/set", handler.BackgroundSet) m.POST("/download/additional", handler.DownloadAdditional) - m.POST("/download/batch", handler.DownloadBatch) - m.POST("/download/event", handler.DownloadEvent) - m.POST("/download/getUrl", handler.DownloadUrl) - m.POST("/download/update", handler.DownloadUpdate) + m.POST("/download/batch", middleware.ParseMultipartForm, handler.DownloadBatch) + m.POST("/download/event", middleware.ParseMultipartForm, handler.DownloadEvent) + m.POST("/download/getUrl", middleware.ParseMultipartForm, handler.DownloadUrl) + m.POST("/download/update", middleware.ParseMultipartForm, handler.DownloadUpdate) m.POST("/event/eventList", middleware.ParseMultipartForm, handler.EventList) m.POST("/gdpr/get", middleware.ParseMultipartForm, handler.Gdpr) m.POST("/lbonus/execute", handler.LBonusExecute) @@ -78,7 +78,7 @@ func SifRouter(r *gin.Engine) { m.POST("/live/preciseScore", middleware.ParseMultipartForm, handler.PlayScore) m.POST("/live/reward", middleware.ParseMultipartForm, handler.PlayReward) m.POST("/login/authkey", middleware.AuthKey, handler.AuthKey) - m.POST("/login/login", middleware.Login, handler.Login) + m.POST("/login/login", middleware.ParseMultipartForm, middleware.Login, handler.Login) m.POST("/multiunit/scenarioStartup", handler.MultiUnitStartUp) m.POST("/museum/info", middleware.ParseMultipartForm, handler.MuseumInfo) m.POST("/notice/noticeFriendGreeting", middleware.ParseMultipartForm, handler.NoticeFriendGreeting)