From d232ca5cbdb43b5d1281bc0335ce04adab7870ca Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 18 十二月 2019 16:30:53 +0800
Subject: [PATCH] add mergeAll.sh and +x
---
controllers/camera.go | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/controllers/camera.go b/controllers/camera.go
index c676d6b..e9dc4ee 100644
--- a/controllers/camera.go
+++ b/controllers/camera.go
@@ -294,6 +294,7 @@
// @Security ApiKeyAuth
// @Summary 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
// @Description 鍒囨崲鎽勫儚鏈鸿繍琛屽疄鏃舵垨杞鐨勫紑鍏�
+// @Accept x-www-form-urlencoded
// @Produce json
// @Tags camera
// @Param cameraId formData string true "鎽勫儚鏈篿d"
@@ -338,7 +339,10 @@
util.ResponseFormat(c, code.ComError, "鏇存柊澶辫触")
return
}
- util.ResponseFormat(c, code.Success, filename)
+ util.ResponseFormat(c, code.Success, map[string]string{
+ "cameraId": cid,
+ "snapshotUrl": filename,
+ })
}
type CameraChangeRunVo struct {
--
Gitblit v1.8.0