From b4682ed34ef9e89649ded8723ffb4aaac63139e1 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 19:07:14 +0800
Subject: [PATCH] upload img and getFea
---
router/router.go | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/router/router.go b/router/router.go
index 6425bd8..812b254 100644
--- a/router/router.go
+++ b/router/router.go
@@ -7,6 +7,7 @@
"github.com/szuecs/gin-glog"
"time"
"webserver/controllers"
+ "webserver/middlewares/auth"
_ "webserver/docs"
)
@@ -15,7 +16,7 @@
r := gin.Default()
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))
@@ -35,6 +36,8 @@
dicController :=new(controllers.DictionaryController)
userController :=new(controllers.UserController)
eventPushController :=new(controllers.EventPushController)
+ pollConfigController :=new(controllers.PollConfigController)
+ fileController := new(controllers.FileController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
userApi :=r.Group(urlPrefix+"/user")
@@ -66,6 +69,9 @@
camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
camera.POST("/saveTask", cameraController.CameraTaskSave)
camera.GET("/getRulesByCameraAndTask",cameraTaskArgsController.FindByCameraAndTask)
+ camera.GET("/getCamerasByRunType",cameraController.GetCamerasByRunType)
+ camera.POST("/updateRunEnable",cameraController.UpdateRunEnable)
+ camera.POST("/changeRunType",cameraController.ChangeRunType)
}
cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
@@ -136,6 +142,8 @@
vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
+
+ vdbperson.POST("/fileUploadTest",fileController.UploadPersonTest)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -180,12 +188,19 @@
eventPushApi.POST("/changeStatus",eventPushController.ChangeStatus)
eventPushApi.POST("/delete",eventPushController.Delete)
}
+ pollCApi :=r.Group(urlPrefix+"/pollConfig")
+ {
+ pollCApi.POST("/savePollPeriod",pollConfigController.SavePollPeriod)
+ pollCApi.POST("/savePollDelay",pollConfigController.SavePollDelay)
+ pollCApi.GET("/getPollConfig",pollConfigController.GetPollConfig)
+ pollCApi.POST("/updateEnable",pollConfigController.UpdateEnable)
+ }
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
//澶栭儴璁块棶swagger.json
r.StaticFile("/swagger.json", "./docs/swagger.json")
- fileController := new(controllers.FileController)
+
vdbperson.POST("/fileupload", fileController.Fileupload)
vdbperson.POST("/moreFileUpload", fileController.MoreFileUpload)
r.POST(urlPrefix+"/es/ImageUploadReturnPics", fileController.ImageUploadReturnPics)
--
Gitblit v1.8.0