From 4817d5c1c24582317900fe5cd403c8b66248919f Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 11 Jul 2019 11:20:05 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=B0=86BindPrinterResult.ExpiresIn?= =?UTF-8?q?=E6=94=B9=E4=B8=BAExpiresAt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/netprinter/netprinter.go | 2 +- business/partner/partner_printer.go | 8 ++++---- business/partner/printer/yilianyun/yilianyun.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/business/jxutils/netprinter/netprinter.go b/business/jxutils/netprinter/netprinter.go index 04f033b7d..2832ba4df 100644 --- a/business/jxutils/netprinter/netprinter.go +++ b/business/jxutils/netprinter/netprinter.go @@ -139,7 +139,7 @@ func RebindAllPrinters(ctx *jxcontext.Context, isForce, isAsync bool) (hint stri for _, v := range storeList { var bindResult partner.BindPrinterResult if err = utils.UnmarshalUseNumber([]byte(v.PrinterBindInfo), &bindResult); err == nil { - if isForce || now.Sub(utils.Timestamp2Time(bindResult.ExpiresIn)) > -24*time.Hour { + if isForce || now.Sub(utils.Timestamp2Time(bindResult.ExpiresAt)) > -48*time.Hour { needRebindList = append(needRebindList, v) bindResultMap[v.ID] = &bindResult } diff --git a/business/partner/partner_printer.go b/business/partner/partner_printer.go index 47725d1fe..09bccaa0a 100644 --- a/business/partner/partner_printer.go +++ b/business/partner/partner_printer.go @@ -8,10 +8,10 @@ import ( ) type BindPrinterResult struct { - PrinterSN string - PrinterKey string - PrinterKey2 string - ExpiresIn int64 `json:"expires_in"` + PrinterSN string `json:"printerSN"` + PrinterKey string `json:"printerKey"` + PrinterKey2 string `json:"printerKey2"` + ExpiresAt int64 `json:"expiresAt"` } type IPrinterHandler interface { diff --git a/business/partner/printer/yilianyun/yilianyun.go b/business/partner/printer/yilianyun/yilianyun.go index 4f28dfefe..0209db3f0 100644 --- a/business/partner/printer/yilianyun/yilianyun.go +++ b/business/partner/printer/yilianyun/yilianyun.go @@ -172,7 +172,7 @@ func yilianyunToken2BindResult(tokenInfo *yilianyunapi.TokenInfo) (bindResult *p PrinterSN: tokenInfo.MachineCode, PrinterKey: tokenInfo.AccessToken, PrinterKey2: tokenInfo.RefreshToken, - ExpiresIn: tokenInfo.ExpiresIn, + ExpiresAt: time.Now().Add(time.Duration(tokenInfo.ExpiresIn)).Unix(), } }