Table -> table

Author: xyy0411

niu/db.go

@@ -13,8 +13,7 @@ var (
 
 type tableHook func(gid int64) error
 
-// Model ...
-type Model struct {
+type model struct {
 	*gorm.DB
 }
 
@@ -46,8 +45,7 @@ func registerTableHook(h ...tableHook) {
 	tableHooks = append(tableHooks, h...)
 }
 
-// TableFor 大写是为了防止数据操作哪里有问题留个保底可以在zbp的项目里直接改
-func TableFor(gid int64, prefix string) *Model {
+func tableFor(gid int64, prefix string) *model {
 	// 先跑钩子
 	for _, h := range tableHooks {
 		if err := h(gid); err != nil {
@@ -56,35 +54,35 @@ func TableFor(gid int64, prefix string) *Model {
 	}
 
 	tableName := fmt.Sprintf("group_%d_%s_info", gid, prefix)
-	return &Model{db.Table(tableName)}
+	return &model{db.Table(tableName)}
 }
 
 func listUsers(gid int64) (users, error) {
 	var us users
-	err := TableFor(gid, ur).Find(&us).Error
+	err := tableFor(gid, ur).Find(&us).Error
 	return us, err
 }
 
 func listAuction(gid int64) ([]AuctionInfo, error) {
 	var as []AuctionInfo
-	err := TableFor(gid, ac).Order("money DESC").Find(&as).Error
+	err := tableFor(gid, ac).Order("money DESC").Find(&as).Error
 	return as, err
 }
 
 func createUser(gid int64, user *userInfo, fix string) error {
-	return TableFor(gid, fix).Create(user).Error
+	return tableFor(gid, fix).Create(user).Error
 }
 
 func getUserByID(gid int64, uid int64) (*userInfo, error) {
 	var user userInfo
-	err := TableFor(gid, ur).Where("user_id = ?", uid).First(&user).Error
+	err := tableFor(gid, ur).Where("user_id = ?", uid).First(&user).Error
 	return &user, err
 }
 
 func updatesUserByID(gid int64, id int64, fields map[string]interface{}) error {
-	return TableFor(gid, ur).Where("user_id = ?", id).Updates(fields).Error
+	return tableFor(gid, ur).Where("user_id = ?", id).Updates(fields).Error
 }
 
 func deleteUserByID(gid int64, id int64) error {
-	return TableFor(gid, ur).Where("user_id = ?", id).Delete(&userInfo{}).Error
+	return tableFor(gid, ur).Where("user_id = ?", id).Delete(&userInfo{}).Error
 }

niu/main.go

@@ -22,7 +22,7 @@ const (
 )
 
 var (
-	db         *Model
+	db         *model
 	globalLock sync.Mutex
 
 	errCancelFail = errors.New("遇到不可抗力因素，注销失败！")
@@ -84,7 +84,7 @@ func init() {
 		panic(err)
 	}
 
-	db = &Model{sdb.LogMode(false)}
+	db = &model{sdb.LogMode(false)}
 
 	registerTableHook(ensureUserInfo, ensureAuctionInfo)
 }
@@ -206,7 +206,7 @@ func HitGlue(gid, uid int64, prop string) (string, error) {
 		return "", err
 	}
 
-	if err = TableFor(gid, ur).Where("user_id = ?", uid).Save(niuniu).Error; err != nil {
+	if err = tableFor(gid, ur).Where("user_id = ?", uid).Save(niuniu).Error; err != nil {
 		return "", err
 	}
 
@@ -266,11 +266,11 @@ func JJ(gid, uid, adduser int64, prop string) (message string, adduserLength flo
 		return "", 0, err
 	}
 
-	if err = TableFor(gid, ur).Where("user_id =?", uid).Update("length", myniuniu.Length).Error; err != nil {
+	if err = tableFor(gid, ur).Where("user_id =?", uid).Update("length", myniuniu.Length).Error; err != nil {
 		return "", 0, err
 	}
 
-	if err = TableFor(gid, ur).Where("user_id =?", adduser).Update("length", adduserniuniu.Length).Error; err != nil {
+	if err = tableFor(gid, ur).Where("user_id =?", adduser).Update("length", adduserniuniu.Length).Error; err != nil {
 		return "", 0, err
 	}
 
@@ -326,7 +326,7 @@ func Redeem(gid, uid int64, lastLength float64) error {
 		return err
 	}
 
-	return TableFor(gid, ur).Where("user_id = ?", uid).Update("length", lastLength).Error
+	return tableFor(gid, ur).Where("user_id = ?", uid).Update("length", lastLength).Error
 }
 
 // Store 牛牛商店
@@ -352,7 +352,7 @@ func Store(gid, uid int64, productID int, quantity int) error {
 		return err
 	}
 
-	return TableFor(gid, ur).Save(info).Error
+	return tableFor(gid, ur).Save(info).Error
 }
 
 // Sell 出售牛牛
@@ -388,7 +388,7 @@ func Sell(gid, uid int64) (string, error) {
 		Money:  money * 2,
 	}
 
-	if err = TableFor(gid, ac).Create(&u).Error; err != nil {
+	if err = tableFor(gid, ac).Create(&u).Error; err != nil {
 		return "", err
 	}
 
@@ -413,7 +413,7 @@ func Auction(gid, uid int64, index int) (string, error) {
 	}
 
 	var info AuctionInfo
-	if err = TableFor(gid, ac).Where("id = ?", index).First(&info).Error; err != nil {
+	if err = tableFor(gid, ac).Where("id = ?", index).First(&info).Error; err != nil {
 		return "", err
 	}
 
@@ -437,11 +437,11 @@ func Auction(gid, uid int64, index int) (string, error) {
 		niu.MeiYao += 2
 	}
 
-	if err = TableFor(gid, ac).Delete(&info).Error; err != nil {
+	if err = tableFor(gid, ac).Delete(&info).Error; err != nil {
 		return "", err
 	}
 
-	if err = TableFor(gid, ur).Save(&niu).Error; err != nil {
+	if err = tableFor(gid, ur).Save(&niu).Error; err != nil {
 		return "", err
 	}