From d21de749cc7028a802ec413f47e866b1e13f033e Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期四, 04 七月 2019 11:51:42 +0800 Subject: [PATCH] fix bug --- router/router.go | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/router/router.go b/router/router.go index c8cdc34..75c1a0f 100644 --- a/router/router.go +++ b/router/router.go @@ -7,6 +7,7 @@ "github.com/szuecs/gin-glog" "time" "webserver/controllers" + "webserver/middlewares/auth" _ "webserver/docs" ) @@ -15,7 +16,7 @@ r := gin.Default() r.Use(ginglog.Logger(3 * time.Second)) - //r.Use(auth.AuthHandler())//auth杩囨护鍣� + r.Use(auth.AuthHandler())//auth杩囨护鍣� r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) @@ -37,20 +38,32 @@ eventPushController := new(controllers.EventPushController) pollConfigController := new(controllers.PollConfigController) fileController := new(controllers.FileController) + sysMenuController :=new(controllers.SysMenuController) + + + sysApi := r.Group( "/data/api-u/sys") + { + sysApi.POST("/login",userController.Login) + sysApi.POST("/logout",userController.Logout) + } + sysMenuApi := r.Group("/data/api-u/sysmenus") + { + sysMenuApi.GET("/me",sysMenuController.Me) + } + userApi := r.Group("/data/api-u/users") + { + userApi.GET("/current",userController.Current) + } urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑 - userApi := r.Group(urlPrefix + "/user") - { - userApi.POST("/login", userController.Login) - } //鍖哄煙绠$悊 area := r.Group(urlPrefix + "/area") { area.GET("/localmenu", areaController.CameraTree) area.POST("/add", areaController.AreaAdd) - area.GET("/del", areaController.AreaDelete) - area.PUT("/update/:id", areaController.AreaUpdate) + area.POST("/del", areaController.AreaDelete) + area.POST("/update", areaController.AreaUpdate) } //鎽勫儚鏈虹鐞� @@ -60,12 +73,12 @@ camera.PUT("/update", cameraController.CameraUpdate) camera.DELETE("/del/:cid", cameraController.CameraDel) camera.GET("/show/:cid", cameraController.CameraSel) - camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo) + camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl) camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds) camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll) - camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask) + camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask) camera.POST("/saveTask", cameraController.CameraTaskSave) camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask) camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType) @@ -199,7 +212,6 @@ r.Static("static", "./static") // 闈欐�佹枃浠� //澶栭儴璁块棶swagger.json r.StaticFile("/swagger.json", "./docs/swagger.json") - fileController := new(controllers.FileController) vdbperson.POST("/fileupload", fileController.Fileupload) vdbperson.POST("/moreFileUpload", fileController.MoreFileUpload) r.POST(urlPrefix+"/es/ImageUploadReturnPics", fileController.ImageUploadReturnPics) -- Gitblit v1.8.0