From db043cb402515837303880cb0948d060e9d76490 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 15 四月 2019 17:13:16 +0800
Subject: [PATCH] 整合代码
---
QiaoJiaSystem/build/config.json | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 768e0a2..f009670 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,25 +1,26 @@
{
"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": "enp3s0",
"srsAddr": "rtmp://192.168.1.122:1934/live/",
"webPort": 11111,
"redis_ip": "127.0.0.1",
"redis_buf_len": 750,
- "encode_thread_num": 3,
- "FaceDetectionSampleSize": 720
+ "encode_thread_num": 2,
+ "FaceDetectionSampleSize": 720,
+ "clusterID" : "sssss"
}
--
Gitblit v1.8.0