From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期五, 05 六月 2020 18:29:41 +0800
Subject: [PATCH] add refresh token to resp

---
 router/router.go |  191 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 166 insertions(+), 25 deletions(-)

diff --git a/router/router.go b/router/router.go
index 75c1a0f..d45ed44 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,22 +1,20 @@
 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"
+	"github.com/swaggo/gin-swagger"
+	"github.com/swaggo/gin-swagger/swaggerFiles"
 	_ "webserver/docs"
 )
 
 func NewRouter() *gin.Engine {
 	r := gin.Default()
-	r.Use(ginglog.Logger(3 * time.Second))
+	//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))
 
@@ -28,7 +26,9 @@
 	ssController := new(controllers.SysSetController)
 	sdkController := new(controllers.SdkController)
 	esSearchController := new(controllers.EsSearchController)
+	esManagementController := new(controllers.EsManagementController)
 	realTimeController := new(controllers.RealTimeController)
+	deleteDataController := new(controllers.DeleteDataController)
 	cameraTimeRuleController := new(controllers.CameraTimeruleController)
 	polygonController := new(controllers.CameraPolygonController)
 	cameraTaskController := new(controllers.CameraTaskController)
@@ -38,33 +38,67 @@
 	eventPushController := new(controllers.EventPushController)
 	pollConfigController := new(controllers.PollConfigController)
 	fileController := new(controllers.FileController)
-	sysMenuController :=new(controllers.SysMenuController)
+	sysMenuController := new(controllers.SysMenuController)
+	clusterController := new(controllers.ClusterController)
+	sysRoleController := new(controllers.RoleController)
+	ptzController := new(controllers.PanTiltZoomController)
+	licenseController := new(controllers.LicenseController)
+	fileAnalysisC := new(controllers.FileAnalysisController)
+	fileSettingC := new(controllers.FileAnalysisSettingController)
+    icController := new(controllers.InfoController)
+    gb28181C := new(controllers.Gb28181Controller)
+    fStackC := new(controllers.FileStackController)
 
+	urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
 
-	sysApi := r.Group(  "/data/api-u/sys")
+	licenseApi := r.Group(urlPrefix + "/license")
 	{
-		sysApi.POST("/login",userController.Login)
-		sysApi.POST("/logout",userController.Logout)
+		licenseApi.POST("/getRegisterCode", licenseController.GetRegisterCode)
+		licenseApi.POST("/save", licenseController.Save)
+		licenseApi.GET("/show", licenseController.Show)
+	}
+
+	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("/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)
+		userApi.POST("/updatePwd", userController.UpdatePwd)
 	}
-
-	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.POST("/del", areaController.AreaDelete)
 		area.POST("/update", areaController.AreaUpdate)
+		area.POST("/gb28181TreeRefresh", areaController.Gb28181TreeRefresh)
+		area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete)
 	}
+
+    gbApi := r.Group(urlPrefix + "/gb28181")
+    {
+        gbApi.GET("/findAreaByParentId", gb28181C.FindAreaByParentId)
+        gbApi.GET("/newGbId",gb28181C.NewGbId)
+    }
 
 	//鎽勫儚鏈虹鐞�
 	camera := r.Group(urlPrefix + "/camera")
@@ -73,7 +107,8 @@
 		camera.PUT("/update", cameraController.CameraUpdate)
 		camera.DELETE("/del/:cid", cameraController.CameraDel)
 		camera.GET("/show/:cid", cameraController.CameraSel)
-		camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)
+        camera.POST("/updateCameraArea", cameraController.UpdateCameraArea)
+		camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
 
 		camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
 		camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
@@ -84,6 +119,11 @@
 		camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
 		camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
 		camera.POST("/changeRunType", cameraController.ChangeRunType)
+		camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
+
+		camera.POST("/ptzControl", ptzController.Move)
+		camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+		camera.POST("/pasteRules", cameraTaskController.PasteRules)
 	}
 
 	cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -91,6 +131,9 @@
 		cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
 		cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
 		cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+		cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
+
+		cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
 	}
 
 	cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -98,6 +141,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")
@@ -113,20 +157,31 @@
 	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("/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)
+
+		task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
 	}
 
