diff --git a/README.md b/README.md index 0e6b122c..603e04d3 100644 --- a/README.md +++ b/README.md @@ -159,11 +159,11 @@ vi ./config/setting.yml #### 初始化数据库,以及服务启动 ``` # 首次配置需要初始化数据库资源信息 -./go-admin migrate -c config/settings.yml -m dev +./go-admin migrate -c config/settings.yml # 启动项目,也可以用IDE进行调试 -./go-admin server -c config/settings.yml -p 8000 -m dev +./go-admin server -c config/settings.yml -p 8000 ``` diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index 50a4576d..a96cfda2 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -21,7 +21,7 @@ func Preview(c *gin.Context) { table.TableId = id t1, err := template.ParseFiles("template/v3/model.go.template") tools2.HasError(err, "", -1) - t2, err := template.ParseFiles("template/v3/no_actions/api.go.template") + t2, err := template.ParseFiles("template/v3/no_actions/apis.go.template") tools2.HasError(err, "", -1) t3, err := template.ParseFiles("template/v3/js.go.template") tools2.HasError(err, "", -1) @@ -29,7 +29,7 @@ func Preview(c *gin.Context) { tools2.HasError(err, "", -1) t5, err := template.ParseFiles("template/v3/no_actions/router_check_role.go.template") tools2.HasError(err, "", -1) - t6, err := template.ParseFiles("template/v3/no_actions/dto.go.template") + t6, err := template.ParseFiles("template/v3/dto.go.template") tools2.HasError(err, "", -1) tab, _ := table.Get() var b1 bytes.Buffer diff --git a/common/apis/api.go b/common/apis/api.go index db4868d0..59ffbe62 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -27,7 +27,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnError(code)) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnError(code)) } // OK 通常成功数据处理 @@ -38,7 +38,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnOK()) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnOK()) } // PageOK 分页数据处理 @@ -53,5 +53,5 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in // Custom 兼容函数 func (e *Api) Custom(c *gin.Context, data gin.H) { - c.JSON(http.StatusOK, data) + c.AbortWithStatusJSON(http.StatusOK, data) } diff --git a/logger/logger.go b/logger/logger.go index ad3b41a1..627f1ba9 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -3,7 +3,7 @@ package logger var ( // Default logger - DefaultLogger Logger = NewHelper(NewLogger()) + DefaultLogger Logger ) // Logger is a generic logging interface diff --git a/tools/app/return.go b/tools/app/return.go index 2e2aded9..94a05a4c 100644 --- a/tools/app/return.go +++ b/tools/app/return.go @@ -18,7 +18,7 @@ func Error(c *gin.Context, code int, err error, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnError(code)) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnError(code)) } // 通常成功数据处理 @@ -29,7 +29,7 @@ func OK(c *gin.Context, data interface{}, msg string) { res.Msg = msg } res.RequestId = tools.GenerateMsgIDFromContext(c) - c.JSON(http.StatusOK, res.ReturnOK()) + c.AbortWithStatusJSON(http.StatusOK, res.ReturnOK()) } // 分页数据处理 @@ -44,5 +44,5 @@ func PageOK(c *gin.Context, result interface{}, count int, pageIndex int, pageSi // 兼容函数 func Custum(c *gin.Context, data gin.H) { - c.JSON(http.StatusOK, data) + c.AbortWithStatusJSON(http.StatusOK, data) }