From c4ab4a96dfdd097d0faedd14f10b93b18786101d Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 02 七月 2019 17:37:54 +0800
Subject: [PATCH] update dbtable and dbtablepersons update taglist add ageDecription taskName alarmLevel conditions into inputvalue
---
router/router.go | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index c8cdc34..aaa388c 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))
@@ -60,12 +61,13 @@
camera.PUT("/update", cameraController.CameraUpdate)
camera.DELETE("/del/:cid", cameraController.CameraDel)
camera.GET("/show/:cid", cameraController.CameraSel)
+ camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)
camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo)
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 +201,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