From 193aa555a2e4e1e4c3630bdd7bec13415872142f Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 14 一月 2020 18:23:38 +0800
Subject: [PATCH] fix
---
router/router.go | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/router/router.go b/router/router.go
index 3d42f1c..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杩囨护鍣�
@@ -44,6 +41,18 @@
clusterController := new(controllers.ClusterController)
sysRoleController := new(controllers.RoleController)
ptzController := new(controllers.PanTiltZoomController)
+ licenseController := new(controllers.LicenseController)
+ fileAnalysisC := new(controllers.FileAnalysisController)
+ fileSettingC := new(controllers.FileAnalysisSettingController)
+
+ urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
+
+ licenseApi :=r.Group(urlPrefix+"/license")
+ {
+ licenseApi.POST("/getRegisterCode", licenseController.GetRegisterCode)
+ licenseApi.POST("/save", licenseController.Save)
+ licenseApi.GET("/show", licenseController.Show)
+ }
sysApi := r.Group("/data/api-u/sys")
{
@@ -66,9 +75,8 @@
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")
@@ -104,6 +112,7 @@
camera.POST("/ptzControl", ptzController.Move)
camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+ camera.POST("/pasteRules", cameraTaskController.PasteRules)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -112,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")
@@ -159,6 +170,7 @@
es.POST("/getEsClusterInfo", esManagementController.GetEsClusterInfo)
es.POST("/addCluster", esManagementController.AddCluster)
es.POST("/createNode", esManagementController.CreateNode)
+ es.POST("/updateEsHosts", esManagementController.UpdateEsHosts)
}
//瀹炴椂琚皟鏁版嵁
@@ -220,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)
}
//绠楁硶搴撴搷浣�
@@ -264,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")
{
@@ -277,6 +296,18 @@
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)
+ }
+ fileSettingApi := r.Group(urlPrefix + "/fileSetting")
+ {
+ fileSettingApi.GET("/show",fileSettingC.Show)
+ fileSettingApi.POST("/changeEnable", fileSettingC.ChangeEnable)
+ }
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
--
Gitblit v1.8.0