直接在tableFor里创建表

Author: xyy0411

niu/db.go

@@ -4,19 +4,13 @@ import (
 	"fmt"
 	"github.com/RomiChan/syncx"
 	"github.com/jinzhu/gorm"
+	"github.com/sirupsen/logrus"
 )
 
 var (
 	migratedGroups = syncx.Map[string, bool]{} // key: string, value: bool
-	tableHooks     []tableHook
 )
 
-type tableHook func(gid int64) error
-
-type model struct {
-	*gorm.DB
-}
-
 func ensureTable[T userInfo | AuctionInfo](gid int64, prefix string) error {
 	table := fmt.Sprintf("group_%d_%s_info", gid, prefix)
 	if _, ok := migratedGroups.Load(table); ok {
@@ -32,29 +26,25 @@ func ensureTable[T userInfo | AuctionInfo](gid int64, prefix string) error {
 	return nil
 }
 
-func ensureUserInfo(gid int64) error {
-	return ensureTable[userInfo](gid, ur)
-}
+func tableFor(gid int64, prefix string) *gorm.DB {
 
-func ensureAuctionInfo(gid int64) error {
-	return ensureTable[AuctionInfo](gid, ac)
-}
-
-// registerTableHook 注册钩子
-func registerTableHook(h ...tableHook) {
-	tableHooks = append(tableHooks, h...)
-}
-
-func tableFor(gid int64, prefix string) *model {
-	// 先跑钩子
-	for _, h := range tableHooks {
-		if err := h(gid); err != nil {
-			panic(fmt.Sprintf("执行钩子失败: %v", err))
+	switch prefix {
+	case ur:
+		err := ensureTable[userInfo](gid, ur)
+		if err != nil {
+			logrus.Error("ensureTable error: %v", err)
+			return nil
+		}
+	case ac:
+		err := ensureTable[AuctionInfo](gid, ac)
+		if err != nil {
+			logrus.Error("ensureTable error: %v", err)
+			return nil
 		}
 	}
 
 	tableName := fmt.Sprintf("group_%d_%s_info", gid, prefix)
-	return &model{db.Table(tableName)}
+	return db.Table(tableName)
 }
 
 func listUsers(gid int64) (users, error) {

niu/main.go

@@ -22,7 +22,7 @@ const (
 )
 
 var (
-	db         *model
+	db         *gorm.DB
 	globalLock sync.Mutex
 
 	errCancelFail = errors.New("遇到不可抗力因素，注销失败！")
@@ -84,9 +84,7 @@ func init() {
 		panic(err)
 	}
 
-	db = &model{sdb.LogMode(false)}
-
-	registerTableHook(ensureUserInfo, ensureAuctionInfo)
+	db = sdb.LogMode(false)
 }
 
 // DeleteWordNiuNiu ...
@@ -449,11 +447,13 @@ func Auction(gid, uid int64, index int) (string, error) {
 		return "", err
 	}
 
+	bs := fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm", niu.Length)
+
 	if info.Money >= 500 {
-		return fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm,此次购买将赠送你2个伟哥,2个媚药", niu.Length), nil
+		return fmt.Sprintf("%s,此次购买将赠送你2个伟哥,2个媚药", bs), nil
 	}
 
-	return fmt.Sprintf("恭喜你购买成功,当前长度为%.2fcm", niu.Length), nil
+	return bs, nil
 }
 
 // Bag 牛牛背包