From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
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