发布代码生成、更新20+表单组件,优化数据字典,gf版本更新到2.3.1

This commit is contained in:
孟帅
2023-01-18 16:23:39 +08:00
parent 50207ded90
commit 87c27a17a3
386 changed files with 27926 additions and 44297 deletions

View File

@@ -7,9 +7,9 @@
package response
import (
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gctx"
"hotgo/internal/consts"
"hotgo/internal/library/contexts"
"hotgo/internal/model"
"time"
@@ -33,7 +33,7 @@ func RJson(r *ghttp.Request, code int, message string, data ...interface{}) {
if len(data) > 0 {
responseData = data[0]
}
Res := &model.Response{
res := &model.Response{
Code: code,
Message: message,
Timestamp: time.Now().Unix(),
@@ -41,36 +41,38 @@ func RJson(r *ghttp.Request, code int, message string, data ...interface{}) {
}
// 如果不是正常的返回则将data转为error
if consts.CodeOK == code {
Res.Data = responseData
if gcode.CodeOK.Code() == code {
res.Data = responseData
} else {
Res.Error = responseData
res.Error = responseData
}
// 清空响应
r.Response.ClearBuffer()
// 写入响应
r.Response.WriteJson(Res)
r.Response.WriteJson(res)
// 加入到上下文
contexts.SetResponse(r.Context(), Res)
contexts.SetResponse(r.Context(), res)
}
// SusJson 返回成功JSON
func SusJson(isExit bool, r *ghttp.Request, message string, data ...interface{}) {
if isExit {
JsonExit(r, consts.CodeOK, message, data...)
JsonExit(r, gcode.CodeOK.Code(), message, data...)
return
}
RJson(r, consts.CodeOK, message, data...)
RJson(r, gcode.CodeOK.Code(), message, data...)
}
// FailJson 返回失败JSON
func FailJson(isExit bool, r *ghttp.Request, message string, data ...interface{}) {
if isExit {
JsonExit(r, consts.CodeNil, message, data...)
JsonExit(r, gcode.CodeNil.Code(), message, data...)
return
}
RJson(r, consts.CodeNil, message, data...)
RJson(r, gcode.CodeNil.Code(), message, data...)
}
// Redirect 重定向