From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/build/config.json | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index e494774..a9c652c 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,26 +1,28 @@
{
"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/bsk/Apps/QiaoJiaSystem/build/",
+ "buildAddr": "/home/pans/Apps/QiaoJiaSystem/build/",
"clusterID": "",
- "cutPath": "/home/bsk/work/qiaojia/cut",
+ "cutPath": "/home/pans/work/qiaojia/cut",
"encode_thread_num": 3,
"erlCookie": "123",
"erlFatherNode": " ",
- "erlNode": "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.148",
+ "erlNode": "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.187",
"erlPath": "/opt/erlang/f6d7d984-858e-4235-a657-644927b3a628",
- "loadPath": "/home/bsk/work/qiaojia/load",
+ "loadPath": "/home/pans/work/qiaojia/load",
"localPasswd": "123456",
- "logPath": "/home/bsk/work/log/",
+ "logPath": "/home/pans/work/log/",
"mainServerIp": "192.168.1.182",
"mainServerPort": "3697",
"mainServerrUrl": "/addPerson/uploadToTemporary",
"addFromAnalyUrl":"192.168.1.182:3699/data/api-c/taskUser/addFromAnaly",
- "netIfName": "enp3s0",
+ "updateFromAnalyUrl":"192.168.1.182::3699/data/api-c/taskUser/updateFromC",
+ "addTaskAnalyUrl":"192.168.1.182:3699/addTaskByNode",
+ "netIfName": "wlo1",
"redis_buf_len": 750,
"redis_ip": "127.0.0.1",
"srsAddr": "rtmp://192.168.1.122:1934/live/",
--
Gitblit v1.8.0