From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
router/router.go | 69 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/router/router.go b/router/router.go
index 5efd80b..abc6ffe 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,13 +1,14 @@
package router
import (
- "github.com/gin-gonic/gin"
- "github.com/swaggo/gin-swagger"
- "github.com/swaggo/gin-swagger/swaggerFiles"
- "github.com/szuecs/gin-glog"
"time"
"webserver/controllers"
"webserver/middlewares/auth"
+
+ "github.com/gin-gonic/gin"
+ ginSwagger "github.com/swaggo/gin-swagger"
+ "github.com/swaggo/gin-swagger/swaggerFiles"
+ ginglog "github.com/szuecs/gin-glog"
_ "webserver/docs"
)
@@ -16,7 +17,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))
@@ -38,23 +39,32 @@
eventPushController := new(controllers.EventPushController)
pollConfigController := new(controllers.PollConfigController)
fileController := new(controllers.FileController)
- sysMenuController :=new(controllers.SysMenuController)
- clusterController :=new(controllers.ClusterController)
+ sysMenuController := new(controllers.SysMenuController)
+ clusterController := new(controllers.ClusterController)
+ sysRoleController := new(controllers.RoleController)
+ ptController := new(controllers.PanTiltController)
-
- sysApi := r.Group( "/data/api-u/sys")
+ sysApi := r.Group("/data/api-u/sys")
{
- sysApi.POST("/login",userController.Login)
- sysApi.GET("/logout",userController.Logout)
- sysApi.POST("refresh_token",userController.RefreshToken)
+ sysApi.POST("/login", userController.Login)
+ sysApi.GET("/logout", userController.Logout)
+ sysApi.POST("refresh_token", userController.RefreshToken)
}
sysMenuApi := r.Group("/data/api-u/sysmenus")
{
- sysMenuApi.GET("/me",sysMenuController.Me)
+ 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("/current", userController.Current)
+ userApi.GET("/findAllUser", userController.FindAllUser)
+ userApi.POST("/findById", userController.FindById)
+ userApi.POST("/saveAuth", userController.SaveAuth)
}
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -63,7 +73,7 @@
area := r.Group(urlPrefix + "/area")
{
area.GET("/localmenu", areaController.CameraTree)
- area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
+ area.GET("/gb28181Tree", areaController.CameraGb28181Tree)
area.POST("/add", areaController.AreaAdd)
area.POST("/del", areaController.AreaDelete)
area.POST("/update", areaController.AreaUpdate)
@@ -78,7 +88,7 @@
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("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
@@ -89,6 +99,9 @@
camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
+ camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
+
+ camera.POST("/ptControl", ptController.Controlling)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -96,7 +109,7 @@
cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
- cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
+ cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -104,6 +117,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")
@@ -119,6 +133,7 @@
task := r.Group(urlPrefix + "/task")
{
task.GET("/findAll", taskController.FindAll)
+ task.GET("/aggregateTaskList", taskController.AggregateTaskList)
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
task.GET("/delete", taskController.DeleteTask)
@@ -155,6 +170,7 @@
vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
vdbtable.POST("/updateDbTableStatus", tableController.UpdateDbTableStatus)
+ vdbtable.GET("/findAllDbTablesByCurServer", tableController.FindAllDbTablesByCurServer)
}
// 搴曞簱浜哄憳 鎿嶄綔
@@ -168,9 +184,11 @@
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
- vdbperson.POST("/faceExtract",fileController.FaceExtract)
- vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
+ vdbperson.POST("/faceExtract", fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto", fileController.SearchByPhoto)
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
+
+ vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -184,6 +202,13 @@
vsset.POST("/saveDevInfo", ssController.SaveDevInfo)
vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow)
vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit)
+ vsset.GET("/clockInfo", ssController.GetClockinfo)
+ vsset.POST("/updateClock", ssController.SetSysClock)
+ vsset.GET("/ntpTest", ssController.TestNTPServer)
+ vsset.GET("/sysinfo", ssController.GetSysInfo)
+ vsset.GET("/sysThresholds", ssController.GetSysThresholds)
+
+ vsset.GET("/reboot", ssController.RebootOS)
}
//绠楁硶搴撴搷浣�
@@ -193,11 +218,11 @@
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
- sdkApi.GET("/sdkDownload",sdkController.SdkDownLoad)
+ sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
}
//绠楁硶鍙傛暟
- sdkArgApi :=r.Group(urlPrefix + "/sdkArg")
+ sdkArgApi := r.Group(urlPrefix + "/sdkArg")
{
sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
}
@@ -229,7 +254,7 @@
pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
}
- clusterApi := r.Group(urlPrefix+"/cluster")
+ clusterApi := r.Group(urlPrefix + "/cluster")
{
clusterApi.GET("/findCluster", clusterController.FindCluster)
clusterApi.GET("/randomPwd", clusterController.RandomPwd)
--
Gitblit v1.8.0