-	// 妫�绱� 鏌ヨ
+	// 妫�绱� 鏌ヨ 鑺傜偣鎿嶄綔
 	es := r.Group(urlPrefix + "/es")
 	{
 		es.POST("/tagList", esSearchController.PostEsTagList)
 		es.POST("/taskList", esSearchController.PostEsTaskList)
 		es.POST("/esSearch", esSearchController.PostEsSearch)
 		es.POST("/queryEsCompareData", controllers.PostEsCompareData)
+		es.POST("/getEsClusterInfo", esManagementController.GetEsClusterInfo)
+		es.POST("/addCluster", esManagementController.AddCluster)
+		es.POST("/createNode", esManagementController.CreateNode)
+		es.POST("/updateEsHosts", esManagementController.UpdateEsHosts)
 	}
 
 	//瀹炴椂琚皟鏁版嵁
@@ -134,28 +189,46 @@
 	{
 		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)
 	}
+	//娓呯悊鏁版嵁
+	deleteData := r.Group(urlPrefix + "/clearData")
+	{
+		deleteData.POST("/deleteEsData", deleteDataController.DeleteEsData)
+	}
+
 	//搴曞簱 鎿嶄綔
 	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)
+
+		vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
+		vdbperson.POST("/move", dbPersonCont.Move)
+		vdbperson.POST("/copy", dbPersonCont.Copy)
+
+		vdbperson.POST("/multiUploadCarNo", dbPersonCont.MultiUploadCarNo)
 	}
 
 	// 绯荤粺璁剧疆 鎿嶄綔
@@ -167,9 +240,29 @@
 		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)
+		vsset.GET("/sysThresholds", ssController.GetSysThresholds)
+
+		vsset.GET("/reboot", ssController.RebootOS)
+		vsset.GET("/rebootTask", ssController.GetRebootTask)
+		vsset.POST("/rebootTask", ssController.SetRebootTask)
+
+		vsset.GET("/getResourceConfig", ssController.GetResourceConfig)
+		vsset.POST("/saveResourceConfig", ssController.SaveResourceConfig)
+		vsset.GET("/patchUpdate", ssController.PatchUpdateCheck)
+		vsset.POST("/patchUpdate", ssController.PatchUpdate)
+		vsset.POST("/upgrade", ssController.Upgrade)
 	}
+
+    ic := r.Group(urlPrefix + "/info")
+    {
+        ic.GET("/getServerName", icController.GetServerName)
+    }
 
 	//绠楁硶搴撴搷浣�
 	sdkApi := r.Group(urlPrefix + "/sdk")
@@ -178,6 +271,15 @@
 		sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
 		sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
 		sdkApi.GET("/getById", sdkController.GetById)
+		sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
+		sdkApi.GET("/upload", sdkController.Upload)
+		sdkApi.POST("/upload", sdkController.UploadPack)
+	}
+
+	//绠楁硶鍙傛暟
+	sdkArgApi := r.Group(urlPrefix + "/sdkArg")
+	{
+		sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
 	}
 
 	cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -206,7 +308,46 @@
 		pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
 		pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
 		pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
+		pollCApi.POST("/updateChannelCount", pollConfigController.UpdateChannelCount)
 	}
+	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)
+	}
+	fileAnalyApi := r.Group(urlPrefix + "/fileAnalysis")
+	{
+		fileAnalyApi.GET("/findAllFile", fileAnalysisC.FindAllFile)
+		fileAnalyApi.POST("/updateStatus", fileAnalysisC.UpdateStatus)
+		fileAnalyApi.POST("/delete", fileAnalysisC.Delete)
+		fileAnalyApi.POST("/sortFile", fileAnalysisC.SortFile)
+		fileAnalyApi.GET("/findByStackId", fileAnalysisC.FindByStackId)
+
+		fileAnalyApi.POST("/move", fileAnalysisC.Move)
+		fileAnalyApi.POST("/rename", fileAnalysisC.Rename)
+		fileAnalyApi.POST("/copy", fileAnalysisC.Copy)
+	}
+	fileSettingApi := r.Group(urlPrefix + "/fileSetting")
+	{
+		fileSettingApi.GET("/show", fileSettingC.Show)
+		fileSettingApi.POST("/changeEnable", fileSettingC.ChangeEnable)
+	}
+
+    fStackApi := r.Group(urlPrefix +"/fileStack")
+    {
+        fStackApi.GET("/findAllByPage",fStackC.FindAllByPage)
+        fStackApi.POST("/save",fStackC.Save)
+        fStackApi.GET("/show/:id", fStackC.Show)
+        fStackApi.POST("/changeEnable", fStackC.ChangeEnable)
+        fStackApi.DELETE("/delete/:id", fStackC.Delete)
+    }
 
 	// 鏂囦欢 涓婁紶
 	r.Static("static", "./static") // 闈欐�佹枃浠�

--
Gitblit v1.8.0