From 0c62addc11dc6bd52ad47e46d6e0e35226b957eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 11 Aug 2022 15:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E8=B7=AF?= =?UTF-8?q?=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/app/print_temp.go | 1 - controllers/app/wx_print.go | 6 +++--- routers/router.go | 6 ++---- routers/v3_app_router.go | 4 ---- routers/v4_app_router.go | 4 ++++ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/controllers/app/print_temp.go b/controllers/app/print_temp.go index fda4bc2..138f3bf 100644 --- a/controllers/app/print_temp.go +++ b/controllers/app/print_temp.go @@ -75,7 +75,6 @@ func (p *PrinterTemp) DeleteTemp(c *gin.Context) { // @Title 获取用户模板 // @Description 获取用户模板 // @Param token cookie string true "用户登录token" -// @Param data body app_model.DeleteTemp true "请求参数" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /getUserTempList [get] diff --git a/controllers/app/wx_print.go b/controllers/app/wx_print.go index 4cfa34a..94da8b4 100644 --- a/controllers/app/wx_print.go +++ b/controllers/app/wx_print.go @@ -90,7 +90,7 @@ func (p *Print) GetPrinters(c *gin.Context) { // @Title 删除打印机 // @Description 删除打印机 // @Param token cookie string true "用户登录token" -// @Param data body app_model.QueryPrintReq true "请求参数" +// @Param data body app_model.DeletePrintReq true "请求参数" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /delPrinters [post] @@ -163,7 +163,7 @@ func (p *Print) UpdatePrinter(c *gin.Context) { // @Title 测试打印 // @Description 测试打印 // @Param token cookie string true "用户登录token" -// @Param data body app_model.UpdatePrintReq true "请求参数" +// @Param data body app_model.TestPrintReq true "请求参数" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /testPrinter [post] @@ -196,7 +196,7 @@ func (p *Print) TestPrint(c *gin.Context) { // @Title 获取打印机消息 // @Description 获取打印机消息 // @Param token cookie string true "用户登录token" -// @Param data body app_model.UpdatePrintReq true "请求参数" +// @Param data body app_model.GetPrintMsg true "请求参数" // @Success 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult // @router /getPrintMessages [get] diff --git a/routers/router.go b/routers/router.go index d86fee7..e142fc5 100644 --- a/routers/router.go +++ b/routers/router.go @@ -9,13 +9,11 @@ import ( func Init(r *gin.Engine) { // 需要token-管理系统 InitV2System(r.Group("/v2")) - - //v1是不需要token的-管理系统 - InitV1System(r.Group("v1")) - // app端不需要token InitV3App(r.Group("/v1")) + //v1是不需要token的-管理系统 + InitV1System(r.Group("v1")) // app端需要token InitV4App(r.Group("/v2")) diff --git a/routers/v3_app_router.go b/routers/v3_app_router.go index 016bc9a..7ae5bfc 100644 --- a/routers/v3_app_router.go +++ b/routers/v3_app_router.go @@ -11,8 +11,4 @@ func InitV3App(v2 *gin.RouterGroup) { appNo.POST("/getUserPhone", app.Auth2ControllerController.GetUserPhoneByWeChat) // 获取微信用户电话 appNo.POST("/login", app.Auth2ControllerController.Login) // 微信登录 - - // - appNo.POST("/getToken4Jxc4", app.Auth2ControllerController.GetToken4Jxc4) // 微信登录京西菜市,获取菜市token - } diff --git a/routers/v4_app_router.go b/routers/v4_app_router.go index bfa5818..f1451e6 100644 --- a/routers/v4_app_router.go +++ b/routers/v4_app_router.go @@ -28,4 +28,8 @@ func InitV4App(v2 *gin.RouterGroup) { // 打印机设置 setting := v2.Group("/setting") setting.POST("updatePrintSetting", app.PrintSettingController.UpdatePrintSetting) // 打印机设置修改 + + // + appYes.POST("/getToken4Jxc4", app.Auth2ControllerController.GetToken4Jxc4) // 微信登录京西菜市,获取菜市token + }