diff --git a/doc/api/carv.api b/doc/api/carv.api index b8c9dd2..095dbb2 100644 --- a/doc/api/carv.api +++ b/doc/api/carv.api @@ -20,7 +20,7 @@ service novatask { @doc "游戏主线解锁第x章节" @handler UnlockChapter - get /unlock_chapter (UnlockChapterReq) returns (CarvResult) + get /unlock_chapter/:chapter (UnlockChapterReq) returns (CarvResult) } type Result { @@ -38,13 +38,17 @@ type CarvResult { } type EmailKey { - Email string `form:"email"` - ApiKey string `header:"x-api-key"` + BeginTime int64 `form:"begin_time"` //begin_time + EndTime int64 `form:"end_time"` // end_time + Email string `form:"email"` // email + ApiKey string `header:"x-api-key"` // x-api-key } type UnlockChapterReq { - Email string `form:"email"` - Chapter int `form:"chapter"` - ApiKey string `header:"x-api-key"` + BeginTime int64 `form:"begin_time"` //begin_time + EndTime int64 `form:"end_time"` // end_time + Email string `form:"email"` // email + Chapter int `path:"chapter"` // 章节数 + ApiKey string `header:"x-api-key"` // x-api-key } diff --git a/doc/swagger/nova.json b/doc/swagger/nova.json index e9cec91..861b15e 100644 --- a/doc/swagger/nova.json +++ b/doc/swagger/nova.json @@ -99,12 +99,30 @@ "parameters": [ { "name": "x-api-key", + "description": " x-api-key", "in": "header", "required": true, "type": "string" }, + { + "name": "begin_time", + "description": "begin_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "end_time", + "description": " end_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, { "name": "email", + "description": " email", "in": "query", "required": true, "type": "string" @@ -133,12 +151,30 @@ "parameters": [ { "name": "x-api-key", + "description": " x-api-key", "in": "header", "required": true, "type": "string" }, + { + "name": "begin_time", + "description": "begin_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "end_time", + "description": " end_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, { "name": "email", + "description": " email", "in": "query", "required": true, "type": "string" @@ -167,12 +203,30 @@ "parameters": [ { "name": "x-api-key", + "description": " x-api-key", "in": "header", "required": true, "type": "string" }, + { + "name": "begin_time", + "description": "begin_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "end_time", + "description": " end_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, { "name": "email", + "description": " email", "in": "query", "required": true, "type": "string" @@ -186,7 +240,7 @@ ] } }, - "/gapi/carv/unlock_chapter": { + "/gapi/carv/unlock_chapter/{chapter}": { "get": { "summary": "游戏主线解锁第x章节", "operationId": "UnlockChapter", @@ -199,24 +253,41 @@ } }, "parameters": [ + { + "name": "chapter", + "in": "path", + "required": true, + "type": "string" + }, { "name": "x-api-key", + "description": " x-api-key", "in": "header", "required": true, "type": "string" }, { - "name": "email", - "in": "query", - "required": true, - "type": "string" - }, - { - "name": "chapter", + "name": "begin_time", + "description": "begin_time", "in": "query", "required": true, "type": "integer", - "format": "int32" + "format": "int64" + }, + { + "name": "end_time", + "description": " end_time", + "in": "query", + "required": true, + "type": "integer", + "format": "int64" + }, + { + "name": "email", + "description": " email", + "in": "query", + "required": true, + "type": "string" } ], "tags": [ @@ -547,12 +618,25 @@ "EmailKey": { "type": "object", "properties": { + "begin_time": { + "type": "integer", + "format": "int64", + "description": "begin_time" + }, + "end_time": { + "type": "integer", + "format": "int64", + "description": " end_time" + }, "email": { - "type": "string" + "type": "string", + "description": " email" } }, "title": "EmailKey", "required": [ + "begin_time", + "end_time", "email" ] }, @@ -902,18 +986,26 @@ "UnlockChapterReq": { "type": "object", "properties": { - "email": { - "type": "string" - }, - "chapter": { + "begin_time": { "type": "integer", - "format": "int32" + "format": "int64", + "description": "begin_time" + }, + "end_time": { + "type": "integer", + "format": "int64", + "description": " end_time" + }, + "email": { + "type": "string", + "description": " email" } }, "title": "UnlockChapterReq", "required": [ - "email", - "chapter" + "begin_time", + "end_time", + "email" ] }, "UserNft": { diff --git a/internal/handler/routes.go b/internal/handler/routes.go index 68d8815..9b2dda1 100644 --- a/internal/handler/routes.go +++ b/internal/handler/routes.go @@ -73,7 +73,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { { // 游戏主线解锁第x章节 Method: http.MethodGet, - Path: "/unlock_chapter", + Path: "/unlock_chapter/:chapter", Handler: carv.UnlockChapterHandler(serverCtx), }, }..., diff --git a/internal/types/types.go b/internal/types/types.go index 336ead3..39ce6a2 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -18,8 +18,10 @@ type Community struct { } type EmailKey struct { - Email string `form:"email"` - ApiKey string `header:"x-api-key"` + BeginTime int64 `form:"begin_time"` //begin_time + EndTime int64 `form:"end_time"` // end_time + Email string `form:"email"` // email + ApiKey string `header:"x-api-key"` // x-api-key } type EmailReward struct { @@ -110,9 +112,11 @@ type UnStakeNftReq struct { } type UnlockChapterReq struct { - Email string `form:"email"` - Chapter int `form:"chapter"` - ApiKey string `header:"x-api-key"` + BeginTime int64 `form:"begin_time"` //begin_time + EndTime int64 `form:"end_time"` // end_time + Email string `form:"email"` // email + Chapter int `path:"chapter"` // 章节数 + ApiKey string `header:"x-api-key"` // x-api-key } type UserNft struct {