TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-03 16:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: editor提示被遮挡问题修复等

Browse Source
This commit is contained in:
meilin.huang
2025-10-18 11:21:33 +08:00
parent 4e30bdb7cc
commit dba19b1e66
27 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/pkg/biz/assert.go
View File

@@ -21,7 +21,7 @@ func ErrIsNil(err error, msgAndParams ...any) {
panic(errorx.NewBiz(err.Error()))
}
panic(errorx.NewBiz(msgAndParams[0].(string), msgAndParams[1:]...))
panic(errorx.NewBizf(msgAndParams[0].(string), msgAndParams[1:]...))
}
}
@@ -43,7 +43,7 @@ func ErrIsNilI(ctx context.Context, err error, msgId i18n.MsgId, attrs ...any) {
func ErrNotNil(err error, msg string, params ...any) {
if err == nil {
panic(errorx.NewBiz(msg, params...))
panic(errorx.NewBizf(msg, params...))
}
}
@@ -53,7 +53,7 @@ func ErrNotNil(err error, msg string, params ...any) {
// biz.ErrIsNilAppendErr(err, "xxxx: %s")
func ErrIsNilAppendErr(err error, msg string) {
if err != nil {
panic(errorx.NewBiz(msg, err.Error()))
panic(errorx.NewBizf(msg, err.Error()))
}
}
@@ -63,13 +63,13 @@ func ErrIsNilAppendErr(err error, msg string) {
// biz.ErrIsNilAppendErr(err, "xxxx: %s")
func ErrIsNilAppendErrI(ctx context.Context, err error, msgId i18n.MsgId) {
if err != nil {
panic(errorx.NewBiz(i18n.TC(ctx, msgId), err.Error()))
panic(errorx.NewBizf(i18n.TC(ctx, msgId), err.Error()))
}
}
func IsTrue(exp bool, msg string, params ...any) {
if !exp {
panic(errorx.NewBiz(msg, params...))
panic(errorx.NewBizf(msg, params...))
}
}
@@ -87,19 +87,19 @@ func IsTrueBy(exp bool, err *errorx.BizError) {
func NotEmpty(str string, msg string, params ...any) {
if str == "" {
panic(errorx.NewBiz(msg, params...))
panic(errorx.NewBizf(msg, params...))
}
}
func NotNil(data any, msg string, params ...any) {
if reflect.ValueOf(data).IsNil() {
panic(errorx.NewBiz(msg, params...))
panic(errorx.NewBizf(msg, params...))
}
}
func NotBlank(data any, msg string, params ...any) {
if anyx.IsBlank(data) {
panic(errorx.NewBiz(msg, params...))
panic(errorx.NewBizf(msg, params...))
}
}

20
server/pkg/errorx/bizerror.go
View File

@@ -35,8 +35,13 @@ func (e BizError) String() string {
}
// NewBiz 创建业务逻辑错误结构体，默认为业务逻辑错误
func NewBiz(msg string, formatValues ...any) *BizError {
return &BizError{code: BizErr.code, err: fmt.Sprintf(msg, formatValues...)}
func NewBiz(msg string) *BizError {
return &BizError{code: BizErr.code, err: msg}
}
// NewBizf 创建业务逻辑错误结构体，可设置格式化参数
func NewBizf(format string, formatValues ...any) *BizError {
return NewBiz(fmt.Sprintf(format, formatValues...))
}
// NewBizI 使用i18n的msgId创建业务逻辑错误结构体，默认为业务逻辑错误 (使用ctx中的国际化语言)
@@ -47,7 +52,12 @@ func NewBizI(ctx context.Context, msgId i18n.MsgId, attrs ...any) *BizError {
return &BizError{code: BizErr.code, err: i18n.TC(ctx, msgId, attrs...)}
}
// 创建业务逻辑错误结构体，可设置指定错误code
func NewBizCode(code int16, msg string, formats ...any) *BizError {
return &BizError{code: code, err: fmt.Sprintf(msg, formats...)}
// NewBizCode 创建业务逻辑错误结构体，可设置指定错误code
func NewBizCode(code int16, msg string) *BizError {
return &BizError{code: code, err: msg}
}
// NewBizCodef 创建业务逻辑错误结构体，可设置指定错误code，并且支持格式化参数
func NewBizCodef(code int16, format string, formats ...any) *BizError {
return NewBizCode(code, fmt.Sprintf(format, formats...))
}