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/configjson说明.md | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git "a/QiaoJiaSystem/build/configjson\350\257\264\346\230\216.md" "b/QiaoJiaSystem/build/configjson\350\257\264\346\230\216.md"
index a59efa6..0ddac1d 100644
--- "a/QiaoJiaSystem/build/configjson\350\257\264\346\230\216.md"
+++ "b/QiaoJiaSystem/build/configjson\350\257\264\346\230\216.md"
@@ -1,31 +1,34 @@
##json鏂囦欢妯℃澘鍙婂弬鏁板惈涔�
{
- "DEV_ID" : "DSVAD010120181119",
- "clusterID" : "",
- "webPort" : 11111,
- "netIfName" : "enp3s0",
- "localPasswd" : "123456",
- "ES_IP" : "192.168.1.122",
- "ES_PORT" : 9200,
- "mainServerIp" : "192.168.1.182",
- "mainServerPort" : "3697",
- "mainServerrUrl" : "/addPerson/uploadToTemporary",
- "TotalLoadSize" : "500",
- "buildAddr" : "/home/bsk/Apps/QiaoJiaSystem/build/",
- "cutPath" : "/home/bsk/work/qiaojia/cut",
- "loadPath" : "/home/bsk/work/qiaojia/load",
- "logPath" : "/home/bsk/work/log/",
- "FaceDetectionSampleSize" : 720,
- "FaceSeachSleepTime" : 60,
- "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",
- "redis_buf_len" : 750,
- "redis_ip" : "127.0.0.1",
- "srsAddr" : "rtmp://192.168.1.122:1934/live/"
+ "DEV_ID" : "DSVAD010120181119",
+ "clusterID" : "",
+ "webPort" : 11111,
+ "netIfName" : "enp3s0",
+ "localPasswd" : "123456",
+ "ES_IP" : "192.168.1.122",
+ "ES_PORT" : 9200,
+ "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",
+ "TotalLoadSize" : "500",
+ "buildAddr" : "/home/bsk/Apps/QiaoJiaSystem/build/",
+ "cutPath" : "/home/bsk/work/qiaojia/cut",
+ "loadPath" : "/home/bsk/work/qiaojia/load",
+ "logPath" : "/home/bsk/work/log/",
+ "FaceDetectionSampleSize" : 720,
+ "FaceSeachSleepTime" : 60,
+ "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",
+ "redis_buf_len" : 750,
+ "redis_ip" : "127.0.0.1",
+ "srsAddr" : "rtmp://192.168.1.122:1934/live/"
}
----
@@ -62,6 +65,15 @@
* mainServerrUrl
>浜哄憳涓婁紶鐨勬帴鍙rl
+
+* addFromAnalyUrl
+ >甯冩帶浜哄憳涓婁紶鐨勬帴鍙rl
+
+* updateFromAnalyUrl
+ >甯冩帶浜哄憳鏇存柊涓婁紶鐨勬帴鍙rl
+
+* addTaskAnalyUrl
+ >榛戝悕鍗曞簳搴撳垱寤哄拰鏇存柊鐨勪笂浼犳帴鍙rl
---
---
--
Gitblit v1.8.0