- globals init

This commit is contained in:
gazebo
2019-03-21 10:19:16 +08:00
parent 75406c8d49
commit 9d5db6cfc9
4 changed files with 2 additions and 17 deletions

View File

@@ -145,7 +145,7 @@ func init() {
sch := &DefScheduler{}
basesch.FixedBaseScheduler = &sch.BaseScheduler
FixedScheduler = sch
sch.IsReallyCallPlatformAPI = true //globals.ReallyCallPlatformAPI
sch.IsReallyCallPlatformAPI = globals.ReallyCallPlatformAPI
scheduler.CurrentScheduler = sch
sch.defWorkflowConfig = []map[int]*StatusActionConfig{
map[int]*StatusActionConfig{

View File

@@ -96,19 +96,5 @@ func Init() {
func initElm() {
token := beego.AppConfig.DefaultString("elmToken", "")
// if token == "" {
// db := orm.NewOrm()
// var tokenInfo []orm.Params
// num, err := db.Raw("SELECT * FROM config WHERE thirdparty='eleme'").Values(&tokenInfo)
// if err != nil || num != 1 {
// panic(err.Error())
// }
// var tokenInfo2 map[string]interface{}
// if err := utils.UnmarshalUseNumber([]byte(tokenInfo[0]["token"].(string)), &tokenInfo2); err != nil {
// panic(err.Error())
// }
// token = tokenInfo2["accessToken"].(string)
// }
ElmAPI = elmapi.New(token, beego.AppConfig.String("elmAppKey"), beego.AppConfig.String("elmSecret"), beego.AppConfig.DefaultBool("elmIsProd", false))
}

View File

@@ -43,7 +43,7 @@ func init() {
logger, _ := zap.NewDevelopment()
SugarLogger = logger.Sugar()
baseapi.Init(SugarLogger)
Init()
Init() // 这里必须要自动调用,不然直接引用全局变量的模块得不到正确的配置值
}
func Init() {

View File

@@ -32,7 +32,6 @@ var (
)
func Init() {
// globals.Init()
beegodb.Init()
api.Init()
defsch.Init()