diff --git a/CHANGELOG.md b/CHANGELOG.md index b282c76..7c15897 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# (2021-06-27) + +### Features + +* **jwt:** jwt api鉴权 ([f381a20](https://github.com/golang-minibear2333/gin-blog/commit/f381a209081a0b9b865589d88334609fceec6b7d)), closes [#12](https://github.com/golang-minibear2333/gin-blog/issues/12) +* **jwt:** jWT 权限校验模块 ([#13](https://github.com/golang-minibear2333/gin-blog/issues/13)) ([83236bc](https://github.com/golang-minibear2333/gin-blog/commit/83236bc06a13d3968f36b2c305f4f5f759f4b27b)), closes [#10](https://github.com/golang-minibear2333/gin-blog/issues/10) + + # (2021-06-20) diff --git a/docs/docs.go b/docs/docs.go index 9c58bad..7b9412a 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,6 +1,6 @@ // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag at -// 2021-06-27 18:25:38.010049 +0800 CST m=+0.067971498 +// 2021-06-28 12:46:40.179811 +0800 CST m=+0.053454670 package docs @@ -39,6 +39,7 @@ var doc = `{ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -111,6 +112,7 @@ var doc = `{ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -163,6 +165,7 @@ var doc = `{ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -217,6 +220,7 @@ var doc = `{ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", diff --git a/docs/swagger.json b/docs/swagger.json index ba9085d..4134257 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -21,6 +21,7 @@ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -93,6 +94,7 @@ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -145,6 +147,7 @@ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", @@ -199,6 +202,7 @@ "parameters": [ { "type": "string", + "default": "debug", "description": "用户token", "name": "token", "in": "header", diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 0f13e79..acb03d0 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -97,7 +97,8 @@ paths: /api/v1/tags: get: parameters: - - description: 用户token + - default: debug + description: 用户token in: header name: token required: true @@ -146,7 +147,8 @@ paths: consumes: - application/json parameters: - - description: 用户token + - default: debug + description: 用户token in: header name: token required: true @@ -178,7 +180,8 @@ paths: /api/v1/tags/{id}: delete: parameters: - - description: 用户token + - default: debug + description: 用户token in: header name: token required: true @@ -210,7 +213,8 @@ paths: consumes: - application/json parameters: - - description: 用户token + - default: debug + description: 用户token in: header name: token required: true diff --git a/internal/middleware/jwt.go b/internal/middleware/jwt.go index f387b11..815a996 100644 --- a/internal/middleware/jwt.go +++ b/internal/middleware/jwt.go @@ -3,12 +3,17 @@ package middleware import ( "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" + "github.com/golang-minibear2333/gin-blog/global" "github.com/golang-minibear2333/gin-blog/pkg/app" "github.com/golang-minibear2333/gin-blog/pkg/errcode" ) func JWT() gin.HandlerFunc { return func(c *gin.Context) { + if global.ServerSetting.RunMode == "debug"{ + c.Next() + return + } var ( token string ecode = errcode.Success diff --git a/internal/routers/api/v1/tag.go b/internal/routers/api/v1/tag.go index f73c053..f2dd50b 100644 --- a/internal/routers/api/v1/tag.go +++ b/internal/routers/api/v1/tag.go @@ -21,7 +21,7 @@ func (t Tag) Get(c *gin.Context) {} // @tags tag // @Summary 获取多个标签 // @Produce json -// @Param token header string true "用户token" +// @Param token header string true "用户token" default(debug) // @Param name query string false "标签名称" maxlength(100) // @Param state query int false "状态，是否启用(0 为禁用、1 为启用)" Enums(0, 1) default(1) // @Param page query int false "页码" default(1) @@ -69,7 +69,7 @@ func (t Tag) List(c *gin.Context) { // @Summary 新增标签 // @Produce json // @accept json -// @Param token header string true "用户token" +// @Param token header string true "用户token" default(debug) // @Param data body service.CreateTagRequest true "请求体" // @Success 200 {object} model.Tag "成功" // @Failure 400 {object} errcode.Error "请求错误" @@ -102,7 +102,7 @@ func (t Tag) Create(c *gin.Context) { // @Summary 更新标签 // @Produce json // @accept json -// @Param token header string true "用户token" +// @Param token header string true "用户token" default(debug) // @Param id path int true "标签 ID" // @Param data body service.UpdateTagRequest true "请求体" // @Success 200 {object} model.Tag "成功" @@ -135,7 +135,7 @@ func (t Tag) Update(c *gin.Context) { // @Summary 删除标签 // @tags tag // @Produce json -// @Param token header string true "用户token" +// @Param token header string true "用户token" default(debug) // @Param id path int true "标签 ID" // @Success 200 {string} string "成功" // @Failure 400 {object} errcode.Error "请求错误" diff --git a/internal/routers/router.go b/internal/routers/router.go index 14726ec..2047450 100644 --- a/internal/routers/router.go +++ b/internal/routers/router.go @@ -41,10 +41,10 @@ func NewRouter() *gin.Engine { tags := v1.Group("/tags") { tags.POST("", tag.Create) - v1.DELETE(":id", tag.Delete) - v1.PUT(":id", tag.Update) - v1.PATCH(":id/state", tag.Update) - v1.GET("", tag.List) + tags.DELETE(":id", tag.Delete) + tags.PUT(":id", tag.Update) + tags.PATCH(":id/state", tag.Update) + tags.GET("", tag.List) } articles := v1.Group("/articles") { diff --git a/scripts/build_swagger.sh b/scripts/build_swagger.sh index 2a77206..b074473 100644 --- a/scripts/build_swagger.sh +++ b/scripts/build_swagger.sh @@ -1 +1,3 @@ -pushd ../ && swag init \ No newline at end of file +# generate swagger doc +pushd ../ && swag init +