From c514f25ed39ff47e96096376e6006a95b806e6d5 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 03 六月 2020 11:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/webserver
---
controllers/fileAnalysisSetting.go | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/controllers/fileAnalysisSetting.go b/controllers/fileAnalysisSetting.go
index 06a79f1..35aedc7 100644
--- a/controllers/fileAnalysisSetting.go
+++ b/controllers/fileAnalysisSetting.go
@@ -26,7 +26,9 @@
util.ResponseFormat(c,code.Success, map[string]interface{}{
"videoEnable": setting.VideoEnable,
"fileDirectory": setting.FileDirectory,
- "channelCount": setting.ChannelCount,
+ "videoChannelCount": setting.VideoChannelCount,
+ "imgChannelCount": setting.ImgChannelCount,
+ "audioChannelCount": setting.AudioChannelCount,
})
} else {
util.ResponseFormat(c,code.ComError, setting)
--
Gitblit v1.8.0