From 01423aa626cf19b65630ac34d3a16d6920ced202 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 18:29:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
router/router.go | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index ebc84f1..0e55716 100644
--- a/router/router.go
+++ b/router/router.go
@@ -38,11 +38,21 @@
eventPushController := new(controllers.EventPushController)
pollConfigController := new(controllers.PollConfigController)
fileController := new(controllers.FileController)
+ sysMenuController :=new(controllers.SysMenuController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- userApi := r.Group(urlPrefix + "/user")
+ sysApi := r.Group(urlPrefix + "/sys")
{
- userApi.POST("/login", userController.Login)
+ sysApi.POST("/login",userController.Login)
+ sysApi.POST("/logout",userController.Logout)
+ }
+ sysMenuApi := r.Group("/sysmenus")
+ {
+ sysMenuApi.GET("/me",sysMenuController.Me)
+ }
+ userApi := r.Group(urlPrefix + "/users")
+ {
+ userApi.GET("/current",userController.Current)
}
//鍖哄煙绠＄悊
@@ -67,7 +77,7 @@
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)
--
Gitblit v1.8.0