This commit is contained in:
邹宗楠
2022-07-29 15:13:37 +08:00
parent 1959df5c7d
commit 3ede3efd61

View File

@@ -1,7 +1,6 @@
package controllers package controllers
import ( import (
"git.rosy.net.cn/jx-print/globals"
"git.rosy.net.cn/jx-print/model" "git.rosy.net.cn/jx-print/model"
"git.rosy.net.cn/jx-print/putils" "git.rosy.net.cn/jx-print/putils"
"git.rosy.net.cn/jx-print/services/print_server" "git.rosy.net.cn/jx-print/services/print_server"
@@ -63,8 +62,6 @@ func GetPrinters(c *gin.Context) {
} }
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) { if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.GetPrinters(c, param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize) retVal, err = print_server.GetPrinters(c, param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize)
globals.SugarLogger.Debug("printer err ==========", err)
globals.SugarLogger.Debug("printer data ==========", retVal)
return retVal, "", err return retVal, "", err
}) { }) {
return return
@@ -148,9 +145,9 @@ func TestPrint(c *gin.Context) {
BuildErrJson(c, err) BuildErrJson(c, err)
return return
} }
//if tokenInfo = CheckToken(c); tokenInfo == nil { if tokenInfo = CheckToken(c); tokenInfo == nil {
// return return
//} }
if !CallFunc(c, func() (retVal interface{}, errCode string, err error) { if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = print_server.TestPrint(c, param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content) retVal, err = print_server.TestPrint(c, param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content)
return retVal, "", err return retVal, "", err