liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-17 17:49:12 +08:00
parent 5806a9fad8
commit b0dfd93d6c
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/app/wx_login.go
View File

@@ -1,9 +1,7 @@
package app package app
import ( import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-print/controllers" "git.rosy.net.cn/jx-print/controllers"
"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/model/app_model" "git.rosy.net.cn/jx-print/model/app_model"
"git.rosy.net.cn/jx-print/services/print_server/app_server" "git.rosy.net.cn/jx-print/services/print_server/app_server"

8
controllers/app/wx_print.go
View File

@@ -237,7 +237,7 @@ func (p *Print) UpdatePrinter(c *gin.Context) {
// TestPrint 测试打印 POST // TestPrint 测试打印 POST
// @Title 测试打印 // @Title 测试打印
// @Description 测试打印 // @Description 测试打印
// @Param token cookie string true "用户登录token" // @Param token cookie string false "用户登录token"
// @Param data body app_model.TestPrintReq true "请求参数" // @Param data body app_model.TestPrintReq true "请求参数"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
@@ -258,9 +258,9 @@ func (p *Print) TestPrint(c *gin.Context) {
return return
} }
if tokenInfo = controllers.CheckToken(c); tokenInfo == nil { //if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
return // return
} //}
controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) { controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
retVal, err = printServer.TestPrint(param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content) retVal, err = printServer.TestPrint(param.AppID, tokenInfo, param.PrintNo, param.OrderNo, param.Content)
return retVal, "", err return retVal, "", err

1
controllers/app_controller.go
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/services/print_server" "git.rosy.net.cn/jx-print/services/print_server"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"

8
services/print_server/app_server/wx_print.go
View File

@@ -205,10 +205,10 @@ func TestPrint(appID int, tokenInfo *model.TokenInfo, printNo string, orderNo in
// return "", fmt.Errorf("未查询到此应用！app_id:%d", appID) // return "", fmt.Errorf("未查询到此应用！app_id:%d", appID)
//} //}
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0) //printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { //if len(printers) == 0 {
return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) // return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)
} //}
printMsg := &model.PrintMsg{ printMsg := &model.PrintMsg{
CreatedAt: &now, CreatedAt: &now,