- big refactor.

globals/api/api.go

@@ -1,4 +1,4 @@
-package globals2
+package api
 
 import (
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
@@ -7,25 +7,13 @@ 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/baseapi/utils/routinepool"
-	elmmodels "git.rosy.net.cn/jx-callback/business/elm/models"
-	"git.rosy.net.cn/jx-callback/business/freshfood"
-	jdmodels "git.rosy.net.cn/jx-callback/business/jd/models"
-	"git.rosy.net.cn/jx-callback/business/models"
 	"github.com/astaxie/beego"
 
 	"github.com/astaxie/beego/orm"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 )
 
-const (
-	ErrStrAccessDB = "Error when access DB"
-)
-
 var (
-	RoutinePool  *routinepool.Pool
-	FreshFoodAPI *freshfood.FreshFoodAPI
-
 	Jdapi     *jdapi.API
 	ElmAPI    *elmapi.API
 	MtpsAPI   *mtpsapi.API
@@ -34,10 +22,6 @@ var (
 )
 
 func init() {
-	initDB()
-	routinePoolSize := beego.AppConfig.DefaultInt("routinePoolSize", 0)
-	RoutinePool = routinepool.New(routinePoolSize, routinePoolSize)
-	FreshFoodAPI = freshfood.NewFreshFoodAPI(beego.AppConfig.String("freshFoodServerURL"))
 	Jdapi = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret"))
 	initElm()
 	MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret"))
@@ -63,17 +47,3 @@ func initElm() {
 	}
 	ElmAPI = elmapi.New(token, beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false))
 }
-
-func initDB() {
-	// set default database
-	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
-
-	// register model
-	orm.RegisterModel(new(jdmodels.Jdorder))
-	orm.RegisterModel(new(elmmodels.ELMOrder))
-	orm.RegisterModel(new(models.Config))
-	orm.RegisterModel(new(models.BlackClient))
-
-	// create table
-	orm.RunSyncdb("default", false, true)
-}

globals/globals.go

@@ -2,12 +2,18 @@ package globals
 
 import (
 	"git.rosy.net.cn/baseapi"
+	"git.rosy.net.cn/jx-callback/legacy/models"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/logs"
+	"github.com/astaxie/beego/orm"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )
 
+const (
+	ErrStrAccessDB = "Error when access DB"
+)
+
 var (
 	SugarLogger *zap.SugaredLogger
 )
@@ -19,4 +25,13 @@ func init() {
 	logger, _ := zap.NewDevelopment()
 	SugarLogger = logger.Sugar()
 	baseapi.Init(SugarLogger)
+	initDB()
+}
+
+func initDB() {
+	// set default database
+	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
+	models.RegisterModels()
+	// create table
+	orm.RunSyncdb("default", false, true)
 }