ci03965/91fans_server
1
0
Fork 0
forked from root/91fans_server
Code Pull Requests Activity

代码优化

Browse Source
This commit is contained in:
root
2026-09-16 16:13:29 +08:00
parent 3e04b04a90
commit 3646608b86
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ginUtil.go
+22 -9
View File
@@ -87,9 +87,9 @@ func ServeJsonWithExtra(c *gin.Context, code stderr.Code, data interface{}, extr
log.Any("Code", code))
}
if !IsNilOrEmpty(data) && code == stderr.Success {
t := reflect.TypeOf(data)
if !(t.Kind() == reflect.Map || t.Kind() == reflect.Struct || t.Kind() == reflect.Slice) {
if kind, ok := isRespDataTypeValid(data); !ok {
log.WarnX(c, "[===TypeError===] Return Data Type error is not struct or slice",
log.Any("kind", kind),
log.Any("path", c.Request.URL.Path))
}
}
@@ -161,10 +161,9 @@ func ServeToJSON(c *gin.Context, code stderr.Code, data interface{}) {
log.Any("Code", code))
}
if !IsNilOrEmpty(data) && code == stderr.Success {
t := reflect.TypeOf(data)
if !(t.Kind() == reflect.Map || t.Kind() == reflect.Struct || t.Kind() == reflect.Slice || t.Kind() == reflect.Ptr) {
if kind, ok := isRespDataTypeValid(data); !ok {
log.WarnX(c, "[===TypeError===] Return Data Type error is not struct or slice",
log.Any("kind", t.Kind()),
log.Any("kind", kind),
log.Any("path", c.Request.URL.Path))
}
}
@@ -227,9 +226,9 @@ func serveJsonLogic(c *gin.Context, code stderr.Code, data interface{}, extra ma
log.Any("Code", code))
}
if !IsNilOrEmpty(data) && code == stderr.Success {
t := reflect.TypeOf(data)
if !(t.Kind() == reflect.Map || t.Kind() == reflect.Struct || t.Kind() == reflect.Slice) {
if kind, ok := isRespDataTypeValid(data); !ok {
log.WarnX(c, "[===TypeError===] Return Data Type error is not struct or slice",
log.Any("kind", kind),
log.Any("path", c.Request.URL.Path))
}
}
@@ -429,6 +428,20 @@ func IsNilOrEmpty(in interface{}) bool {
return in == nil || in == ""
}
// isRespDataTypeValid 返回数据是否为可直接下发的类型(map/结构体/切片)，
// 指针先解引用再判断，避免返回 *struct 的接口被误报 TypeError。
func isRespDataTypeValid(data interface{}) (reflect.Kind, bool) {
t := reflect.TypeOf(data)
if t == nil {
return reflect.Invalid, false
}
for t.Kind() == reflect.Ptr {
t = t.Elem()
}
kind := t.Kind()
return kind, kind == reflect.Map || kind == reflect.Struct || kind == reflect.Slice
}
// GetIP 获取真实IP
func GetIP(ctx *gin.Context) string {
relIP, exists := ctx.Get(constant.CtxIP)
@@ -501,9 +514,9 @@ func ServeJsonWithExtraNoEncrypt(c *gin.Context, code stderr.Code, data interfac
log.Any("Code", code))
}
if !IsNilOrEmpty(data) && code == stderr.Success {
t := reflect.TypeOf(data)
if !(t.Kind() == reflect.Map || t.Kind() == reflect.Struct || t.Kind() == reflect.Slice) {
if kind, ok := isRespDataTypeValid(data); !ok {
log.WarnX(c, "[===TypeError===] Return Data Type error is not struct or slice",
log.Any("kind", kind),
log.Any("path", c.Request.URL.Path))
}
}