Merge svn 3352

pansen

2019-01-10 ffa3485e9d36911f3b6aeac7ddbcca61c3e3dde6

 QiaoJiaSystem/build/config.json

old mode 100644
new mode 100755
@@ -1,6 +1,5 @@
{
  "FaceDetectionSampleSize": 720,
  "mainServerIp": "192.168.1.203",
  "mainServerIp": "192.168.1.182",
  "mainServerPort": "3697",
  "logPath": "/home/dell/work/log/",
  "DEV_ID": "DSVAD010120181119",
@@ -16,9 +15,11 @@
  "erlPath": "",
  "loadPath": "/home/dell/work/qiaojia/load",
  "localPasswd": "123456",
  "netIfName": "eno1",
  "netIfName": "enp3s0",
  "srsAddr": "rtmp://192.168.1.122:1934/live/",
  "webPort": 11111,
  "redis_ip": "127.0.0.1",
  "redis_buf_len": 750
  "redis_buf_len": 750,
  "encode_thread_num": 3,
  "FaceDetectionSampleSize": 720
}