From eb2c3a8890a0e9695c0cd2bc3b3dc310c6fbcfa9 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 26 十月 2019 11:28:23 +0800
Subject: [PATCH] fix user timeout
---
router/router.go | 133 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 111 insertions(+), 22 deletions(-)
diff --git a/router/router.go b/router/router.go
index 145b718..ddde8ee 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,19 +1,23 @@
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"
)
func NewRouter() *gin.Engine {
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))
@@ -32,20 +36,48 @@
cameraTaskArgsController := new(controllers.CameraTaskArgsController)
dicController := new(controllers.DictionaryController)
userController := new(controllers.UserController)
+ eventPushController := new(controllers.EventPushController)
+ 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")
+ {
+ 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("/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("/findById", userController.FindById)
+ userApi.POST("/saveAuth", userController.SaveAuth)
+ }
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- userApi := r.Group(urlPrefix + "/user")
- {
- userApi.POST("/login", userController.Login)
- }
//鍖哄煙绠＄悊
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)
+ area.POST("/gb28181TreeRefresh", areaController.Gb28181TreeRefresh)
+ area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete)
}
//鎽勫儚鏈虹鐞�
@@ -55,14 +87,18 @@
camera.PUT("/update", cameraController.CameraUpdate)
camera.DELETE("/del/:cid", cameraController.CameraDel)
camera.GET("/show/:cid", cameraController.CameraSel)
- camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo)
+ camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
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)
+ camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
+ camera.POST("/changeRunType", cameraController.ChangeRunType)
+ camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -70,6 +106,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")
@@ -77,6 +114,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")
@@ -94,9 +132,13 @@
task.GET("/findAll", taskController.FindAll)
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
- task.GET("/deleteTask", taskController.DeleteTask)
- task.GET("/addTaskSdk", taskController.AddTaskSdk)
- task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+ task.GET("/delete", taskController.DeleteTask)
+ task.POST("/addTaskSdk", taskController.AddTaskSdk)
+ task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
+ task.POST("/updateTaskName", taskController.UpdateTaskName)
+ task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
+ task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
+ task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
}
// 妫�绱� 鏌ヨ
@@ -113,26 +155,34 @@
{
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)
+ 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)
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
+
+ vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+ vdbperson.POST("/faceExtract", fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto", fileController.SearchByPhoto)
+ vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -144,8 +194,12 @@
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)
+ vsset.GET("/clockInfo", ssController.GetClockinfo)
+ vsset.POST("/updateClock", ssController.SetSysClock)
+ vsset.GET("/ntpTest", ssController.TestNTPServer)
+ vsset.GET("/sysinfo", ssController.GetSysInfo)
}
//绠楁硶搴撴搷浣�
@@ -155,6 +209,13 @@
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
+ sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
+ }
+
+ //绠楁硶鍙傛暟
+ sdkArgApi := r.Group(urlPrefix + "/sdkArg")
+ {
+ sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
}
cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -166,13 +227,41 @@
dicApi := r.Group(urlPrefix + "/dictionary")
{
dicApi.GET("/findByType", dicController.FindByType)
+ dicApi.GET("/findByParentId", dicController.FindByParentId)
+ }
+ eventPushApi := r.Group(urlPrefix + "/eventPush")
+ {
+ eventPushApi.POST("/save", eventPushController.Save)
+ eventPushApi.GET("/findByEventTopic", eventPushController.FindByEventTopic)
+ eventPushApi.GET("/findAll", eventPushController.FindAll)
+ eventPushApi.GET("/getById", eventPushController.GetById)
+ eventPushApi.POST("/changeStatus", eventPushController.ChangeStatus)
+ eventPushApi.POST("/delete", eventPushController.Delete)
+ }
+ pollCApi := r.Group(urlPrefix + "/pollConfig")
+ {
+ pollCApi.POST("/savePollPeriod", pollConfigController.SavePollPeriod)
+ pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
+ 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") // 闈欐�佹枃浠�
//澶栭儴璁块棶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