fix: 第1批 M1、M4~M6 登录密码统一规则与三类导出补列
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Has been cancelled
- 七个设置登录密码入口统一 8~12 位、四类字符至少三类(1001/1016),修改密码与建店铺返回字段级提示 - 订单导出末列“操作人”、IoT 卡导出末列“套餐到期时间”、设备导出流量标 MB 并新增“设备合计(GB)” - 历史导出任务按冻结表头识别新旧尾列,行宽不变 - OpenSpec Change fix-august-iteration-export-and-password-hints:10/12,5.3 前端同步与 5.4 测试部署导出验证待完成
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package admin
|
||||
|
||||
import (
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/validation"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
"github.com/break/junhong_cmp_fiber/internal/service/auth"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
@@ -12,6 +13,9 @@ import (
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// changePasswordInvalidPrefix 修改密码参数校验失败提示的统一前缀。
|
||||
const changePasswordInvalidPrefix = "修改密码参数不合法"
|
||||
|
||||
// AuthHandler 后台认证处理器
|
||||
type AuthHandler struct {
|
||||
authService *auth.Service
|
||||
@@ -147,7 +151,10 @@ func (h *AuthHandler) ChangePassword(c *fiber.Ctx) error {
|
||||
zap.String("method", c.Method()),
|
||||
zap.Error(err),
|
||||
)
|
||||
return errors.New(errors.CodeInvalidParam)
|
||||
return errors.New(errors.CodeInvalidParam, validation.Message(changePasswordInvalidPrefix, &req, err))
|
||||
}
|
||||
if err := validation.LoginPassword(changePasswordInvalidPrefix, "新密码", req.NewPassword); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx := c.UserContext()
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
shopapp "github.com/break/junhong_cmp_fiber/internal/application/shop"
|
||||
walletapp "github.com/break/junhong_cmp_fiber/internal/application/wallet"
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/validation"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
shopquery "github.com/break/junhong_cmp_fiber/internal/query/shop"
|
||||
shopService "github.com/break/junhong_cmp_fiber/internal/service/shop"
|
||||
@@ -200,7 +201,7 @@ func (h *ShopHandler) Create(c *fiber.Ctx) error {
|
||||
if err := h.validator.Struct(&req); err != nil {
|
||||
logger.GetAppLogger().Warn("店铺创建参数验证失败",
|
||||
zap.String("method", c.Method()), zap.String("path", c.Path()), zap.Error(err))
|
||||
return errors.New(errors.CodeInvalidParam)
|
||||
return errors.New(errors.CodeInvalidParam, validation.Message("店铺参数不合法", &req, err))
|
||||
}
|
||||
|
||||
createService := h.createService
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"github.com/break/junhong_cmp_fiber/internal/handler/validation"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
"github.com/break/junhong_cmp_fiber/internal/service/auth"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
@@ -12,6 +13,9 @@ import (
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
// changePasswordInvalidPrefix 修改密码参数校验失败提示的统一前缀。
|
||||
const changePasswordInvalidPrefix = "修改密码参数不合法"
|
||||
|
||||
// Handler 统一认证处理器
|
||||
// 合并后台和 H5 认证接口
|
||||
type Handler struct {
|
||||
@@ -154,7 +158,10 @@ func (h *Handler) ChangePassword(c *fiber.Ctx) error {
|
||||
zap.String("method", c.Method()),
|
||||
zap.Error(err),
|
||||
)
|
||||
return errors.New(errors.CodeInvalidParam)
|
||||
return errors.New(errors.CodeInvalidParam, validation.Message(changePasswordInvalidPrefix, &req, err))
|
||||
}
|
||||
if err := validation.LoginPassword(changePasswordInvalidPrefix, "新密码", req.NewPassword); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ctx := c.UserContext()
|
||||
|
||||
21
internal/handler/validation/password.go
Normal file
21
internal/handler/validation/password.go
Normal file
@@ -0,0 +1,21 @@
|
||||
package validation
|
||||
|
||||
import (
|
||||
stderrors "errors"
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/pkg/errors"
|
||||
"github.com/break/junhong_cmp_fiber/pkg/validator"
|
||||
)
|
||||
|
||||
// LoginPassword 按统一登录密码规则校验,失败时在规则提示前加上 prefix,错误码保持规则给出的值。
|
||||
func LoginPassword(prefix, label, password string) error {
|
||||
err := validator.ValidateLoginPassword(label, password)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
var appErr *errors.AppError
|
||||
if !stderrors.As(err, &appErr) {
|
||||
return errors.New(errors.CodeInvalidParam, prefix)
|
||||
}
|
||||
return errors.New(appErr.Code, prefix+":"+appErr.Message)
|
||||
}
|
||||
Reference in New Issue
Block a user