- continue refactoring...

This commit is contained in:
gazebo
2018-08-17 16:42:16 +08:00
parent d40186e930
commit c5db19045d
33 changed files with 656 additions and 178 deletions

View File

@@ -8,7 +8,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/platformapi/weixinapi"
"git.rosy.net.cn/baseapi/utils"
_ "git.rosy.net.cn/jx-callback/globals/db"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"

View File

@@ -1,4 +1,4 @@
package db
package beegodb
import (
"git.rosy.net.cn/jx-callback/business/legacymodel"
@@ -7,7 +7,6 @@ import (
"git.rosy.net.cn/jx-callback/legacy/models"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
_ "github.com/go-sql-driver/mysql" // import your used driver
)
func Init() {
@@ -24,7 +23,7 @@ func Init() {
orm.RegisterModel(new(model.Waybill))
orm.RegisterModel(new(model.OrderStatus))
orm.RegisterModel(new(model.Jxstorefeature))
orm.RegisterModel(new(legacymodel.Jxstorefeature))
orm.RegisterModel(new(legacymodel.TempLog))
orm.RegisterModel(new(legacymodel.Jxorder2))

View File

@@ -4,6 +4,7 @@ import (
"git.rosy.net.cn/baseapi"
"github.com/astaxie/beego"
"github.com/astaxie/beego/logs"
_ "github.com/go-sql-driver/mysql" // import your used driver
"go.uber.org/zap"
)

41
globals/gormdb/gormdb.go Normal file
View File

@@ -0,0 +1,41 @@
package gormdb
import (
"fmt"
"git.rosy.net.cn/jx-callback/business/model"
"github.com/astaxie/beego"
"github.com/jinzhu/gorm"
)
var (
dbStr string
)
func Init() {
dbStr = beego.AppConfig.String("dbConnectStr")
AutoMigrate()
// globals.SugarLogger.Debug("fuck")
}
func GetDB() *gorm.DB {
db, err := gorm.Open("mysql", dbStr)
if err == nil {
return db
}
panic(fmt.Sprintf("AutoMigrate failed with error:%v", err))
}
func AutoMigrate() {
db := GetDB()
db.SingularTable(true)
// db.DropTableIfExists(&model.Place{})
// db.DropTableIfExists(&model.Store{}, &model.StoreSub{}, &model.StoreMap{})
// db.DropTableIfExists(&model.SkuCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
db.AutoMigrate(&model.Place{})
db.AutoMigrate(&model.Store{}, &model.StoreSub{}, &model.StoreMap{})
db.AutoMigrate(&model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
db.Set("gorm:table_options", "CHARSET=utf8mb4").AutoMigrate(&model.SkuCategory{})
}