From 2b1a3988c9fd35c39e3e43d0382d65a13c45efee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期四, 14 三月 2019 10:38:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/build/config.json | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
old mode 100644
new mode 100755
index 4c5ba97..f009670
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,24 +1,26 @@
{
- "FaceDetectionSampleSize": 720,
- "mainServerIp": "192.168.1.203",
+ "mainServerIp": "192.168.1.182",
"mainServerPort": "3697",
- "logPath": "/home/dell/work/log/",
+ "logPath": "/home/basic/work/log/",
"DEV_ID": "DSVAD010120181119",
- "ES_IP": "192.168.1.122",
+ "ES_IP": "192.168.1.182",
"ES_PORT": 9200,
"FaceSeachSleepTime": 60,
"TotalLoadSize": "500",
- "buildAddr": "/home/dell/Apps/QiaoJiaSystem/build/",
- "cutPath": "/home/dell/work/qiaojia/cut",
+ "buildAddr": "/home/basic/Apps/QiaoJiaSystem/build/",
+ "cutPath": "/home/basic/work/qiaojia/cut",
"erlCookie": "",
"erlFatherNode": "",
"erlNode": "",
"erlPath": "",
- "loadPath": "/home/dell/work/qiaojia/load",
+ "loadPath": "/home/basic/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
+ "redis_buf_len": 750,
+ "encode_thread_num": 2,
+ "FaceDetectionSampleSize": 720,
+ "clusterID" : "sssss"
}
--
Gitblit v1.8.0