- all db orm use beego orm, don't use gorm anymore.

globals/beegodb/beegodb.go

@@ -24,6 +24,13 @@ func Init() {
 	orm.RegisterModel(new(legacymodel.Jxorder2))
 	orm.RegisterModel(new(legacymodel.Jxordersku2))
 
+	orm.RegisterModel(&model.Place{})
+	orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{})
+	orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
+	// db.Set("gorm:table_options", "CHARSET=utf8mb4").AutoMigrate(&model.SkuCategory{})
+	orm.RegisterModel(&model.SkuCategory{})
+	orm.RegisterModel(&model.WeiXins{}, &model.JxBackendUser{})
+	orm.RegisterModel(&model.DurableTask{}, &model.DurableTaskItem{})
 	// create table
 	orm.RunSyncdb("default", false, true)
 }

globals/gormdb/gormdb.go

@@ -1,48 +0,0 @@
-package gormdb
-
-import (
-	"fmt"
-
-	"git.rosy.net.cn/jx-callback/business/model"
-	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
-)
-
-var (
-	dbStr       string
-	singletonDB *gorm.DB
-)
-
-func Init() {
-	dbStr = beego.AppConfig.String("dbConnectStr")
-	AutoMigrate()
-}
-
-// todo gorm要求用单一的db？如果每次重新调用Open，会导致too many connection错误
-func GetDB() *gorm.DB {
-	if singletonDB == nil {
-		db, err := gorm.Open("mysql", dbStr)
-		if err == nil {
-			singletonDB = db
-			return db
-		}
-		panic(fmt.Sprintf("AutoMigrate failed with error:%v", err))
-	}
-	return singletonDB
-}
-
-func AutoMigrate() {
-	db := GetDB()
-	db.SingularTable(true)
-
-	// db.DropTableIfExists(&model.Place{})
-	// db.DropTableIfExists(&model.Store{}, &model.StoreSub{}, &model.StoreMap{})
-	// db.DropTableIfExists(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{}, &model.SkuCategory{})
-
-	db.AutoMigrate(&model.Place{})
-	db.AutoMigrate(&model.Store{}, &model.StoreSub{}, &model.StoreMap{})
-	db.AutoMigrate(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
-	db.Set("gorm:table_options", "CHARSET=utf8mb4").AutoMigrate(&model.SkuCategory{})
-	db.AutoMigrate(&model.WeiXins{}, &model.JxBackendUser{})
-	// db.AutoMigrate(&model.DurableTask{}, &model.DurableTaskItem{})
-}