From 7396acaaf172f25c7bf110e930a74cc133c5d342 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期四, 20 十二月 2018 19:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Develop' into Develop
---
QiaoJiaSystem/build/config.json | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 4fbeb0f..4c5ba97 100644
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,4 +1,5 @@
{
+ "FaceDetectionSampleSize": 720,
"mainServerIp": "192.168.1.203",
"mainServerPort": "3697",
"logPath": "/home/dell/work/log/",
@@ -17,7 +18,7 @@
"localPasswd": "123456",
"netIfName": "eno1",
"srsAddr": "rtmp://192.168.1.122:1934/live/",
- "webPort": 11111 ,
- "redis_ip": "127.0.0.1",
- "redis_buf_len" : 750
+ "webPort": 11111,
+ "redis_ip": "127.0.0.1",
+ "redis_buf_len": 750
}
--
Gitblit v1.8.0