From 7c3bd5be42ffaa62747aff75afffb62254357f21 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期三, 20 三月 2019 10:57:41 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug

---
 QiaoJiaSystem/FaceSearchServer/main.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/FaceSearchServer/main.cpp b/QiaoJiaSystem/FaceSearchServer/main.cpp
index 06d46ae..238090d 100644
--- a/QiaoJiaSystem/FaceSearchServer/main.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -27,7 +27,8 @@
         assert("t_value.size()");
     }
     appPref.setIntData("RpcFSPort", atoi(argv[1]));
-    appPref.setIntData("thread.max", atoi(argv[2]));//绾跨▼姹犲ぇ灏�
+    appPref.setIntData("ErlNodePort", atoi(argv[2]));
+    appPref.setIntData("thread.max", atoi(argv[3]));//绾跨▼姹犲ぇ灏�
 
     appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
     appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));

--
Gitblit v1.8.0