noahlan
/
live-service
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: 修复用户积分并发问题，添加乐观锁以及重试机制。

Browse Source
main
NorthLan 3 years ago
parent 1b1a415a34
commit de788a6fd8
9 changed files with 77 additions and 60 deletions
Show Stats Download Patch File Download Diff File

61
app/user_center/model/user_integral_model.go
Unescape Escape View File

@ -2,12 +2,10 @@ package model
import (
"context"
"database/sql"
"fmt"
"git.noahlan.cn/northlan/ntools-go/gorm-zero/gormc"
"github.com/pkg/errors"
"github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm"
"gorm.io/plugin/optimisticlock"
"live-service/common/nerr"
)
@ -20,8 +18,8 @@ type (
userIntegralModel
Transact(ctx context.Context, tx *gorm.DB, fn func(tx *gorm.DB) error) error
InsertTx(ctx context.Context, tx *gorm.DB, data *UserIntegral) error
FindIntegral(ctx context.Context, tx *gorm.DB, userId int64) (int64, error)
UpdateIntegralTx(ctx context.Context, tx *gorm.DB, userId, addon int64) error
FindOneTx(ctx context.Context, tx *gorm.DB, userId int64) (*UserIntegral, error)
UpdateTx(ctx context.Context, tx *gorm.DB, integral *UserIntegral) error
// ChangeIntegral 用户积分变动
ChangeIntegral(ctx context.Context, tx *gorm.DB, userId int64, change int64) (int64, error)
}
@ -47,45 +45,42 @@ func (m *customUserIntegralModel) InsertTx(ctx context.Context, tx *gorm.DB, dat
return err
}
func (m *customUserIntegralModel) UpdateIntegralTx(ctx context.Context, tx *gorm.DB, userId, integral int64) error {
if integral < 0 {
func (m *customUserIntegralModel) UpdateTx(ctx context.Context, tx *gorm.DB, integral *UserIntegral) error {
if integral.Integral < 0 {
return errors.New("无法将积分更新至负数")
}
db := withTx(ctx, m.conn, tx)
result := db.Table(m.table).
Where("`user_id` = ?", userId).
Update("`integral`", integral)
result := db.Model(&integral).Updates(&UserIntegral{Integral: integral.Integral, Version: optimisticlock.Version{Int64: 1}})
if result.Error != nil {
return result.Error
}
// TODO 这里得处理一下
if result.RowsAffected == 0 {
logx.Statf("更新积分影响行数为0, user_id: %d, integral: %d", userId, integral)
return nil
return ErrRowsAffectedZero
}
return nil
}
func (m *customUserIntegralModel) FindIntegral(ctx context.Context, tx *gorm.DB, userId int64) (int64, error) {
var resp int64
err := withTx(ctx, m.conn, tx).Table(m.table).
Select(fmt.Sprintf("%s.integral", m.table)).
func (m *customUserIntegralModel) FindOneTx(ctx context.Context, tx *gorm.DB, userId int64) (*UserIntegral, error) {
var resp UserIntegral
err := withTx(ctx, m.conn, tx).Model(&UserIntegral{}).
Where("`user_id` = ?", userId).Take(&resp).Error
switch err {
case nil:
return resp, nil
return &resp, nil
case gormc.ErrNotFound:
return 0, ErrNotFound
return nil, ErrNotFound
default:
return 0, err
return nil, err
}
}
func (m *customUserIntegralModel) ChangeIntegral(ctx context.Context, tx *gorm.DB, userId int64, change int64) (int64, error) {
resp := change
err := withTx(ctx, m.conn, tx).Transaction(func(tx *gorm.DB) error {
integral, err := m.FindIntegral(ctx, tx, userId)
var err error
for i := VersionRetryCount; i > 0; i-- {
err = withTx(ctx, m.conn, tx).Transaction(func(tx *gorm.DB) error {
data, err := m.FindOneTx(ctx, tx, userId)
if err != nil {
if errors.Is(err, ErrNotFound) {
if change < 0 {
@ -103,17 +98,27 @@ func (m *customUserIntegralModel) ChangeIntegral(ctx context.Context, tx *gorm.D
return errors.Wrap(err, "获取当前用户积分失败")
}
}
if integral+change < 0 {
if data.Integral+change < 0 {
return errors.New("用户积分不足")
}
if err = m.UpdateIntegralTx(ctx, tx, userId, integral+change); err != nil {
data.Integral += change
if err = m.UpdateTx(ctx, tx, data); err != nil {
if errors.Is(err, ErrRowsAffectedZero) {
return err
}
return errors.Wrap(err, "更新用户积分失败")
}
resp = integral + change
resp = data.Integral
return nil
}, &sql.TxOptions{
Isolation: sql.LevelReadCommitted,
ReadOnly: false,
})
if err != nil && errors.Is(err, ErrRowsAffectedZero) {
// 未能正确更新,直接重试
continue
} else {
// 其它错误退出循环
break
}
}
return resp, err
}

2
app/user_center/model/user_integral_model_gen.go
Unescape Escape View File

@ -5,6 +5,7 @@ package model
import (
"context"
"git.noahlan.cn/northlan/ntools-go/gorm-zero/gormc"
"gorm.io/plugin/optimisticlock"
"time"
"gorm.io/gorm"
@ -26,6 +27,7 @@ type (
UserIntegral struct {
UserId int64 `gorm:"column:user_id;primaryKey"` // 用户ID
Integral int64 `gorm:"column:integral"` // 用户积分，1 RMB：1000
Version optimisticlock.Version `gorm:"column:version"` // 乐观锁
CreateTime time.Time `gorm:"column:create_time;default:null"` // 创建时间
UpdateTime time.Time `gorm:"column:update_time;default:null"` // 更新时间
}

2
app/user_center/model/vars.go
Unescape Escape View File

@ -9,6 +9,8 @@ import (
var ErrNotFound = gorm.ErrRecordNotFound
var ErrRowsAffectedZero = errors.New("RowsAffected zero")
const VersionRetryCount = 5 // 乐观锁重试次数
// BitBool is an implementation of a bool for the MySQL type BIT(1).
// This type allows you to avoid wasting an entire byte for MySQL's boolean type TINYINT.
type BitBool bool

3
app/user_center/rpc/internal/logic/gift/user_send_gift_logic.go
Unescape Escape View File

@ -65,9 +65,6 @@ func (l *UserSendGiftLogic) UserSendGift(in *pb.UserSendGiftReq) (*pb.UserSendGi
if err != nil {
return nil, err
}
if err != nil {
return nil, err
}
resp.Integral = &pb.ChangeIntegralResp{
UserId: in.UserId,
Change: addonIntegral,

4
app/user_center/rpc/internal/logic/integral/get_user_integral_logic.go
Unescape Escape View File

@ -28,13 +28,13 @@ func NewGetUserIntegralLogic(ctx context.Context, svcCtx *svc.ServiceContext) *G
// GetUserIntegral 获取用户积分
func (l *GetUserIntegralLogic) GetUserIntegral(in *pb.UserIdReq) (*pb.UserIntegralResp, error) {
// 查询当前用户积分
integral, err := l.svcCtx.UserIntegralModel.FindIntegral(l.ctx, nil, in.UserId)
integral, err := l.svcCtx.UserIntegralModel.FindOneTx(l.ctx, nil, in.UserId)
if err != nil {
return nil, errors.Wrapf(nerr.NewWithCode(nerr.DBError), "查询用户积分失败, err:%+v", err)
}
return &pb.UserIntegralResp{
UserId: in.UserId,
Integral: integral,
Integral: integral.Integral,
}, nil
}

4
app/user_center/rpc/internal/logic/statistics/stat_pvp_report_logic.go
Unescape Escape View File

@ -67,14 +67,14 @@ func (l *StatPvpReportLogic) StatPvpReport(in *pb.StatPvPReportReq) (*pb.StatPvP
battleReportCfg := l.svcCtx.Config.Integral.BattleReport
// 名将积分
if in.General.Uid > 0 {
integral, err := l.svcCtx.UserIntegralModel.ChangeIntegral(l.ctx, nil, in.General.Uid, battleReportCfg.GeneralIntegral)
_, err := l.svcCtx.UserIntegralModel.ChangeIntegral(l.ctx, nil, in.General.Uid, battleReportCfg.GeneralIntegral)
if err != nil {
l.Logger.Errorf("名将积分更新失败, err:%v", err)
}
resp.General = &pb.StatPvPReportResp_Item{
Uid: in.General.Uid,
Uname: in.General.Uname,
AddonIntegral: integral,
AddonIntegral: battleReportCfg.GeneralIntegral,
}
}
winItemResp := make([]*pb.StatPvPReportResp_Item, 0, len(in.WinItems))

8
app/user_center/rpc/internal/svc/service_context.go
Unescape Escape View File

@ -29,12 +29,18 @@ type ServiceContext struct {
}
func NewServiceContext(c config.Config) *ServiceContext {
var logLevel logger.LogLevel
if c.Log.Mode == "console" {
logLevel = logger.Info
} else {
logLevel = logger.Warn
}
gormDb, err := gorm.Open(mysql.Open(c.DB.DataSource), &gorm.Config{
Logger: logger.New(
log.New(os.Stdout, "\r\n", log.LstdFlags),
logger.Config{
SlowThreshold: 5 * time.Second,
LogLevel: logger.Warn,
LogLevel: logLevel,
IgnoreRecordNotFoundError: true,
Colorful: true,
},

3
go.mod
Unescape Escape View File

@ -12,7 +12,7 @@ require (
google.golang.org/grpc v1.45.0
google.golang.org/protobuf v1.27.1
gorm.io/driver/mysql v1.3.3
gorm.io/gorm v1.23.4
gorm.io/gorm v1.23.5
)
require (
@ -87,6 +87,7 @@ require (
google.golang.org/genproto v0.0.0-20220228195345-15d65a4533f7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gorm.io/plugin/optimisticlock v1.0.7 // indirect
k8s.io/api v0.20.12 // indirect
k8s.io/apimachinery v0.20.12 // indirect
k8s.io/client-go v0.20.12 // indirect

4
go.sum
Unescape Escape View File

@ -852,6 +852,10 @@ gorm.io/driver/mysql v1.3.3/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2
gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
gorm.io/gorm v1.23.4 h1:1BKWM67O6CflSLcwGQR7ccfmC4ebOxQrTfOQGRE9wjg=
gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
gorm.io/gorm v1.23.5 h1:TnlF26wScKSvknUC/Rn8t0NLLM22fypYBlvj1+aH6dM=
gorm.io/gorm v1.23.5/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
gorm.io/plugin/optimisticlock v1.0.7 h1:H+UltfbM3twsgMj4WrRLB2YYVdAcVFegj6DdmIuiA7M=
gorm.io/plugin/optimisticlock v1.0.7/go.mod h1:NTvR8qJnB/+O3yMdVdFPRCOjmzJjIRowhFvQ8HIlODs=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

Write Preview
Loading…
Cancel
Save