From 594ed19bf38d97fded54eb933182b21892ce3a2f Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 19 Jul 2019 17:06:37 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E5=87=A0=E4=B8=AA?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E7=9A=84=E6=B8=85=E9=99=A4=E9=98=9F?= =?UTF-8?q?=E5=88=97=E4=B8=8E=E6=98=93=E8=81=94=E4=BA=91=E7=9A=84=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E6=96=87=E6=9C=AC=E5=A3=B0=E9=9F=B3=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platformapi/yilianyunapi/yilianyunapi.go | 8 ++++++-- platformapi/yilianyunapi/yilianyunapi_test.go | 13 +++++++++---- platformapi/zhongwuapi/zhongwuapi.go | 11 +++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/platformapi/yilianyunapi/yilianyunapi.go b/platformapi/yilianyunapi/yilianyunapi.go index b8179f81..5019fd25 100644 --- a/platformapi/yilianyunapi/yilianyunapi.go +++ b/platformapi/yilianyunapi/yilianyunapi.go @@ -247,9 +247,13 @@ func IsStrToken(possibleToken string) bool { return len(possibleToken) >= len("d65578a6fa414d738e0c44f85ac4b950") } -func (a *API) CancelAll(machineCode string) (err error) { +func (a *API) CancelAll(machineCode, token string) (err error) { _, err = a.AccessAPI("printer/cancelall", map[string]interface{}{ "machine_code": machineCode, - }, "") + }, token) return err } + +func (a *API) PlayText(machineCode, orderID, text, token string) (err error) { + return a.printMsg(machineCode, orderID, fmt.Sprintf("", strings.Replace(text, ",", ".", -1)), token) +} diff --git a/platformapi/yilianyunapi/yilianyunapi_test.go b/platformapi/yilianyunapi/yilianyunapi_test.go index e2f1007f..e323110d 100644 --- a/platformapi/yilianyunapi/yilianyunapi_test.go +++ b/platformapi/yilianyunapi/yilianyunapi_test.go @@ -21,7 +21,7 @@ func init() { // 自有应用 api = New("1039586024", "4885d07c2997b661102e4b6099c0bf3b") - api.SetToken("b43201fe472c4672880890f73d97aab0") + api.SetToken("7884617f9eeb4c28933569f94a95b5c3") // 开放应用 // api = New("1098307169", "d5eedb40c99e6691b1ca2ba82a363d6a") @@ -37,11 +37,11 @@ func handleError(t *testing.T, err error) { func TestRetrieveToken(t *testing.T) { token, err := api.RetrieveToken() handleError(t, err) - baseapi.SugarLogger.Debug(utils.Format4Output(token, false)) + baseapi.SugarLogger.Debug(utils.Format4Output(token, true)) } func TestAddPrinter(t *testing.T) { - err := api.AddPrinter("4004611945", "57kywtiiyqce", "测试打印机1") + err := api.AddPrinter("4004617180", "381870509796", "测试打印机1") handleError(t, err) } @@ -81,6 +81,11 @@ func TestGetPrinterToken(t *testing.T) { } func TestCancelAll(t *testing.T) { - err := api.CancelAll("4004617683") + err := api.CancelAll("4004617242", "03e4ec4d65264bca850c8ad87dd8fc21") + handleError(t, err) +} + +func TestPlayText(t *testing.T) { + err := api.PlayText("4004617180", utils.GetUUID(), "大家好", "") handleError(t, err) } diff --git a/platformapi/zhongwuapi/zhongwuapi.go b/platformapi/zhongwuapi/zhongwuapi.go index 685fc83f..3298bdfc 100644 --- a/platformapi/zhongwuapi/zhongwuapi.go +++ b/platformapi/zhongwuapi/zhongwuapi.go @@ -144,3 +144,14 @@ func (a *API) GetPrintStatus(deviceID, deviceSecret, dataID string) (isPrinted b } return false, err } + +func (a *API) EmptyPrintQueue(deviceID, deviceSecret string) (status int, err error) { + retData, err := a.AccessAPI("emptyprintqueue", map[string]interface{}{ + "deviceid": deviceID, + "devicesecret": deviceSecret, + }, true) + if err == nil { + return int(utils.Str2Int64(utils.Interface2String(retData["status"]))), nil + } + return 0, err +}