diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 6efcf9255..84ff07185 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -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{ diff --git a/globals/api/api.go b/globals/api/api.go index 92124fa77..c622873a2 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -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)) } diff --git a/globals/globals.go b/globals/globals.go index b89cf056a..54771717c 100644 --- a/globals/globals.go +++ b/globals/globals.go @@ -43,7 +43,7 @@ func init() { logger, _ := zap.NewDevelopment() SugarLogger = logger.Sugar() baseapi.Init(SugarLogger) - Init() + Init() // 这里必须要自动调用,不然直接引用全局变量的模块得不到正确的配置值 } func Init() { diff --git a/main.go b/main.go index b3ca10c19..13764fd4f 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,6 @@ var ( ) func Init() { - // globals.Init() beegodb.Init() api.Init() defsch.Init()