From f79f18bf3e65ad0eaf8fd1feb788bf792e362520 Mon Sep 17 00:00:00 2001
From: sunty <suntianyu0923@163.com>
Date: 星期四, 01 八月 2019 15:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
router/router.go | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index b6fd1eb..56ff1be 100644
--- a/router/router.go
+++ b/router/router.go
@@ -44,7 +44,7 @@
sysApi := r.Group( "/data/api-u/sys")
{
sysApi.POST("/login",userController.Login)
- sysApi.POST("/logout",userController.Logout)
+ sysApi.GET("/logout",userController.Logout)
sysApi.POST("refresh_token",userController.RefreshToken)
}
sysMenuApi := r.Group("/data/api-u/sysmenus")
@@ -62,6 +62,7 @@
area := r.Group(urlPrefix + "/area")
{
area.GET("/localmenu", areaController.CameraTree)
+ area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
area.POST("/add", areaController.AreaAdd)
area.POST("/del", areaController.AreaDelete)
area.POST("/update", areaController.AreaUpdate)
@@ -118,8 +119,11 @@
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
task.GET("/deleteTask", taskController.DeleteTask)
- task.GET("/addTaskSdk", taskController.AddTaskSdk)
+ task.POST("/addTaskSdk", taskController.AddTaskSdk)
task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+ task.POST("/updateTaskName", taskController.UpdateTaskName)
+ task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
+ task.POST("/deleteTaskSdkRuleById", taskController.DeleteTaskSdkRuleById)
}
// 妫�绱� 鏌ヨ
@@ -136,7 +140,8 @@
{
realTime.POST("/capture", realTimeController.PostCapture)
realTime.POST("/monitoring", realTimeController.PostMonitoring)
- realTime.POST("/action", realTimeController.PostAction)
+ realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
+ realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
}
//搴曞簱 鎿嶄綔
vdbtable := r.Group(urlPrefix + "/dbtable")
@@ -158,6 +163,8 @@
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+ vdbperson.POST("/faceExtract",fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
}
// 绯荤粺璁剧疆 鎿嶄綔
--
Gitblit v1.8.0