diff --git a/server/backtask/common/types.go b/server/backtask/common/types.go index 03728739..5b6dd0d7 100644 --- a/server/backtask/common/types.go +++ b/server/backtask/common/types.go @@ -8,3 +8,6 @@ type TaskMgr interface { LockOpenGodBullion() UnLockOpenGodBullion() } + +type ServiceMgr interface { +} diff --git a/server/backtask/constant/constant.go b/server/backtask/constant/constant.go index 2c362188..675fc9f7 100644 --- a/server/backtask/constant/constant.go +++ b/server/backtask/constant/constant.go @@ -14,6 +14,7 @@ const ( const ( APP_MODULE_IDX = iota TASK_MGR_MODULE_IDX + SERVICE_MGR_MODULE_IDX MAX_MODULE_IDX ) diff --git a/server/backtask/global/global.go b/server/backtask/global/global.go index 4b56157f..535e7416 100644 --- a/server/backtask/global/global.go +++ b/server/backtask/global/global.go @@ -10,10 +10,12 @@ import ( var modules [constant.MAX_MODULE_IDX]q5.Module var initOrders = []int32{ constant.TASK_MGR_MODULE_IDX, + constant.SERVICE_MGR_MODULE_IDX, } var app common.App var taskMgr common.TaskMgr +var serviceMgr common.ServiceMgr func GetApp() common.App { return app @@ -34,6 +36,10 @@ func RegModule(idx int32, m q5.Module) { { taskMgr = m.(common.TaskMgr) } + case constant.SERVICE_MGR_MODULE_IDX: + { + serviceMgr = m.(common.ServiceMgr) + } default: { panic("unknow module") diff --git a/server/backtask/service/export.go b/server/backtask/service/export.go index de6030a5..b3538978 100644 --- a/server/backtask/service/export.go +++ b/server/backtask/service/export.go @@ -1,7 +1,13 @@ package service +import ( + "main/constant" + "main/global" +) + var BcCurrency = new(bcCurrency) +var _serviceMgr = new(serviceMgr) func init() { - BcCurrency.init() + global.RegModule(constant.SERVICE_MGR_MODULE_IDX, _serviceMgr) } diff --git a/server/backtask/service/servicemgr.go b/server/backtask/service/servicemgr.go new file mode 100644 index 00000000..b3af2920 --- /dev/null +++ b/server/backtask/service/servicemgr.go @@ -0,0 +1,11 @@ +package service + +type serviceMgr struct { +} + +func (this *serviceMgr) Init() { + BcCurrency.init() +} + +func (this *serviceMgr) UnInit() { +} diff --git a/server/backtask/task/repair_order.go b/server/backtask/task/repair_order.go index 1d311d19..94a48d61 100644 --- a/server/backtask/task/repair_order.go +++ b/server/backtask/task/repair_order.go @@ -68,7 +68,7 @@ func (this* repairOrder) repairPrice(ds *f5.DataSet) bool { srcPriceItemType = p.Data.Buy[0].ItemType } srcPriceExchangeRate, price := service.BcCurrency.ExchangeUSD( - srcPriceAmount, srcPriceContractAddress, srcPriceItemType) + srcPriceAmount, srcPriceItemType, srcPriceContractAddress) updateFields := [][]string{ {"src_price_amount", srcPriceAmount}, {"src_price_contract_address", srcPriceContractAddress}, diff --git a/server/backtask/task/webhook.go b/server/backtask/task/webhook.go index 46bd1f06..5e7a0e8f 100644 --- a/server/backtask/task/webhook.go +++ b/server/backtask/task/webhook.go @@ -140,7 +140,7 @@ func (this* webHook) orderUpdatedCb(ds *f5.DataSet) bool { srcPriceContractAddress := p.Data.Buy[0].ContractAddress srcPriceItemType := p.Data.Buy[0].ItemType srcPriceExchangeRate, price := service.BcCurrency.ExchangeUSD( - srcPriceAmount, srcPriceContractAddress, srcPriceItemType) + srcPriceAmount, srcPriceItemType, srcPriceContractAddress) commonFields := [][]string{ {"order_id", p.Data.Id}, {"chain", p.Chain},