From 2ad0fadf97e433bf76eea2b90edec03de84d64e6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 08 一月 2020 10:52:17 +0800
Subject: [PATCH] personPicUrl submit add ?collection=persistent

---
 router/router.go |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/router/router.go b/router/router.go
index 6012c52..27db985 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,21 +1,18 @@
 package router
 
 import (
-	"time"
 	"webserver/controllers"
 	"webserver/middlewares/auth"
 
 	"github.com/gin-gonic/gin"
-	ginSwagger "github.com/swaggo/gin-swagger"
+	"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(ginglog.Logger(3 * time.Second))
 
 	r.Use(auth.AuthHandler()) //auth杩囨护鍣�
 
@@ -115,6 +112,7 @@
 
 		camera.POST("/ptzControl", ptzController.Move)
 		camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+		camera.POST("/pasteRules", cameraTaskController.PasteRules)
 	}
 
 	cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -123,6 +121,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")
@@ -232,6 +232,12 @@
 		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)
 	}
 
 	//绠楁硶搴撴搷浣�
@@ -276,6 +282,7 @@
 		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")
 	{

--
Gitblit v1.8.0