1

controllers/app/print_temp.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
+	"git.rosy.net.cn/jx-print/controllers"
 	"git.rosy.net.cn/jx-print/model"
 	tempModel "git.rosy.net.cn/jx-print/model/app_model"
 	printServer "git.rosy.net.cn/jx-print/services/print_server/app_server"
@@ -24,15 +24,15 @@ func (p *Print) AddOrUpdateTemp(c *gin.Context) {
 		tempServer = printServer.TempServer{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
 	param.UserId = tokenInfo.User.UserID
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = tempServer.AddOrUpdateTemp(&param)
 		return retVal, "", err
 	})
@@ -54,13 +54,13 @@ func (p *Print) DeleteTemp(c *gin.Context) {
 		tempServer = printServer.TempServer{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = tempServer.DeleteTemp(param.ID, tokenInfo.User.UserID)
 		return "", "", err
 	})
@@ -82,13 +82,13 @@ func (p *Print) GetUserTempList(c *gin.Context) {
 		tempServer = printServer.TempServer{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = tempServer.QueryTempList(tokenInfo.User.UserID)
 		return retVal, "", err
 	})
@@ -110,10 +110,10 @@ func (p *Print) SwitchTemp(c *gin.Context) {
 		tempServer = printServer.TempServer{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = tempServer.SwitchTemp(tokenInfo.User.UserID, param.ID)
 		return "", "", err
 	})

controllers/app/wx_login.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
+	"git.rosy.net.cn/jx-print/controllers"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/model/app_model"
 	"git.rosy.net.cn/jx-print/services/print_server/app_server"
@@ -36,13 +36,13 @@ func (a *Auth2Controller) Login(c *gin.Context) {
 		return
 	}
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		user, err := service.WxLogin(c, params.Code, params.Phone)
 		if err != nil {
 			return nil, "", err
 		}
 		// 获取token
-		token, err := controller.SetToken(user)
+		token, err := controllers.SetToken(user)
 		if err != nil {
 			return nil, "", err
 		}
@@ -74,7 +74,7 @@ func (a *Auth2Controller) GetUserPhoneByWeChat(c *gin.Context) {
 		return
 	}
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		phone, err := service.GetUserPhoneNum(params)
 		if err != nil {
 			return nil, "", err

controllers/app/wx_print.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
+	"git.rosy.net.cn/jx-print/controllers"
 	"git.rosy.net.cn/jx-print/model"
 	print "git.rosy.net.cn/jx-print/model/app_model"
 	"git.rosy.net.cn/jx-print/putils"
@@ -30,18 +30,18 @@ func (p *Print) AddPrinters(c *gin.Context) {
 	)
 
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
 	if err = putils.UnmarshalUseNumber([]byte(param.Prints), &printInfo); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = printServer.AddPrinters(tokenInfo, param.AppID, printInfo)
 		return retVal, "", err
 	})
@@ -63,14 +63,14 @@ func (p *Print) GetPrinters(c *gin.Context) {
 		param     = print.QueryPrintReq{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = printServer.GetPrinters(param.AppID, param.PrintNo, param.Name, param.Status, param.IsOnline, param.Offset, param.PageSize, tokenInfo.User.UserID)
 		return retVal, "", err
 	})
@@ -92,17 +92,17 @@ func (p *Print) DelPrinters(c *gin.Context) {
 		printNos  []string
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
 	if err = putils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = printServer.DelPrinters(param.AppID, tokenInfo, printNos)
 		return retVal, "", err
 	})
