diff --git a/dto/cardholder-record.go b/dto/cardholder-record.go index 4e4c1a7..cbb5f59 100644 --- a/dto/cardholder-record.go +++ b/dto/cardholder-record.go @@ -2,8 +2,8 @@ package dto import ( "apigame/service/constd" + "apigame/util/utdto" "apigame/util/util-lx/lxtime" - "apigame/util/utildto" ) // CardHolderRecordBase 开卡包活动日志公共 @@ -39,7 +39,7 @@ type CardHolderRecordOpen struct { } func (d *CardHolderRecordOpen) TableName() string { - return utildto.MYSQL_TABLE_TEMPLATE + return utdto.MYSQL_TABLE_TEMPLATE } func (d *CardHolderRecordOpen) GetTableName(gameId string) string { return constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_OPEN + gameId @@ -62,7 +62,7 @@ type CardHolderRecordRewardAlbum struct { } func (d *CardHolderRecordRewardAlbum) TableName() string { - return utildto.MYSQL_TABLE_TEMPLATE + return utdto.MYSQL_TABLE_TEMPLATE } func (d *CardHolderRecordRewardAlbum) GetTableName(gameId string) string { return constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_REWARDALBUM + gameId @@ -84,7 +84,7 @@ type CardHolderRecordRewardRound struct { } func (d *CardHolderRecordRewardRound) TableName() string { - return utildto.MYSQL_TABLE_TEMPLATE + return utdto.MYSQL_TABLE_TEMPLATE } func (d *CardHolderRecordRewardRound) GetTableName(gameId string) string { return constd.MYSQL_TABLE_S_CARDHOLDER_RECORD_REWARDROUND + gameId diff --git a/dto/cardholder.go b/dto/cardholder.go index c6f1284..ba51861 100644 --- a/dto/cardholder.go +++ b/dto/cardholder.go @@ -2,9 +2,9 @@ package dto import ( "apigame/service/constd" + "apigame/util/utdto" "apigame/util/util-lx/lxalilog" "apigame/util/util-lx/lxtime" - "apigame/util/utildto" "encoding/json" ) @@ -47,7 +47,7 @@ func NewCardHolderDataDetails() *CardHolderDataDetails { } func (d *CardHolderData) TableName() string { - return utildto.MYSQL_TABLE_TEMPLATE + return utdto.MYSQL_TABLE_TEMPLATE } func (d *CardHolderData) GetTableName(gameId string) string { diff --git a/dto/dto.go b/dto/dto.go index 680912c..84f31c5 100644 --- a/dto/dto.go +++ b/dto/dto.go @@ -1,11 +1,42 @@ package dto import ( - "apigame/util/utildto" + "apigame/util/utdto" + "apigame/util/util-lx/lxalilog" "gorm.io/gorm" + "strings" ) -func InitTable(db *gorm.DB, tb ITableData, gameId string) { +func InitTable(db *gorm.DB, gameId string, tb IDtoData) { tableName := tb.GetTableName(gameId) - utildto.InitTable(db, tb, tableName) + utdto.InitTable(db, tb, tableName) +} + +func Insert(db *gorm.DB, gameId string, data IDtoData) { + utdto.Insert(db, data, data.GetTableName(gameId)) +} + +func Update(db *gorm.DB, gameId string, data IDtoData) { + utdto.Update(db, data, data.GetTableName(gameId)) +} + +func Save(db *gorm.DB, gameId string, data IDtoData) { + utdto.Save(db, data, data.GetTableName(gameId)) +} + +func First(db *gorm.DB, gameId string, data IDtoData) (has bool, err error) { + result := utdto.First(db, data, data.GetTableName(gameId)) + err = result.Error + if err == nil { + has = true + } else { + has = false + if strings.Contains(err.Error(), "record not found") { + err = nil + } else { + lxalilog.Errors(err, gameId) + return + } + } + return } diff --git a/dto/init-dto.go b/dto/init-dto.go index 9164738..e7eeb63 100644 --- a/dto/init-dto.go +++ b/dto/init-dto.go @@ -2,7 +2,7 @@ package dto import ( "apigame/service/constd" - "apigame/util/utildto" + "apigame/util/utdto" "fmt" "github.com/astaxie/beego" "gorm.io/gorm" @@ -16,12 +16,12 @@ var ( func InitDto() { // ConnectMySQL - if db, err := utildto.ConnectMySQL(beego.AppConfig.String("mysql::mergecommon")); err == nil { + if db, err := utdto.ConnectMySQL(beego.AppConfig.String("mysql::mergecommon")); err == nil { DbCommon = db } else { fmt.Println(" InitMysqls Error::" + err.Error()) } - if db, err := utildto.ConnectMySQL(beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG)); err == nil { + if db, err := utdto.ConnectMySQL(beego.AppConfig.String("mysql::" + constd.MYSQL_MERGECONFIG)); err == nil { DbConfig = db } else { @@ -30,10 +30,10 @@ func InitDto() { // create table // 卡牌卡包 for _, gameId := range constd.GameListCardHolder { - InitTable(DbCommon, new(CardHolderData), gameId) - InitTable(DbCommon, new(CardHolderRecordOpen), gameId) - InitTable(DbCommon, new(CardHolderRecordRewardAlbum), gameId) - InitTable(DbCommon, new(CardHolderRecordRewardRound), gameId) + InitTable(DbCommon, gameId, new(CardHolderData)) + InitTable(DbCommon, gameId, new(CardHolderRecordOpen)) + InitTable(DbCommon, gameId, new(CardHolderRecordRewardAlbum)) + InitTable(DbCommon, gameId, new(CardHolderRecordRewardRound)) } } diff --git a/dto/interface.go b/dto/interface.go index 65a4c57..e270302 100644 --- a/dto/interface.go +++ b/dto/interface.go @@ -1,24 +1,9 @@ package dto -// ITableData 数据库表 -type ITableData interface { - // GetTableName 表名 后缀是 gameId - GetTableName(gameId string) string -} - -type IRecordData interface { - // TableName 表名模板 - TableName() string - // GetTableName 表名 后缀是 gameId - GetTableName(gameId string) string -} - -// IPlayerData 玩家数据表 -type IPlayerData interface { +// IDtoData dto数据 +type IDtoData interface { // TableName 表名模板 TableName() string // GetTableName 表名 后缀是 gameId GetTableName(gameId string) string - // Init 新建 - Init(uid int64) } diff --git a/dto/player-data.go b/dto/player-data.go deleted file mode 100644 index c26304b..0000000 --- a/dto/player-data.go +++ /dev/null @@ -1,37 +0,0 @@ -package dto - -import ( - "apigame/util/util-lx/lxalilog" - "apigame/util/utildto" - "strings" -) - -func LoadPlayerData(gameId string, uid int64, data IPlayerData) (has bool, err error) { - result := utildto.First(DbCommon, data, data.GetTableName(gameId)) - err = result.Error - if err == nil { - has = true - } else { - has = false - if strings.Contains(err.Error(), "record not found") { - err = nil - } else { - lxalilog.Errors(err, gameId, uid) - return - } - } - // 档案不存在 新建 - if !has { - data.Init(uid) - CreatePlayerData(gameId, data) - } - return -} - -func CreatePlayerData(gameId string, data IPlayerData) { - utildto.Insert(DbCommon, data, data.GetTableName(gameId)) -} - -func SavePlayerData(gameId string, data IPlayerData) { - utildto.Save(DbCommon, data, data.GetTableName(gameId)) -} diff --git a/dto/record.go b/dto/record.go index fa0508d..5657970 100644 --- a/dto/record.go +++ b/dto/record.go @@ -1,7 +1,7 @@ package dto -import "apigame/util/utildto" +import "apigame/util/utdto" -func SaveRecord(gameId string, data IRecordData) { - utildto.Insert(DbCommon, data, data.GetTableName(gameId)) +func SaveRecord(gameId string, data IDtoData) { + utdto.Insert(DbCommon, data, data.GetTableName(gameId)) } diff --git a/service/cardholder/logic.go b/service/cardholder/logic.go index 441cf33..c03c5ae 100644 --- a/service/cardholder/logic.go +++ b/service/cardholder/logic.go @@ -14,13 +14,13 @@ func SaveData(gameId string, d *dto.CardHolderData) { d.UpdateTime = lxtime.NowUninx() d.Encode() - dto.SavePlayerData(gameId, d) + dto.Update(dto.DbCommon, gameId, d) } func _LoadData(gameId string, uid int64) (d *dto.CardHolderData) { d = dto.NewCardHolderData(uid) - has, err := dto.LoadPlayerData(gameId, uid, d) + has, err := dto.First(dto.DbCommon, gameId, d) if err != nil { lxalilog.Errors(err, "cardholder._LoadData", gameId, uid) return @@ -28,6 +28,9 @@ func _LoadData(gameId string, uid int64) (d *dto.CardHolderData) { // 解析 if has { d.Decode() + } else { + d.Init(uid) + dto.Insert(dto.DbCommon, gameId, d) } return } diff --git a/util/utdto/action.go b/util/utdto/action.go new file mode 100644 index 0000000..2e6e79a --- /dev/null +++ b/util/utdto/action.go @@ -0,0 +1,2 @@ +package utdto + diff --git a/util/utdto/base.go b/util/utdto/base.go new file mode 100644 index 0000000..de02fa7 --- /dev/null +++ b/util/utdto/base.go @@ -0,0 +1,37 @@ +package utdto + +import ( + "gorm.io/gorm" + "strings" +) + +// Insert 插入 +func Insert(db *gorm.DB, value any, tableName string) *gorm.DB { + stmt := db.Session(&gorm.Session{DryRun: true}).Create(value).Statement + stmtSQL := stmt.SQL.String() + sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) + return db.Exec(sql, stmt.Vars...) +} + +// Update 更新 +func Update(db *gorm.DB, value any, tableName string) *gorm.DB { + stmt := db.Session(&gorm.Session{DryRun: true}).Updates(value).Statement + stmtSQL := stmt.SQL.String() + sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) + return db.Exec(sql, stmt.Vars...) +} + +// Save 保存 +func Save(db *gorm.DB, value any, tableName string) *gorm.DB { + stmt := db.Session(&gorm.Session{DryRun: true}).Save(value).Statement + stmtSQL := stmt.SQL.String() + sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) + return db.Exec(sql, stmt.Vars...) +} + +func First(db *gorm.DB, value any, tableName string) *gorm.DB { + stmt := db.Session(&gorm.Session{DryRun: true}).First(value).Statement + stmtSQL := stmt.SQL.String() + sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) + return db.Raw(sql, stmt.Vars...).Scan(value) +} diff --git a/util/utdto/mysql.go b/util/utdto/mysql.go new file mode 100644 index 0000000..3cc7e28 --- /dev/null +++ b/util/utdto/mysql.go @@ -0,0 +1,12 @@ +package utdto + +import ( + "gorm.io/driver/mysql" + "gorm.io/gorm" +) + +const MYSQL_TABLE_TEMPLATE = "all_table_template" // 表名模板 + +func ConnectMySQL(dsn string) (db *gorm.DB, err error) { + return gorm.Open(mysql.Open(dsn), &gorm.Config{}) +} diff --git a/util/utdto/table.go b/util/utdto/table.go new file mode 100644 index 0000000..b26f53a --- /dev/null +++ b/util/utdto/table.go @@ -0,0 +1,132 @@ +package utdto + +import ( + "fmt" + "gorm.io/driver/mysql" + "gorm.io/gorm" + "gorm.io/gorm/clause" + "gorm.io/gorm/migrator" + "strings" +) + +func InitTable(db *gorm.DB, value any, tableName string) { + m := db.Migrator().(mysql.Migrator).Migrator + queryTx, execTx := m.GetQueryAndExecTx() + if HasTable(queryTx.Migrator().(mysql.Migrator).Migrator, value, tableName) { + fmt.Println(tableName + " exist, skip!") + } else { + err := CreateTable(execTx, value, tableName) + if err != nil { + fmt.Println("err", err) + } + } +} + +func HasTable(m migrator.Migrator, value interface{}, tableName string) bool { + var count int64 + + m.RunWithValue(value, func(stmt *gorm.Statement) error { + currentDatabase := m.DB.Migrator().CurrentDatabase() + return m.DB.Raw("SELECT count(*) FROM information_schema.tables WHERE table_schema = ? AND table_name = ? AND table_type = ?", currentDatabase, tableName, "BASE TABLE").Row().Scan(&count) + }) + + return count > 0 +} + +func CreateTable(execTx *gorm.DB, value any, tableName string) error { + m := execTx.Migrator().(mysql.Migrator).Migrator + tx := m.DB.Session(&gorm.Session{}) + + if err := m.RunWithValue(value, func(stmt *gorm.Statement) (err error) { + var ( + createTableSQL = "CREATE TABLE ? (" + values = []interface{}{clause.Table{Name: tableName}} + hasPrimaryKeyInDataType bool + ) + + for _, dbName := range stmt.Schema.DBNames { + field := stmt.Schema.FieldsByDBName[dbName] + if !field.IgnoreMigration { + createTableSQL += "? ?" + hasPrimaryKeyInDataType = hasPrimaryKeyInDataType || strings.Contains(strings.ToUpper(m.DataTypeOf(field)), "PRIMARY KEY") + values = append(values, clause.Column{Name: dbName}, m.DB.Migrator().FullDataTypeOf(field)) + createTableSQL += "," + } + } + + if !hasPrimaryKeyInDataType && len(stmt.Schema.PrimaryFields) > 0 { + createTableSQL += "PRIMARY KEY ?," + primaryKeys := make([]interface{}, 0, len(stmt.Schema.PrimaryFields)) + for _, field := range stmt.Schema.PrimaryFields { + primaryKeys = append(primaryKeys, clause.Column{Name: field.DBName}) + } + + values = append(values, primaryKeys) + } + + for _, idx := range stmt.Schema.ParseIndexes() { + if m.CreateIndexAfterCreateTable { + defer func(value interface{}, name string) { + if err == nil { + err = tx.Migrator().CreateIndex(value, name) + } + }(value, idx.Name) + } else { + if idx.Class != "" { + createTableSQL += idx.Class + " " + } + createTableSQL += "INDEX ? ?" + + if idx.Comment != "" { + createTableSQL += fmt.Sprintf(" COMMENT '%s'", idx.Comment) + } + + if idx.Option != "" { + createTableSQL += " " + idx.Option + } + + createTableSQL += "," + values = append(values, clause.Column{Name: idx.Name}, tx.Migrator().(migrator.BuildIndexOptionsInterface).BuildIndexOptions(idx.Fields, stmt)) + } + } + + if !m.DB.DisableForeignKeyConstraintWhenMigrating && !m.DB.IgnoreRelationshipsWhenMigrating { + for _, rel := range stmt.Schema.Relationships.Relations { + if rel.Field.IgnoreMigration { + continue + } + if constraint := rel.ParseConstraint(); constraint != nil { + if constraint.Schema == stmt.Schema { + sql, vars := constraint.Build() + createTableSQL += sql + "," + values = append(values, vars...) + } + } + } + } + + for _, uni := range stmt.Schema.ParseUniqueConstraints() { + createTableSQL += "CONSTRAINT ? UNIQUE (?)," + values = append(values, clause.Column{Name: uni.Name}, clause.Expr{SQL: stmt.Quote(uni.Field.DBName)}) + } + + for _, chk := range stmt.Schema.ParseCheckConstraints() { + createTableSQL += "CONSTRAINT ? CHECK (?)," + values = append(values, clause.Column{Name: chk.Name}, clause.Expr{SQL: chk.Constraint}) + } + + createTableSQL = strings.TrimSuffix(createTableSQL, ",") + + createTableSQL += ")" + + if tableOption, ok := m.DB.Get("gorm:table_options"); ok { + createTableSQL += fmt.Sprint(tableOption) + } + + err = tx.Exec(createTableSQL, values...).Error + return err + }); err != nil { + return err + } + return nil +} diff --git a/util/utildto/mysql.go b/util/utildto/mysql.go deleted file mode 100644 index b724c47..0000000 --- a/util/utildto/mysql.go +++ /dev/null @@ -1,169 +0,0 @@ -package utildto - -import ( - "fmt" - "gorm.io/driver/mysql" - "gorm.io/gorm" - "gorm.io/gorm/clause" - "gorm.io/gorm/migrator" - "strings" -) - -const MYSQL_TABLE_TEMPLATE = "all_table_template" // 表名模板 - -func ConnectMySQL(dsn string) (db *gorm.DB, err error) { - return gorm.Open(mysql.Open(dsn), &gorm.Config{}) -} - -func InitTable(db *gorm.DB, value any, tableName string) { - m := db.Migrator().(mysql.Migrator).Migrator - queryTx, execTx := m.GetQueryAndExecTx() - if HasTable(queryTx.Migrator().(mysql.Migrator).Migrator, value, tableName) { - fmt.Println(tableName + " exist, skip!") - } else { - err := CreateTable(execTx, value, tableName) - if err != nil { - fmt.Println("err", err) - } - } -} - -func HasTable(m migrator.Migrator, value interface{}, tableName string) bool { - var count int64 - - m.RunWithValue(value, func(stmt *gorm.Statement) error { - currentDatabase := m.DB.Migrator().CurrentDatabase() - return m.DB.Raw("SELECT count(*) FROM information_schema.tables WHERE table_schema = ? AND table_name = ? AND table_type = ?", currentDatabase, tableName, "BASE TABLE").Row().Scan(&count) - }) - - return count > 0 -} - -func CreateTable(execTx *gorm.DB, value any, tableName string) error { - m := execTx.Migrator().(mysql.Migrator).Migrator - tx := m.DB.Session(&gorm.Session{}) - - if err := m.RunWithValue(value, func(stmt *gorm.Statement) (err error) { - var ( - createTableSQL = "CREATE TABLE ? (" - values = []interface{}{clause.Table{Name: tableName}} - hasPrimaryKeyInDataType bool - ) - - for _, dbName := range stmt.Schema.DBNames { - field := stmt.Schema.FieldsByDBName[dbName] - if !field.IgnoreMigration { - createTableSQL += "? ?" - hasPrimaryKeyInDataType = hasPrimaryKeyInDataType || strings.Contains(strings.ToUpper(m.DataTypeOf(field)), "PRIMARY KEY") - values = append(values, clause.Column{Name: dbName}, m.DB.Migrator().FullDataTypeOf(field)) - createTableSQL += "," - } - } - - if !hasPrimaryKeyInDataType && len(stmt.Schema.PrimaryFields) > 0 { - createTableSQL += "PRIMARY KEY ?," - primaryKeys := make([]interface{}, 0, len(stmt.Schema.PrimaryFields)) - for _, field := range stmt.Schema.PrimaryFields { - primaryKeys = append(primaryKeys, clause.Column{Name: field.DBName}) - } - - values = append(values, primaryKeys) - } - - for _, idx := range stmt.Schema.ParseIndexes() { - if m.CreateIndexAfterCreateTable { - defer func(value interface{}, name string) { - if err == nil { - err = tx.Migrator().CreateIndex(value, name) - } - }(value, idx.Name) - } else { - if idx.Class != "" { - createTableSQL += idx.Class + " " - } - createTableSQL += "INDEX ? ?" - - if idx.Comment != "" { - createTableSQL += fmt.Sprintf(" COMMENT '%s'", idx.Comment) - } - - if idx.Option != "" { - createTableSQL += " " + idx.Option - } - - createTableSQL += "," - values = append(values, clause.Column{Name: idx.Name}, tx.Migrator().(migrator.BuildIndexOptionsInterface).BuildIndexOptions(idx.Fields, stmt)) - } - } - - if !m.DB.DisableForeignKeyConstraintWhenMigrating && !m.DB.IgnoreRelationshipsWhenMigrating { - for _, rel := range stmt.Schema.Relationships.Relations { - if rel.Field.IgnoreMigration { - continue - } - if constraint := rel.ParseConstraint(); constraint != nil { - if constraint.Schema == stmt.Schema { - sql, vars := constraint.Build() - createTableSQL += sql + "," - values = append(values, vars...) - } - } - } - } - - for _, uni := range stmt.Schema.ParseUniqueConstraints() { - createTableSQL += "CONSTRAINT ? UNIQUE (?)," - values = append(values, clause.Column{Name: uni.Name}, clause.Expr{SQL: stmt.Quote(uni.Field.DBName)}) - } - - for _, chk := range stmt.Schema.ParseCheckConstraints() { - createTableSQL += "CONSTRAINT ? CHECK (?)," - values = append(values, clause.Column{Name: chk.Name}, clause.Expr{SQL: chk.Constraint}) - } - - createTableSQL = strings.TrimSuffix(createTableSQL, ",") - - createTableSQL += ")" - - if tableOption, ok := m.DB.Get("gorm:table_options"); ok { - createTableSQL += fmt.Sprint(tableOption) - } - - err = tx.Exec(createTableSQL, values...).Error - return err - }); err != nil { - return err - } - return nil -} - -// Insert 插入 -func Insert(db *gorm.DB, value any, tableName string) *gorm.DB { - stmt := db.Session(&gorm.Session{DryRun: true}).Create(value).Statement - stmtSQL := stmt.SQL.String() - sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) - return db.Exec(sql, stmt.Vars...) -} - -// Update 更新 -func Update(db *gorm.DB, value any, tableName string) *gorm.DB { - stmt := db.Session(&gorm.Session{DryRun: true}).Updates(value).Statement - stmtSQL := stmt.SQL.String() - sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) - return db.Exec(sql, stmt.Vars...) -} - -// Save 保存 -func Save(db *gorm.DB, value any, tableName string) *gorm.DB { - stmt := db.Session(&gorm.Session{DryRun: true}).Save(value).Statement - stmtSQL := stmt.SQL.String() - sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) - return db.Exec(sql, stmt.Vars...) -} - -func First(db *gorm.DB, value any, tableName string) *gorm.DB { - stmt := db.Session(&gorm.Session{DryRun: true}).First(value).Statement - stmtSQL := stmt.SQL.String() - sql := strings.Replace(stmtSQL, MYSQL_TABLE_TEMPLATE, tableName, -1) - return db.Raw(sql, stmt.Vars...).Scan(value) -} -- libgit2 0.21.0