完成游戏人生账号绑定、解绑、绑定信息的接口开发

internal/logic/merchantAdmin/merchantAdmin.go

@@ -15,7 +15,7 @@ import (
 	"server/internal/model/entity"
 	"server/internal/service"
 	"server/utility/ecode"
-	utility "server/utility/encrypt"
+	"server/utility/encrypt"
 	"server/utility/jwt"
 	"server/utility/snowid"
 )
@@ -65,7 +65,7 @@ func (s *sMerchantAdmin) Login(ctx context.Context, in *model.MerchantLoginIn) (
 	if mAdmin[dao.MerchantAdmins.Columns().Status].Int() == consts.MerchantAdministratorDisable {
 		return nil, ecode.Params.Sub("该用户已被禁用")
 	}
-	if !utility.ComparePassword(mAdmin[dao.MerchantAdmins.Columns().PasswordHash].String(), in.Password) {
+	if !encrypt.ComparePassword(mAdmin[dao.MerchantAdmins.Columns().PasswordHash].String(), in.Password) {
 		return nil, ecode.Params.Sub("密码错误")
 	}
 	value, err := dao.Roles.Ctx(ctx).WherePri(mAdmin[dao.MerchantAdmins.Columns().RoleId].Int()).Fields(dao.Roles.Columns().Code).Value()
@@ -145,7 +145,7 @@ func (s *sMerchantAdmin) Register(ctx context.Context, in *model.MerchantAdminRe
 	if code.String() != in.Code {
 		return nil, ecode.Fail.Sub("验证码错误")
 	}
-	hashPass, err := utility.EncryptPassword(in.Password)
+	hashPass, err := encrypt.EncryptPassword(in.Password)
 	if err != nil {
 		return nil, ecode.Fail.Sub("密码加密失败")
 	}