From cc962c1b6ffabd9d41e6db0571efbcc1a4568ce7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 29 七月 2019 11:39:56 +0800
Subject: [PATCH] use mangos req instead of deliver,add recv timeout
---
router/router.go | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/router/router.go b/router/router.go
index 0e55716..b7977dd 100644
--- a/router/router.go
+++ b/router/router.go
@@ -40,28 +40,32 @@
fileController := new(controllers.FileController)
sysMenuController :=new(controllers.SysMenuController)
- urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- sysApi := r.Group(urlPrefix + "/sys")
+
+ 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("/sysmenus")
+ sysMenuApi := r.Group("/data/api-u/sysmenus")
{
sysMenuApi.GET("/me",sysMenuController.Me)
}
- userApi := r.Group(urlPrefix + "/users")
+ userApi := r.Group("/data/api-u/users")
{
userApi.GET("/current",userController.Current)
}
+
+ urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
//鍖哄煙绠＄悊
area := r.Group(urlPrefix + "/area")
{
area.GET("/localmenu", areaController.CameraTree)
+ area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
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)
}
//鎽勫儚鏈虹鐞�
@@ -72,7 +76,6 @@
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)
@@ -90,6 +93,7 @@
cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+ cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -133,14 +137,15 @@
{
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")
{
vdbtable.POST("/queryDbTables/:isSync", tableController.QueryDbTables)
vdbtable.POST("/updateDbTables", tableController.UpdateDbTables)
- vdbtable.POST("/deleteDBtablesById/:uuid", tableController.DeleteDbTables)
+ vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
}
@@ -155,6 +160,8 @@
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+ vdbperson.POST("/faceExtract",fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -166,8 +173,8 @@
vsset.POST("/videoLenEdit", ssController.VideoLenEdit)
vsset.GET("/getDevInfo", ssController.GetDevInfo)
vsset.POST("/saveDevInfo", ssController.SaveDevInfo)
- vsset.GET("/vSSLocalSettingShow", ssController.VSSLocalSettingShow)
- vsset.POST("/vSSLocalSettingEdit", ssController.VSSLocalSettingEdit)
+ vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow)
+ vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit)
}
//绠楁硶搴撴搷浣�
--
Gitblit v1.8.0