wlw/ai-agent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: enhance error handling with internationalized messages across services and locales

Browse Source
This commit is contained in:
mlogclub
2026-06-02 21:10:17 +08:00
parent 0b4a1b4594
commit 5b6c54de34
14 changed files with 109 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/services/agent_team_schedule_service.go
+17 -17
View File
@@ -92,11 +92,11 @@ func (s *agentTeamScheduleService) Count(cnd *sqls.Cnd) int64 {
}
func (s *agentTeamScheduleService) FindCalendarSchedules(req request.AgentTeamScheduleCalendarRequest) ([]models.AgentTeamSchedule, error) {
startAtValue, err := parseRequiredDateTime(req.StartAt, "开始时间格式错误")
startAtValue, err := parseRequiredDateTime(req.StartAt, "error.agentTeamSchedule.startAtInvalid", "error.agentTeamSchedule.startAtInvalidWithFormat")
if err != nil {
return nil, err
}
endAtValue, err := parseRequiredDateTime(req.EndAt, "结束时间格式错误")
endAtValue, err := parseRequiredDateTime(req.EndAt, "error.agentTeamSchedule.endAtInvalid", "error.agentTeamSchedule.endAtInvalidWithFormat")
if err != nil {
return nil, err
}
@@ -256,11 +256,11 @@ func (s *agentTeamScheduleService) buildScheduleModel(id, teamID int64, startAt,
if !slices.Contains(enums.StatusValues, team.Status) {
return nil, errorsx.InvalidParamI18n("error.e0174")
}
startAtValue, err := parseRequiredDateTime(startAt, "开始时间格式错误")
startAtValue, err := parseRequiredDateTime(startAt, "error.agentTeamSchedule.startAtInvalid", "error.agentTeamSchedule.startAtInvalidWithFormat")
if err != nil {
return nil, err
}
endAtValue, err := parseRequiredDateTime(endAt, "结束时间格式错误")
endAtValue, err := parseRequiredDateTime(endAt, "error.agentTeamSchedule.endAtInvalid", "error.agentTeamSchedule.endAtInvalidWithFormat")
if err != nil {
return nil, err
}
@@ -296,11 +296,11 @@ func (s *agentTeamScheduleService) buildBatchScheduleCandidates(req request.Agen
if err != nil {
return nil, err
}
startDate, err := parseRequiredDate(req.StartDate, "开始日期格式错误")
startDate, err := parseRequiredDate(req.StartDate, "error.agentTeamSchedule.startDateInvalid", "error.agentTeamSchedule.startDateInvalidWithFormat")
if err != nil {
return nil, err
}
endDate, err := parseRequiredDate(req.EndDate, "结束日期格式错误")
endDate, err := parseRequiredDate(req.EndDate, "error.agentTeamSchedule.endDateInvalid", "error.agentTeamSchedule.endDateInvalidWithFormat")
if err != nil {
return nil, err
}
@@ -310,11 +310,11 @@ func (s *agentTeamScheduleService) buildBatchScheduleCandidates(req request.Agen
if startDate.Before(startOfLocalDay(time.Now())) {
return nil, errorsx.InvalidParamI18n("error.e0085")
}
startClock, err := parseRequiredClock(req.StartTime, "开始时间格式错误")
startClock, err := parseRequiredClock(req.StartTime, "error.agentTeamSchedule.startTimeInvalid", "error.agentTeamSchedule.startTimeInvalidWithFormat")
if err != nil {
return nil, err
}
endClock, err := parseRequiredClock(req.EndTime, "结束时间格式错误")
endClock, err := parseRequiredClock(req.EndTime, "error.agentTeamSchedule.endTimeInvalid", "error.agentTeamSchedule.endTimeInvalidWithFormat")
if err != nil {
return nil, err
}
@@ -370,22 +370,22 @@ func (s *agentTeamScheduleService) buildBatchScheduleCandidates(req request.Agen
return candidates, nil
}
func parseRequiredDate(value, message string) (time.Time, error) {
func parseRequiredDate(value, emptyKey, formatKey string) (time.Time, error) {
value = strings.TrimSpace(value)
if value == "" {
return time.Time{}, errorsx.InvalidParam(message)
return time.Time{}, errorsx.InvalidParamI18n(emptyKey)
}
ret, err := time.ParseInLocation(time.DateOnly, value, time.Local)
if err != nil {
return time.Time{}, errorsx.InvalidParam(message + "，请使用 yyyy-MM-dd")
return time.Time{}, errorsx.InvalidParamI18n(formatKey)
}
return startOfLocalDay(ret), nil
}
func parseRequiredClock(value, message string) (time.Time, error) {
func parseRequiredClock(value, emptyKey, formatKey string) (time.Time, error) {
value = strings.TrimSpace(value)
if value == "" {
return time.Time{}, errorsx.InvalidParam(message)
return time.Time{}, errorsx.InvalidParamI18n(emptyKey)
}
layouts := []string{"15:04", "15:04:05"}
for _, layout := range layouts {
@@ -393,7 +393,7 @@ func parseRequiredClock(value, message string) (time.Time, error) {
return ret, nil
}
}
return time.Time{}, errorsx.InvalidParam(message + "，请使用 HH:mm 或 HH:mm:ss")
return time.Time{}, errorsx.InvalidParamI18n(formatKey)
}
func combineDateAndClock(date, clock time.Time) time.Time {
@@ -508,14 +508,14 @@ func uniquePositiveInt64s(values []int64) []int64 {
return ret
}
func parseRequiredDateTime(value, message string) (time.Time, error) {
func parseRequiredDateTime(value, emptyKey, formatKey string) (time.Time, error) {
value = strings.TrimSpace(value)
if value == "" {
return time.Time{}, errorsx.InvalidParam(message)
return time.Time{}, errorsx.InvalidParamI18n(emptyKey)
}
ret, err := parseDateTimeValue(value)
if err != nil {
return time.Time{}, errorsx.InvalidParam(message + "，请使用 yyyy-MM-dd HH:mm:ss 或 RFC3339")
return time.Time{}, errorsx.InvalidParamI18n(formatKey)
}
return ret, nil
}
internal/services/channel_service.go
+1 -1
View File
@@ -169,7 +169,7 @@ func (s *channelService) ParseWxWorkKFChannelConfig(raw string) (*dto.WxWorkKFCh
func (s *channelService) ListWxWorkKFAccounts() ([]response.WxWorkKFAccountResponse, error) {
if !wxwork.Enabled() || wxwork.GetWorkCli() == nil {
return nil, errorsx.BusinessError(1, "企业微信未启用或配置不完整")
return nil, errorsx.BusinessErrorI18n(1, "error.wxwork.configIncomplete")
}
cli, err := wxwork.GetWorkCli().GetKF()
if err != nil {
internal/services/conversation_service.go
+1 -1
View File
@@ -159,7 +159,7 @@ func (s *conversationService) Create(externalUser openidentity.ExternalUser, cha
return nil, err
}
if conversation == nil {
return nil, errorsx.BusinessError(1, "创建会话失败")
return nil, errorsx.BusinessErrorI18n(1, "error.conversation.createFailed")
}
if !created {
return conversation, nil
internal/services/conversation_tag_service.go
+2 -2
View File
@@ -5,9 +5,9 @@ import (
"agent-desk/internal/pkg/dto"
"agent-desk/internal/pkg/dto/request"
"agent-desk/internal/pkg/enums"
"agent-desk/internal/pkg/errorsx"
"agent-desk/internal/pkg/utils"
"agent-desk/internal/repositories"
"errors"
"agent-desk/internal/pkg/httpx/params"
@@ -78,7 +78,7 @@ func (s *conversationTagService) IsExists(conversationID int64, tagID int64) boo
func (s *conversationTagService) AddTag(req request.AddConversationTagRequest, operator *dto.AuthPrincipal) error {
tag := TagService.Get(req.TagID)
if tag == nil || tag.Status != enums.StatusOk {
return errors.New("标签不存在")
return errorsx.InvalidParamI18n("error.conversation.tagNotFound")
}
if s.IsExists(req.ConversationID, req.TagID) {
return nil
internal/services/customer_session_service.go
+2 -2
View File
@@ -90,7 +90,7 @@ func (s *customerSessionService) Sign(channel *models.Channel, customer *models.
cfg := config.Current().CustomerSession
secret := strings.TrimSpace(cfg.Secret)
if secret == "" {
return "", time.Time{}, errorsx.BusinessError(1, "客服会话密钥未配置")
return "", time.Time{}, errorsx.BusinessErrorI18n(1, "error.customerSession.secretMissing")
}
if channel == nil || customer == nil {
return "", time.Time{}, errorsx.InvalidParamI18n("error.e0158")
@@ -168,7 +168,7 @@ func (s *customerSessionService) verifyToken(rawToken string) (*customerSessionC
cfg := config.Current().CustomerSession
secret := strings.TrimSpace(cfg.Secret)
if secret == "" {
return nil, errorsx.BusinessError(1, "客服会话密钥未配置")
return nil, errorsx.BusinessErrorI18n(1, "error.customerSession.secretMissing")
}
claims := &customerSessionClaims{}
token, err := jwt.ParseWithClaims(rawToken, claims, func(token *jwt.Token) (any, error) {
internal/services/oidc_login_service.go
+3 -3
View File
@@ -61,7 +61,7 @@ func (s *oidcLoginService) ExchangeOIDCLoginTicket(ticket string) (*response.Log
func (s *oidcLoginService) loginWithOIDCProfile(profile *oidcLoginProfile, authCfg config.AuthConfig, clientIP, userAgent string) (*response.LoginResponse, error) {
if profile == nil || strings.TrimSpace(profile.Subject) == "" {
return nil, errorsx.BusinessError(2, "OIDC 用户信息不存在")
return nil, errorsx.BusinessErrorI18n(2, "error.oidc.profileMissing")
}
var ret *response.LoginResponse
@@ -78,11 +78,11 @@ func (s *oidcLoginService) loginWithOIDCProfile(profile *oidcLoginProfile, authC
}
} else {
if identity.Status != enums.StatusOk {
return errorsx.BusinessError(3, "当前 OIDC 绑定已停用")
return errorsx.BusinessErrorI18n(3, "error.oidc.bindingDisabled")
}
user = repositories.UserRepository.Get(ctx.Tx, identity.UserID)
if user == nil {
return errorsx.BusinessError(4, "OIDC 账号绑定的系统用户不存在")
return errorsx.BusinessErrorI18n(4, "error.oidc.boundUserMissing")
}
}
internal/services/wxwork_login_service.go
+9 -9
View File
@@ -24,7 +24,7 @@ type wxWorkLoginService struct {
func (s *wxWorkLoginService) BuildWxWorkLoginURL(next string) (string, error) {
if !wxwork.Enabled() {
return "", errorsx.BusinessError(1, "企业微信登录未启用")
return "", errorsx.BusinessErrorI18n(1, "error.wxwork.loginDisabled")
}
state, err := wxwork.CreateState(next)
if err != nil {
@@ -35,7 +35,7 @@ func (s *wxWorkLoginService) BuildWxWorkLoginURL(next string) (string, error) {
func (s *wxWorkLoginService) BuildWxWorkQRCodeLoginURL(next string) (string, error) {
if !wxwork.Enabled() {
return "", errorsx.BusinessError(1, "企业微信登录未启用")
return "", errorsx.BusinessErrorI18n(1, "error.wxwork.loginDisabled")
}
state, err := wxwork.CreateState(next)
if err != nil {
@@ -70,7 +70,7 @@ func (s *wxWorkLoginService) ExchangeWxWorkLoginTicket(ticket string) (*response
func (s *wxWorkLoginService) loginWithWxWorkProfile(profile *wxwork.LoginUser, authCfg config.AuthConfig, clientIP, userAgent string) (*response.LoginResponse, error) {
if profile == nil || strings.TrimSpace(profile.UserID) == "" {
return nil, errorsx.BusinessError(2, "企业微信用户信息不存在")
return nil, errorsx.BusinessErrorI18n(2, "error.wxwork.profileMissing")
}
var ret *response.LoginResponse
@@ -87,11 +87,11 @@ func (s *wxWorkLoginService) loginWithWxWorkProfile(profile *wxwork.LoginUser, a
}
} else {
if identity.Status != enums.StatusOk {
return errorsx.BusinessError(3, "当前企业微信绑定已停用")
return errorsx.BusinessErrorI18n(3, "error.wxwork.bindingDisabled")
}
user = repositories.UserRepository.Get(ctx.Tx, identity.UserID)
if user == nil {
return errorsx.BusinessError(4, "企业微信账号绑定的系统用户不存在")
return errorsx.BusinessErrorI18n(4, "error.wxwork.boundUserMissing")
}
}
@@ -218,19 +218,19 @@ func (s *wxWorkLoginService) resolveWxWorkAvatar(current string, profile *wxwork
func (s *wxWorkLoginService) checkWxWorkProfile(tx *gorm.DB, username, mobile string, email string) error {
if strs.IsBlank(username) {
return errorsx.BusinessError(5, "企业微信用户ID获取失败")
return errorsx.BusinessErrorI18n(5, "error.wxwork.userIDMissing")
}
if existing := repositories.UserRepository.GetByUsername(tx, username); existing != nil {
return errorsx.BusinessError(5, "企业微信用户ID已被系统用户名占用")
return errorsx.BusinessErrorI18n(5, "error.wxwork.userIDTaken")
}
if strs.IsNotBlank(mobile) {
if repositories.UserRepository.GetByMobile(tx, mobile) != nil {
return errorsx.BusinessError(6, "企业微信手机号已被系统用户占用")
return errorsx.BusinessErrorI18n(6, "error.wxwork.mobileTaken")
}
}
if strs.IsNotBlank(email) {
if repositories.UserRepository.GetByEmail(tx, email) != nil {
return errorsx.BusinessError(7, "企业微信邮箱已被系统用户占用")
return errorsx.BusinessErrorI18n(7, "error.wxwork.emailTaken")
}
}
return nil