From 0436e5443295395025f89f0d091aab1e9551d1a4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 10 一月 2019 20:26:31 +0800
Subject: [PATCH] Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2
---
QiaoJiaSystem/build/config.json | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
old mode 100644
new mode 100755
index 4fbeb0f..768e0a2
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,5 +1,5 @@
{
- "mainServerIp": "192.168.1.203",
+ "mainServerIp": "192.168.1.182",
"mainServerPort": "3697",
"logPath": "/home/dell/work/log/",
"DEV_ID": "DSVAD010120181119",
@@ -15,9 +15,11 @@
"erlPath": "",
"loadPath": "/home/dell/work/qiaojia/load",
"localPasswd": "123456",
- "netIfName": "eno1",
+ "netIfName": "enp3s0",
"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,
+ "encode_thread_num": 3,
+ "FaceDetectionSampleSize": 720
}
--
Gitblit v1.8.0