From a73f65caea90e37dd0727f5aef3f6e86e312be7f Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 11 Jul 2019 11:04:21 +0800 Subject: [PATCH] - yilianyun.getApiByToken --- business/partner/printer/yilianyun/yilianyun.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 20785a5f4..4f28dfefe 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -102,7 +102,7 @@ func (c *PrinterHandler) GetVendorID() int { func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, machineCode, possibleToken, msgTitle, msgContent string) (printerStatus *partner.PrinterStatus, err error) { globals.SugarLogger.Debugf("PrintMsg machineCode:%s", machineCode) if machineCode != "" { - if err = api.YilianyunAPI.PrintMsgWithToken(machineCode, msgTitle, msgContent, possibleToken); err == nil { + if err = getApiByToken(possibleToken).PrintMsgWithToken(machineCode, msgTitle, msgContent, possibleToken); err == nil { printerStatus, err = c.GetPrinterStatus(ctx, machineCode, possibleToken) } } else { @@ -114,7 +114,7 @@ func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, machineCode, possibleT } func (c *PrinterHandler) GetPrinterStatus(ctx *jxcontext.Context, machineCode, possibleToken string) (printerStatus *partner.PrinterStatus, err error) { - status, err := api.YilianyunAPI.GetPrintStatusWithToken(machineCode, possibleToken) + status, err := getApiByToken(possibleToken).GetPrintStatusWithToken(machineCode, possibleToken) if err == nil { printerStatus = &partner.PrinterStatus{ PrintResult: partner.PrintResultSuccess, @@ -175,3 +175,10 @@ func yilianyunToken2BindResult(tokenInfo *yilianyunapi.TokenInfo) (bindResult *p ExpiresIn: tokenInfo.ExpiresIn, } } + +func getApiByToken(possibleToken string) *yilianyunapi.API { + if yilianyunapi.IsStrToken(possibleToken) { + return api.YilianyunAPI2 + } + return api.YilianyunAPI +}