improve(log):优化日志打印
This commit is contained in:
1 parent
1df2d24e10
commit
cb857c6c61
4 files changed
+13
-12
No files matched your search
@@ -3,17 +3,16 @@ package admin
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/qianfree/team-api/internal/dao"
|
||||
"github.com/qianfree/team-api/internal/logic/common"
|
||||
do "github.com/qianfree/team-api/internal/model/do"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
|
||||
v1 "github.com/qianfree/team-api/api/admin/v1"
|
||||
"github.com/qianfree/team-api/internal/dao"
|
||||
"github.com/qianfree/team-api/internal/logic/common"
|
||||
do "github.com/qianfree/team-api/internal/model/do"
|
||||
"github.com/qianfree/team-api/internal/utility/export"
|
||||
)
|
||||
|
||||
@@ -402,7 +401,7 @@ func (s *sAdmin) AdjustBalance(ctx context.Context, req *v1.AdminWalletAdjustReq
|
||||
}
|
||||
affected, _ := result.RowsAffected()
|
||||
if affected == 0 {
|
||||
return nil, gerror.New("钱包不存在或余额不足")
|
||||
return nil, common.NewBadRequestError("钱包不存在或余额不足")
|
||||
}
|
||||
|
||||
// 查询更新后的余额,用于记录流水
|
||||
@@ -447,7 +446,7 @@ func (s *sAdmin) GetWalletInfo(ctx context.Context, req *v1.AdminWalletInfoReq)
|
||||
Fields("id, balance, frozen_balance, warning_threshold").
|
||||
Scan(&w)
|
||||
if err != nil || w == nil {
|
||||
return nil, gerror.Newf("wallet not found for tenant %d", req.TenantID)
|
||||
return nil, common.NewNotFoundError("钱包")
|
||||
}
|
||||
|
||||
return &v1.AdminWalletInfoRes{
|
||||
@@ -470,7 +469,7 @@ func (s *sAdmin) GetWalletTransactions(ctx context.Context, req *v1.AdminWalletT
|
||||
Fields("id").
|
||||
Scan(&w)
|
||||
if err != nil || w == nil {
|
||||
return nil, gerror.Newf("wallet not found for tenant %d", req.TenantID)
|
||||
return nil, common.NewNotFoundError("钱包")
|
||||
}
|
||||
|
||||
query := dao.BilTransactions.Ctx(ctx).Where("wallet_id", w.ID)
|
||||
@@ -506,7 +505,7 @@ func (s *sAdmin) SetWarningThreshold(ctx context.Context, req *v1.AdminWalletSet
|
||||
Fields("id").
|
||||
Scan(&w)
|
||||
if err != nil || w == nil {
|
||||
return nil, gerror.Newf("wallet not found for tenant %d", req.TenantID)
|
||||
return nil, common.NewNotFoundError("钱包")
|
||||
}
|
||||
|
||||
_, err = dao.BilWallets.Ctx(ctx).
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"context"
|
||||
"strings"
|
||||
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/os/gtime"
|
||||
|
||||
@@ -79,7 +78,7 @@ func (s *sAdmin) ErrorLogDetail(ctx context.Context, req *v1.ErrorLogDetailReq)
|
||||
return nil, err
|
||||
}
|
||||
if len(result) == 0 {
|
||||
return nil, gerror.New("错误日志不存在")
|
||||
return nil, common.NewNotFoundError("错误日志")
|
||||
}
|
||||
row := result[0]
|
||||
data := make(map[string]any, len(row))
|
||||
|
||||
@@ -165,7 +165,7 @@ func (s *sAdmin) TaskCancel(ctx context.Context, req *v1.TaskCancelReq) (*v1.Tas
|
||||
}
|
||||
rowsAffected, _ := result.RowsAffected()
|
||||
if rowsAffected == 0 {
|
||||
return nil, gerror.New("任务无法取消(可能已完成或已失败)")
|
||||
return nil, common.NewBadRequestError("任务无法取消(可能已完成或已失败)")
|
||||
}
|
||||
return &v1.TaskCancelRes{}, nil
|
||||
}
|
||||
|
||||
@@ -4,7 +4,10 @@ import (
|
||||
"time"
|
||||
"unicode"
|
||||
|
||||
"github.com/gogf/gf/v2/errors/gcode"
|
||||
"github.com/gogf/gf/v2/errors/gerror"
|
||||
|
||||
"github.com/qianfree/team-api/internal/consts"
|
||||
)
|
||||
|
||||
// ValidatePassword 校验密码强度:至少8位,包含大写、小写、数字
|
||||
@@ -52,7 +55,7 @@ func ValidateDateParam(date string, fieldName string) error {
|
||||
}
|
||||
_, err := time.Parse("2006-01-02", date)
|
||||
if err != nil {
|
||||
return gerror.Newf("%s格式无效,应为 YYYY-MM-DD", fieldName)
|
||||
return gerror.NewCode(gcode.New(consts.CodeBadRequest, "", nil), "%s格式无效,应为 YYYY-MM-DD", fieldName)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user