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 |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/router/router.go b/router/router.go
index 0171b32..d45ed44 100644
--- a/router/router.go
+++ b/router/router.go
@@ -28,6 +28,7 @@
 	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)
@@ -44,10 +45,13 @@
 	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 娣诲姞 璺緞 鍓嶇紑
 
-	licenseApi :=r.Group(urlPrefix+"/license")
+	licenseApi := r.Group(urlPrefix + "/license")
 	{
 		licenseApi.POST("/getRegisterCode", licenseController.GetRegisterCode)
 		licenseApi.POST("/save", licenseController.Save)
@@ -90,6 +94,12 @@
 		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")
 	{
@@ -97,6 +107,7 @@
 		camera.PUT("/update", cameraController.CameraUpdate)
 		camera.DELETE("/del/:cid", cameraController.CameraDel)
 		camera.GET("/show/:cid", cameraController.CameraSel)
+        camera.POST("/updateCameraArea", cameraController.UpdateCameraArea)
 		camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
 
 		camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
@@ -112,6 +123,7 @@
 
 		camera.POST("/ptzControl", ptzController.Move)
 		camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+		camera.POST("/pasteRules", cameraTaskController.PasteRules)
 	}
 
 	cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -120,6 +132,8 @@
 		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")
@@ -178,6 +192,12 @@
 		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")
 	{
@@ -207,6 +227,8 @@
 		vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
 		vdbperson.POST("/move", dbPersonCont.Move)
 		vdbperson.POST("/copy", dbPersonCont.Copy)
+
+		vdbperson.POST("/multiUploadCarNo", dbPersonCont.MultiUploadCarNo)
 	}
 
 	// 绯荤粺璁剧疆 鎿嶄綔
@@ -229,7 +251,18 @@
 		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")
@@ -239,6 +272,8 @@
 		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)
 	}
 
 	//绠楁硶鍙傛暟
@@ -290,16 +325,30 @@
 	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.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.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") // 闈欐�佹枃浠�
 	//澶栭儴璁块棶swagger.json

--
Gitblit v1.8.0