fix: 第1批 M1、M4~M6 登录密码统一规则与三类导出补列
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:
邹进
2026-10-11 23:41:40 +09:00
parent f56113ba55
commit 260fec7114
24 changed files with 462 additions and 37 deletions

View File

@@ -22,6 +22,7 @@ import (
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/logger"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
"github.com/break/junhong_cmp_fiber/pkg/validator"
"github.com/jackc/pgx/v5/pgconn"
"github.com/redis/go-redis/v9"
"go.uber.org/zap"
@@ -145,6 +146,10 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateAccountRequest) (*m
return nil, errors.New(errors.CodePhoneExists, "手机号已存在")
}
if err := validator.ValidateLoginPassword("密码", req.Password); err != nil {
return nil, err
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "密码哈希失败")
@@ -329,6 +334,9 @@ func (s *Service) Update(ctx context.Context, id uint, req *dto.UpdateAccountReq
}
if req.Password != nil {
if err := validator.ValidateLoginPassword("密码", *req.Password); err != nil {
return nil, err
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(*req.Password), bcrypt.DefaultCost)
if err != nil {
s.recordSecurityFailure(ctx, constants.AuditActionAccountPasswordReset, "更新账号凭据处理失败", constants.AuditResultFailed, account, passwordAuthentication(account, "failed"), beforeData, nil, err)
@@ -851,6 +859,10 @@ func (s *Service) UpdatePassword(ctx context.Context, accountID uint, newPasswor
return errors.Wrap(errors.CodeInternalError, err, "获取账号失败")
}
if err := validator.ValidateLoginPassword("新密码", newPassword); err != nil {
return err
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(newPassword), bcrypt.DefaultCost)
if err != nil {
s.recordSecurityFailure(ctx, constants.AuditActionAccountPasswordReset, "重置账号密码失败", constants.AuditResultFailed, account, passwordAuthentication(account, "failed"), nil, nil, err)

View File

@@ -14,6 +14,7 @@ import (
"github.com/break/junhong_cmp_fiber/pkg/constants"
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
"github.com/break/junhong_cmp_fiber/pkg/validator"
"go.uber.org/zap"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
@@ -224,6 +225,10 @@ func (s *Service) ChangePassword(ctx context.Context, userID uint, oldPassword,
return errors.Wrap(errors.CodeInternalError, err, "查询账号失败")
}
if err := validator.ValidateLoginPassword("新密码", newPassword); err != nil {
return err
}
if err := bcrypt.CompareHashAndPassword([]byte(account.Password), []byte(oldPassword)); err != nil {
appErr := errors.New(errors.CodeInvalidOldPassword, "旧密码错误")
s.recordSecurityFailure(ctx, account, constants.AuditActionAccountPasswordChanged, "拒绝修改账号密码", constants.AuditResultDenied, "", appErr)

View File

@@ -12,6 +12,7 @@ import (
"github.com/break/junhong_cmp_fiber/pkg/constants"
"github.com/break/junhong_cmp_fiber/pkg/errors"
"github.com/break/junhong_cmp_fiber/pkg/middleware"
"github.com/break/junhong_cmp_fiber/pkg/validator"
"golang.org/x/crypto/bcrypt"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@@ -102,6 +103,10 @@ func (s *Service) Create(ctx context.Context, req *dto.CreateEnterpriseReq) (*dt
}
}
if err := validator.ValidateLoginPassword("登录密码", req.Password); err != nil {
return nil, err
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "密码加密失败")
@@ -329,6 +334,10 @@ func (s *Service) UpdatePassword(ctx context.Context, id uint, password string)
ownerShop, _ = s.shopStore.GetByID(ctx, *enterprise.OwnerShopID)
}
if err := validator.ValidateLoginPassword("新密码", password); err != nil {
return err
}
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "密码加密失败")