@@ -123,13 +123,13 @@ func (p *Print) UpdatePrinter(c *gin.Context) {
 		param     = print.UpdatePrintReq{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = printServer.UpdatePrinter(param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
 		return retVal, "", err
 	}) {
@@ -153,13 +153,13 @@ func (p *Print) TestPrint(c *gin.Context) {
 		param     = print.TestPrintReq{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
-	controller.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)
 		return retVal, "", err
 	})
@@ -180,14 +180,14 @@ func (p *Print) GetPrintMessages(c *gin.Context) {
 		param     = print.GetPrintMsg{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		controllers.BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
 
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = printServer.GetPrintMessages(param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
 		return retVal, "", err
 	})
@@ -198,10 +198,10 @@ func (p *Print) StatPrinterReport(c *gin.Context) {
 	var (
 		tokenInfo *model.TokenInfo
 	)
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = controllers.CheckToken(c); tokenInfo == nil {
 		return
 	}
-	controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	controllers.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = printServer.GetPrinterReport(tokenInfo)
 		return retVal, "", err
 	})

controllers/app_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/services/print_server"
@@ -14,10 +13,10 @@ func GetApps(c *gin.Context) {
 	var (
 		tokenInfo *model.TokenInfo
 	)
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetApps(c, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {
@@ -47,10 +46,10 @@ func AddApp(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.AddApp(c, param.Code, param.Name, param.Mobile, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {
@@ -76,10 +75,10 @@ func DelApp(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.DelApp(c, param.AppID, tokenInfo.User.UserID)
 		return retVal, "", err
 	}) {

controllers/controller.go

@@ -1,4 +1,4 @@
-package controller
+package controllers
 
 import (
 	"encoding/json"

controllers/order_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
@@ -19,13 +18,13 @@ func CreateOrder(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.CreateOrder(tokenInfo, param.OrderType, param.Origin, param.ThingID, param.TypeID)
 		return retVal, "", err
 	}) {
@@ -44,13 +43,13 @@ func Pay(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.Pay(tokenInfo, param.OrderID, param.PayType, param.VendorPayType)
 		return retVal, "", err
 	}) {

controllers/print_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/putils"
 	"git.rosy.net.cn/jx-print/services/print_server"
@@ -20,17 +19,17 @@ func AddPrinters(c *gin.Context) {
 		printInfos []*model.PrintInfo
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
 	if err = putils.UnmarshalUseNumber([]byte(param.Prints), &printInfos); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.AddPrinters(c, tokenInfo, param.AppID, printInfos)
 		return retVal, "", err
 	}) {
@@ -55,13 +54,13 @@ func GetPrinters(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.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)
 		return retVal, "", err
 	}) {
@@ -82,17 +81,17 @@ func DelPrinters(c *gin.Context) {
 		printNos []string
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
 	if err = putils.UnmarshalUseNumber([]byte(param.PrintNos), &printNos); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.DelPrinters(c, param.AppID, tokenInfo, printNos)
 		return retVal, "", err
 	}) {
@@ -115,13 +114,13 @@ func UpdatePrinter(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.UpdatePrinter(c, param.AppID, tokenInfo, param.PrintNo, param.Name, param.Sound, param.Volume)
 		return retVal, "", err
 	}) {
@@ -138,18 +137,18 @@ func TestPrint(c *gin.Context) {
 		param     = &struct {
 			AppID   int    `json:"app_id" form:"app_id" binding:"required"`
 			PrintNo string `json:"print_no" form:"print_no" binding:"required"` //打印机编号
-			OrderNo int    `json:"order_no" form:"order_no" binding:"required"` //订单序号
+			OrderNo string `json:"order_no" form:"order_no" binding:"required"` //订单序号
 			Content string `json:"content" form:"content"`                      //打印内容
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.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)
 		return retVal, "", err
 	}) {
@@ -174,13 +173,13 @@ func GetPrintMessages(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetPrintMessages(c, param.AppID, tokenInfo, param.PrintNo, param.MsgID, param.BeginAt, param.EndAt, param.Offset, param.PageSize)
 		return retVal, "", err
 	}) {
@@ -194,10 +193,10 @@ func GetPrinterReport(c *gin.Context) {
 	var (
 		tokenInfo *model.TokenInfo
 	)
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetPrinterReport(c, tokenInfo)
 		return retVal, "", err
 	}) {

controllers/sim_controller.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/services/print_server"
 	"github.com/gin-gonic/gin"
@@ -23,13 +22,13 @@ func GetCardsInfo(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		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
 	}) {
@@ -53,13 +52,13 @@ func GetChargeInfo(c *gin.Context) {
 		}{}
 	)
 	if err = c.ShouldBind(&param); err != nil {
-		controller.BuildErrJson(c, err)
+		BuildErrJson(c, err)
 		return
 	}
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetChargeInfo(tokenInfo, param.AppID, param.PrintNo, param.IccID, param.BeginDate, param.EndDate, param.Offset, param.PageSize)
 		return retVal, "", err
 	}) {

controllers/user_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
 	"git.rosy.net.cn/jx-print/putils"
@@ -36,7 +35,7 @@ func RegisterUser(c *gin.Context) {
 		globals.SugarLogger.Debugf("API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !controller.CaptchaVerify(c, user.Code) {
+	if !CaptchaVerify(c, user.Code) {
 		c.JSON(http.StatusOK, &model.CallBack{
 			Code: model.ErrCodeNormal,
 			Desc: "验证码错误！",
@@ -44,7 +43,7 @@ func RegisterUser(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.RegisterUser(c, user.Name, user.Password)
 		return retVal, "", err
 	}) {
@@ -67,7 +66,7 @@ func Login(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !controller.CaptchaVerify(c, user.Code) {
+	if !CaptchaVerify(c, user.Code) {
 		c.JSON(http.StatusOK, &model.CallBack{
 			Code: model.ErrCodeNormal,
 			Desc: "验证码错误！",
@@ -75,9 +74,18 @@ func Login(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
-		retVal, err = print_server.Login(c, user.Name, user.Password)
-		return retVal, "", err
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+		loginResult, err := print_server.Login(c, user.Name, user.Password)
+		if err != nil {
+			return nil, "", err
+		}
+		//创建token
+		token, err := SetToken(&loginResult.User)
+		if err != nil {
+			return nil, "", err
+		}
+		loginResult.Token = token
+		return loginResult, "", err
 	}) {
 		return
 	}
@@ -89,7 +97,7 @@ func GetTokenInfo(c *gin.Context) {
 	var (
 		tokenInfo *model.TokenInfo
 	)
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
 	data, _ := json.Marshal(tokenInfo)
@@ -105,10 +113,10 @@ func Logout(c *gin.Context) {
 	var (
 		tokenInfo *model.TokenInfo
 	)
-	if tokenInfo = controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo = CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.Logout(c, tokenInfo.Token)
 		return retVal, "", err
 	}) {
@@ -133,10 +141,10 @@ func UpdateUser(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if tokenInfo := controller.CheckToken(c); tokenInfo == nil {
+	if tokenInfo := CheckToken(c); tokenInfo == nil {
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		err = print_server.UpdateUser(c, user.Payload)
 		return retVal, "", err
 	}) {
@@ -147,7 +155,7 @@ func UpdateUser(c *gin.Context) {
 
 //获取菜单，文档 GET
 func GetMenus(c *gin.Context) {
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetMenus(c)
 		return retVal, "", err
 	}) {
@@ -172,7 +180,7 @@ func GetMenuDetail(c *gin.Context) {
 		globals.SugarLogger.Debugf("End API :%s error:%v:", c.Request.URL, err)
 		return
 	}
-	if !controller.CallFunc(c, func() (retVal interface{}, errCode string, err error) {
+	if !CallFunc(c, func() (retVal interface{}, errCode string, err error) {
 		retVal, err = print_server.GetMenuDetail(c, user.ID)
 		return retVal, "", err
 	}) {

model/app_model/app_print.go

@@ -31,7 +31,7 @@ type UpdatePrintReq struct {
 type TestPrintReq struct {
 	AppID   int    `json:"app_id" form:"app_id" binding:"required"`
 	PrintNo string `json:"print_no" form:"print_no" binding:"required"` //打印机编号
-	OrderNo int    `json:"order_no" form:"order_no" binding:"required"` //订单序号
+	OrderNo string `json:"order_no" form:"order_no" binding:"required"` //订单序号
 	Content string `json:"content" form:"content"`                      //打印内容
 }
 

routers/v1_router.go

@@ -2,7 +2,6 @@ package routers
 
 import (
 	"git.rosy.net.cn/jx-print/controllers"
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"github.com/gin-gonic/gin"
 )
 
@@ -16,5 +15,5 @@ func InitV1System(v1 *gin.RouterGroup) {
 
 	//config
 	config := v1.Group("/config")
-	config.GET("/getConfig", controller.GetConfig)
+	config.GET("/getConfig", controllers.GetConfig)
 }

routers/v4_app_router.go

@@ -5,24 +5,28 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+var (
+	printers = app.Print{}
+)
+
 // InitV4App 小程序端，需要token
 func InitV4App(v2 *gin.RouterGroup) {
 	appYes := v2.Group("/app_need")
 
 	// 打印机管理
-	appYes.POST("/addPrinters", app.Print{}.AddPrinters)          // 添加打印机
-	appYes.GET("/getPrinters", app.Print{}.GetPrinters)           // 查询打印机
-	appYes.POST("/delPrinters", app.Print{}.DelPrinters)          // 删除打印机
-	appYes.POST("/updatePrinter", app.Print{}.UpdatePrinter)      // 修改打印机
-	appYes.POST("/testPrinter", app.Print{}.TestPrint)            // 测试打印机
-	appYes.GET("/getPrintMessages", app.Print{}.GetPrintMessages) // 打印机消息列表
-	appYes.GET("/statPrinter", app.Print{}.StatPrinterReport)     // 打印消息统计
+	appYes.POST("/addPrinters", printers.AddPrinters)          // 添加打印机
+	appYes.GET("/getPrinters", printers.GetPrinters)           // 查询打印机
+	appYes.POST("/delPrinters", printers.DelPrinters)          // 删除打印机
+	appYes.POST("/updatePrinter", printers.UpdatePrinter)      // 修改打印机
+	appYes.POST("/testPrinter", printers.TestPrint)            // 测试打印机
+	appYes.GET("/getPrintMessages", printers.GetPrintMessages) // 打印机消息列表
+	appYes.GET("/statPrinter", printers.StatPrinterReport)     // 打印消息统计
 
 	// 模板管理
 	temp := v2.Group("/temp")
-	temp.POST("/addOrUpdateTemp", app.Print{}.AddOrUpdateTemp) // 模板添加/修改
-	temp.DELETE("/deleteTemp", app.Print{}.DeleteTemp)         // 删除用户自定义模板
-	temp.GET("/getUserTempList", app.Print{}.GetUserTempList)  // 获取用户模板,模板不足时填充系统模板
-	temp.GET("/switchTemp", app.Print{}.SwitchTemp)            // 切换模板打印模板
+	temp.POST("/addOrUpdateTemp", printers.AddOrUpdateTemp) // 模板添加/修改
+	temp.DELETE("/deleteTemp", printers.DeleteTemp)         // 删除用户自定义模板
+	temp.GET("/getUserTempList", printers.GetUserTempList)  // 获取用户模板,模板不足时填充系统模板
+	temp.GET("/switchTemp", printers.SwitchTemp)            // 切换模板打印模板
 
 }

services/print_server/user.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-print/controllers/controller"
 	"git.rosy.net.cn/jx-print/dao"
 	"git.rosy.net.cn/jx-print/globals"
 	"git.rosy.net.cn/jx-print/model"
@@ -63,10 +62,9 @@ type LoginResult struct {
 
 func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err error) {
 	var (
-		db    = globals.GetDB()
-		now   = time.Now()
-		user  = &model.User{}
-		token string
+		db   = globals.GetDB()
+		now  = time.Now()
+		user = &model.User{}
 	)
 	loginResult = &LoginResult{}
 	if users, _ := dao.GetUsers(db, "", name, "", ""); len(users) == 0 {
@@ -80,9 +78,6 @@ func Login(c *gin.Context, name, password string) (loginResult *LoginResult, err
 		user = users[0]
 	}
 	loginResult.User = *user
-	//创建token
-	token, err = controller.SetToken(user)
-	loginResult.Token = token
 	//更新登录时间和ip
 	user.LastLoginAt = &now
 	user.LastLoginIP = c.ClientIP()