From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature
---
QiaoJiaSystem/build/config.json | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index c365bcf..6c399a3 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,26 +1,30 @@
{
- "mainServerIp": "192.168.1.182",
- "mainServerPort": "3697",
- "logPath": "/home/basic/work/log/",
"DEV_ID": "DSVAD010120181119",
- "ES_IP": "192.168.1.122",
+ "ES_IP": "192.168.1.182",
"ES_PORT": 9200,
+ "FaceDetectionSampleSize": 720,
"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",
+ "buildAddr": "/home/bsk/Apps/QiaoJiaSystem/build/",
+ "clusterID": "",
+ "cutPath": "/home/bsk/work/qiaojia/cut",
+ "encode_thread_num": 3,
+ "erlCookie": "123",
+ "erlFatherNode": " ",
+ "erlNode": "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.148",
+ "erlPath": "/opt/erlang/f6d7d984-858e-4235-a657-644927b3a628",
+ "loadPath": "/home/bsk/work/qiaojia/load",
"localPasswd": "123456",
+ "logPath": "/home/bsk/work/log/",
+ "mainServerIp": "192.168.1.182",
+ "mainServerPort": "3697",
+ "mainServerrUrl": "/addPerson/uploadToTemporary",
+ "addFromAnalyUrl":"192.168.1.182:3699/data/api-c/taskUser/addFromAnaly",
+ "updateFromAnalyUrl":"192.168.1.182::3699/data/api-c/taskUser/updateFromC",
+ "addTaskAnalyUrl":"192.168.1.182:3699/addTaskByNode",
"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"
+ "redis_ip": "127.0.0.1",
+ "srsAddr": "rtmp://192.168.1.122:1934/live/",
+ "webPort": 11111
}
--
Gitblit v1.8.0