From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
QiaoJiaSystem/build/config.json | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index f009670..9f0e3e5 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,26 +1,26 @@
{
- "mainServerIp": "192.168.1.182",
- "mainServerPort": "3697",
- "logPath": "/home/basic/work/log/",
- "DEV_ID": "DSVAD010120181119",
- "ES_IP": "192.168.1.182",
- "ES_PORT": 9200,
- "FaceSeachSleepTime": 60,
- "TotalLoadSize": "500",
- "buildAddr": "/home/basic/Apps/QiaoJiaSystem/build/",
- "cutPath": "/home/basic/work/qiaojia/cut",
- "erlCookie": "",
- "erlFatherNode": "",
- "erlNode": "",
- "erlPath": "",
- "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": 2,
- "FaceDetectionSampleSize": 720,
- "clusterID" : "sssss"
+ "DEV_ID" : "DSVAD010120181119",
+ "ES_IP" : "192.168.1.182",
+ "ES_PORT" : 9200,
+ "FaceDetectionSampleSize" : 720,
+ "FaceSeachSleepTime" : 60,
+ "TotalLoadSize" : "500",
+ "buildAddr" : "/home/basic/Apps/QiaoJiaSystem/build/",
+ "clusterID" : "sssss",
+ "cutPath" : "/home/basic/work/qiaojia/cut",
+ "encode_thread_num" : 2,
+ "erlCookie" : "",
+ "erlFatherNode" : "",
+ "erlNode" : "",
+ "erlPath" : "",
+ "loadPath" : "/home/basic/work/qiaojia/load",
+ "localPasswd" : "123456",
+ "logPath" : "/home/basic/work/log/",
+ "mainServerIp" : "192.168.1.182",
+ "mainServerPort" : "3697",
+ "netIfName" : "enp3s0",
+ "redis_buf_len" : 750,
+ "redis_ip" : "127.0.0.1",
+ "srsAddr" : "rtmp://192.168.1.122:1934/live/",
+ "webPort" : 11111
}
--
Gitblit v1.8.0