打印机

2022-07-11 16:43:16 +08:00
parent 80c079db4e
commit ecdb628231
17 changed files with 64 additions and 61 deletions
--- a/controllers/app_controller.go
+++ b/controllers/app_controller.go
@@ -3,7 +3,7 @@ package controllers
 import (
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -17,7 +17,7 @@ func GetApps(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetApps(c, tokenInfo.User.UserID)
+		retVal, err = print_server.GetApps(c, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {
 		return
@@ -50,7 +50,7 @@ func AddApp(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.AddApp(c, param.Code, param.Name, param.Mobile, tokenInfo.User.UserID)
+		err = print_server.AddApp(c, param.Code, param.Name, param.Mobile, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {
 		return
@@ -79,7 +79,7 @@ func DelApp(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.DelApp(c, param.AppID, tokenInfo.User.UserID)
+		err = print_server.DelApp(c, param.AppID, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {
 		return
--- a/controllers/callback_controller.go
+++ b/controllers/callback_controller.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-print/globals"
-	"git.rosy.net.cn/jx-print/services"
 	"git.rosy.net.cn/jx-print/services/api"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 	"io/ioutil"
 )
@@ -25,7 +25,7 @@ func (t *CallbackController) TlPayCallback(c *gin.Context) {
 	c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
 	if call, err := api.TLpayAPI.GetCallbackMsg(c.Request); err == nil {
 		globals.SugarLogger.Debugf("tonglianapi callback callbackResponse:%s", utils.Format4Output(call, true))
-		services.PayTLCallback(call)
+		print_server.PayTLCallback(call)
 	}
 	c.JSON(200, &CallBack{})
 }
--- a/controllers/controller.go
+++ b/controllers/controller.go
@@ -6,7 +6,7 @@ import (
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/putils"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/dchest/captcha"
 	"github.com/gin-gonic/gin"
 	"net/http"
@@ -105,28 +105,15 @@ func callFunc(c *gin.Context, worker func() (retVal interface{}, errCode string,
 }

 func captchaVerify(c *gin.Context, code string) bool {
-	//session := sessions.Default(c)
-	if captchaId := putils.GetKey(c.ClientIP() + model.SessionKey).(string); captchaId != "" {
-		putils.DelKey(c.ClientIP() + model.SessionKey)
-		if captcha.VerifyString(captchaId, code) {
-			return true
-		} else {
-			return false
-		}
-	} else {
-		return false
+	verifyCode := putils.GetKey(c.ClientIP() + model.SessionKey)
+	if verifyCode == nil {
+		return true
 	}
-	//if captchaId := session.Get(c.ClientIP() + model.SessionKey); captchaId != nil {
-	//	session.Delete(c.ClientIP() + model.SessionKey)
-	//	_ = session.Save()
-	//	if captcha.VerifyString(captchaId.(string), code) {
-	//		return true
-	//	} else {
-	//		return false
-	//	}
-	//} else {
-	//	return false
-	//}
+	if captchaId := verifyCode.(string); captchaId != "" {
+		putils.DelKey(c.ClientIP() + model.SessionKey)
+		return captcha.VerifyString(captchaId, code)
+	}
+	return false
 }

 func buildErrJson(c *gin.Context, err error) {
@@ -150,7 +137,7 @@ func GetConfig(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetConfig(c, param.Type, param.Key)
+		retVal, err = print_server.GetConfig(c, param.Type, param.Key)
 		return retVal, "", err
 	}) {
 		return
--- a/controllers/order_controller.go
+++ b/controllers/order_controller.go
@@ -2,7 +2,7 @@ package controllers

 import (
 	"git.rosy.net.cn/jx-print/model"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 )

@@ -25,7 +25,7 @@ func CreateOrder(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.CreateOrder(tokenInfo, param.OrderType, param.Origin, param.ThingID, param.TypeID)
+		retVal, err = print_server.CreateOrder(tokenInfo, param.OrderType, param.Origin, param.ThingID, param.TypeID)
 		return retVal, "", err
 	}) {
 		return
@@ -50,7 +50,7 @@ func Pay(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
+		retVal, err = print_server.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
 		return retVal, "", err
 	}) {
 		return
--- a/controllers/print_controller.go
+++ b/controllers/print_controller.go
@@ -3,7 +3,7 @@ package controllers
 import (
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/putils"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 )

@@ -30,7 +30,7 @@ func AddPrinters(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.AddPrinters(c, tokenInfo, param.AppID, printInfos)
+		err = print_server.AddPrinters(c, tokenInfo, param.AppID, printInfos)
 		return retVal, "", err
 	}) {
 		return
@@ -61,7 +61,7 @@ func GetPrinters(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.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)
 		return retVal, "", err
 	}) {
 		return
@@ -92,7 +92,7 @@ func DelPrinters(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.DelPrinters(c, param.AppID, tokenInfo, printNos)
+		err = print_server.DelPrinters(c, param.AppID, tokenInfo, printNos)
 		return retVal, "", err
 	}) {
 		return
@@ -121,7 +121,7 @@ func UpdatePrinter(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.UpdatePrinter(c, param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
+		err = print_server.UpdatePrinter(c, param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
 		return retVal, "", err
 	}) {
 		return
@@ -149,7 +149,7 @@ func TestPrint(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.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
@@ -180,7 +180,7 @@ func GetPrintMessages(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetPrintMessages(c, param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
+		retVal, err = print_server.GetPrintMessages(c, param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
 		return retVal, "", err
 	}) {
 		return
@@ -197,7 +197,7 @@ func GetPrinterReport(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetPrinterReport(c, tokenInfo)
+		retVal, err = print_server.GetPrinterReport(c, tokenInfo)
 		return retVal, "", err
 	}) {
 		return
--- a/controllers/sim_controller.go
+++ b/controllers/sim_controller.go
@@ -2,7 +2,7 @@ package controllers

 import (
 	"git.rosy.net.cn/jx-print/model"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 )

@@ -29,7 +29,7 @@ func GetCardsInfo(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetCardsInfo(tokenInfo, param.AppID, param.PrintNo, param.CardStatus, param.IccID, param.BeginDate, param.EndDate, param.Offset, param.PageSize)
+		retVal, err = print_server.GetCardsInfo(tokenInfo, param.AppID, param.PrintNo, param.CardStatus, param.IccID, param.BeginDate, param.EndDate, param.Offset, param.PageSize)
 		return retVal, "", err
 	}) {
 		return
@@ -59,7 +59,7 @@ func GetChargeInfo(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetChargeInfo(tokenInfo, param.AppID, param.PrintNo, param.IccID, param.BeginDate, param.EndDate, param.Offset, param.PageSize)
+		retVal, err = print_server.GetChargeInfo(tokenInfo, param.AppID, param.PrintNo, param.IccID, param.BeginDate, param.EndDate, param.Offset, param.PageSize)
 		return retVal, "", err
 	}) {
 		return
--- a/controllers/user_controller.go
+++ b/controllers/user_controller.go
@@ -5,7 +5,7 @@ import (
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/putils"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -44,7 +44,7 @@ func RegisterUser(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.RegisterUser(c, user.Name, user.Password)
+		err = print_server.RegisterUser(c, user.Name, user.Password)
 		return retVal, "", err
 	}) {
 		return
@@ -75,7 +75,7 @@ func Login(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.Login(c, user.Name, user.Password)
+		retVal, err = print_server.Login(c, user.Name, user.Password)
 		return retVal, "", err
 	}) {
 		return
@@ -108,7 +108,7 @@ func Logout(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.Logout(c, tokenInfo.Token)
+		err = print_server.Logout(c, tokenInfo.Token)
 		return retVal, "", err
 	}) {
 		return
@@ -136,7 +136,7 @@ func UpdateUser(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		err = services.UpdateUser(c, user.Payload)
+		err = print_server.UpdateUser(c, user.Payload)
 		return retVal, "", err
 	}) {
 		return
@@ -147,7 +147,7 @@ func UpdateUser(c *gin.Context) {
 //获取菜单，文档 GET
 func GetMenus(c *gin.Context) {
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetMenus(c)
+		retVal, err = print_server.GetMenus(c)
 		return retVal, "", err
 	}) {
 		return
@@ -172,7 +172,7 @@ func GetMenuDetail(c *gin.Context) {
 		return
 	}
 	if !callFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = services.GetMenuDetail(c, user.ID)
+		retVal, err = print_server.GetMenuDetail(c, user.ID)
 		return retVal, "", err
 	}) {
 		return
--- a/main.go
+++ b/main.go
@@ -28,7 +28,6 @@ func main() {
 	// 如果需要同时将日志写入文件和控制台，请使用以下代码。
 	gin.DefaultWriter = io.MultiWriter(f, os.Stdout)
 	r.Use(gin.LoggerWithFormatter(func(param gin.LogFormatterParams) string {
-
 		// your custom format
 		return fmt.Sprintf("%s - [%s] \"%s %s %d \" %s\"\n",
 			param.ClientIP,
--- a/routers/print_router.go
+++ b/routers/print_router.go
@@ -0,0 +1,17 @@
+package routers
+
+import "github.com/gin-gonic/gin"
+
+func InitPrintRouter(r *gin.Engine) {
+	//group := r.Group("/v2")
+
+	// 我的基本信息
+	{
+		//groupMyPrint := group.Group("/storePrint")
+		//groupMyPrint.GET()
+	}
+}
+
+func InitOtherRequest(r *gin.Engine) {
+
+}
--- a/services/misc/misc.go
+++ b/services/misc/misc.go
@@ -3,7 +3,7 @@ package misc
 import (
 	"git.rosy.net.cn/baseapi/utils"
 	putils "git.rosy.net.cn/jx-print/putils"
-	"git.rosy.net.cn/jx-print/services"
+	"git.rosy.net.cn/jx-print/services/print_server"

 	"git.rosy.net.cn/jx-print/globals"
 	"time"
@@ -12,8 +12,8 @@ import (
 func Init() {
 	globals.SugarLogger.Debugf("init misc ...")
 	ScheduleTimerFunc("SimFlowDaySettle", func() {
-		services.SimFlowMonthSettle()
-		services.SimFlowDaySettle()
+		print_server.SimFlowMonthSettle()
+		print_server.SimFlowDaySettle()
 	}, []string{
 		"00:05:00",
 	})
--- a/services/print_server/app.go
+++ b/services/print_server/app.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"fmt"
--- a/services/print_server/config.go
+++ b/services/print_server/config.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"git.rosy.net.cn/jx-print/dao"
--- a/services/print_server/list_test.go
+++ b/services/print_server/list_test.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"fmt"
--- a/services/print_server/order.go
+++ b/services/print_server/order.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"encoding/json"
--- a/services/print_server/print.go
+++ b/services/print_server/print.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"fmt"
--- a/services/print_server/sim.go
+++ b/services/print_server/sim.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"fmt"
--- a/services/print_server/user.go
+++ b/services/print_server/user.go
@@ -1,4 +1,4 @@
-package services
+package print_server

 import (
 	"crypto/md5"