From 3566c2630dc2ac33e03fb6df5ec2cd19e1625a68 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 27 九月 2019 15:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
router/router.go | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/router/router.go b/router/router.go
index 453d013..dfc13e6 100644
--- a/router/router.go
+++ b/router/router.go
@@ -39,6 +39,8 @@
pollConfigController := new(controllers.PollConfigController)
fileController := new(controllers.FileController)
sysMenuController :=new(controllers.SysMenuController)
+ clusterController :=new(controllers.ClusterController)
+ sysRoleController :=new(controllers.RoleController)
sysApi := r.Group( "/data/api-u/sys")
@@ -50,10 +52,17 @@
sysMenuApi := r.Group("/data/api-u/sysmenus")
{
sysMenuApi.GET("/me",sysMenuController.Me)
+ sysMenuApi.GET("/tree",sysMenuController.MenuTree)
+ }
+ roleApi :=r.Group("/data/api-v/role")
+ {
+ roleApi.GET("/findAll",sysRoleController.FindAll)
}
userApi := r.Group("/data/api-u/users")
{
userApi.GET("/current",userController.Current)
+ userApi.GET("/findAllUser", userController.FindAllUser)
+ userApi.POST("/edit",userController.Edit)
}
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -66,6 +75,8 @@
area.POST("/add", areaController.AreaAdd)
area.POST("/del", areaController.AreaDelete)
area.POST("/update", areaController.AreaUpdate)
+ area.POST("/gb28181TreeRefresh", areaController.Gb28181TreeRefresh)
+ area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete)
}
//鎽勫儚鏈虹鐞�
@@ -101,6 +112,7 @@
cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
+ cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
}
polygon := r.Group(urlPrefix + "/polygon")
@@ -123,7 +135,7 @@
task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
task.POST("/updateTaskName", taskController.UpdateTaskName)
task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
- task.POST("/deleteTaskSdkRuleById", taskController.DeleteTaskSdkRuleById)
+ task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
}
@@ -151,13 +163,15 @@
vdbtable.POST("/updateDbTables", tableController.UpdateDbTables)
vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
+ vdbtable.POST("/updateDbTableStatus", tableController.UpdateDbTableStatus)
+ vdbtable.GET("/findAllDbTablesByCurServer", tableController.FindAllDbTablesByCurServer)
}
// 搴曞簱浜哄憳 鎿嶄綔
vdbperson := r.Group(urlPrefix + "/dbperson")
{
vdbperson.POST("/queryDbPersonsByTbId", dbPersonCont.QueryDbPersonsByTbId)
- vdbperson.POST("/queryDbPersonsByCampare", dbPersonCont.QueryDbPersonsByCampare)
+ vdbperson.POST("/queryDbPersonsByCompare", dbPersonCont.QueryDbPersonsByCompare)
vdbperson.POST("/updateDbPerson", dbPersonCont.UpdateDbPerson)
vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
@@ -166,6 +180,7 @@
vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
vdbperson.POST("/faceExtract",fileController.FaceExtract)
vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
+ vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -188,6 +203,7 @@
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
+ sdkApi.GET("/sdkDownload",sdkController.SdkDownLoad)
}
//绠楁硶鍙傛暟
@@ -223,6 +239,18 @@
pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
}
+ clusterApi := r.Group(urlPrefix+"/cluster")
+ {
+ clusterApi.GET("/findCluster", clusterController.FindCluster)
+ clusterApi.GET("/randomPwd", clusterController.RandomPwd)
+ clusterApi.POST("/create", clusterController.Create)
+ clusterApi.POST("/search", clusterController.Search)
+ clusterApi.POST("/stopSearching", clusterController.StopSearching)
+ clusterApi.GET("/getSearchNodes", clusterController.GetSearchNodes)
+ clusterApi.POST("/joinCluster", clusterController.JoinCluster)
+ clusterApi.POST("/updateClusterName", clusterController.UpdateClusterName)
+ clusterApi.POST("/leave", clusterController.Leave)
+ }
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
--
Gitblit v1.8.0