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 | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/QiaoJiaSystem/build/config.json b/QiaoJiaSystem/build/config.json
index 1763288..a9c652c 100755
--- a/QiaoJiaSystem/build/config.json
+++ b/QiaoJiaSystem/build/config.json
@@ -1,30 +1,30 @@
{
- "DEV_ID" : "DSVAD010120181119",
- "ES_IP" : "192.168.1.182",
- "ES_PORT" : 9200,
- "FaceDetectionSampleSize" : 720,
- "FaceSeachSleepTime" : 60,
- "TotalLoadSize" : "500",
- "addFromAnalyUrl" : "192.168.1.184:3699/data/api-c/taskUser/addFromAnaly",
- "addTaskAnalyUrl" : "192.168.1.184:3699/data/api-c/task/addTaskByNode",
- "buildAddr" : "/home/bsk/Apps/QiaoJiaSystem/build/",
- "clusterID" : "d26c8fdd-bcdc-4819-990f-d7b44068cd88",
- "cutPath" : "/home/bsk/work/qiaojia/cut",
- "encode_thread_num" : 3,
- "erlCookie" : "123",
- "erlFatherNode" : " ",
- "erlNode" : "a3d59031-0207-4475-be75-f22a5fe83d43@192.168.1.148",
- "erlPath" : "/opt/erlang/a3d59031-0207-4475-be75-f22a5fe83d43",
- "loadPath" : "/home/bsk/work/qiaojia/load",
- "localPasswd" : "123456",
- "logPath" : "/home/bsk/work/log/",
- "mainServerIp" : "192.168.1.182",
- "mainServerPort" : "3697",
- "mainServerrUrl" : "/addPerson/uploadToTemporary",
- "netIfName" : "enp3s0",
- "redis_buf_len" : 750,
- "redis_ip" : "127.0.0.1",
- "srsAddr" : "rtmp://192.168.1.122:1934/live/",
- "updateFromAnalyUrl" : "192.168.1.182::3699/data/api-c/taskUser/updateFromC",
- "webPort" : 11111
+ "DEV_ID": "DSVAD010120181119",
+ "ES_IP": "192.168.1.182",
+ "ES_PORT": 9200,
+ "FaceDetectionSampleSize": 720,
+ "FaceSeachSleepTime": 60,
+ "TotalLoadSize": "500",
+ "buildAddr": "/home/pans/Apps/QiaoJiaSystem/build/",
+ "clusterID": "",
+ "cutPath": "/home/pans/work/qiaojia/cut",
+ "encode_thread_num": 3,
+ "erlCookie": "123",
+ "erlFatherNode": " ",
+ "erlNode": "f6d7d984-858e-4235-a657-644927b3a628@192.168.1.187",
+ "erlPath": "/opt/erlang/f6d7d984-858e-4235-a657-644927b3a628",
+ "loadPath": "/home/pans/work/qiaojia/load",
+ "localPasswd": "123456",
+ "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",
+ "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/",
+ "webPort": 11111
}
--
Gitblit v1.8.0