From 70a004b4a3ff211354f9a4aaaf21447e34f5cf27 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Wed, 28 Nov 2018 14:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9elasticsearch=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E9=85=8D=E7=BD=AE=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omms/adminapi/controller/settings/UISettingsController.java | 2 +-
 .../gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index 9da962c..ce0143d 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
@@ -134,7 +134,7 @@ public class UISettingsController {
 			
 			InetSocketAddress remoteAddress = userService.getUserRemoteAddress();
 			UserOptLog oplog = new UserOptLog(userService.getCurrentUserId(),userService.getCurrentUserName(), 
-				userService.getCurrentUserRealName(), null==remoteAddress?"未知":userService.getUserRemoteAddress().getHostString(),
+				userService.getCurrentUserRealName(), null==remoteAddress?"未知":remoteAddress.getHostString(),
 				System.currentTimeMillis());
 			oplog.setOpt_type(optType);
 			oplog.setLog_type(CommCode.LOG_TYPE_UISETTING);
diff --git a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java
index e8554e7..11a7b3e 100644
--- a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java
+++ b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchConfig.java
@@ -54,7 +54,7 @@ public class ElasticsearchConfig {
 			// 配置信息
 			Settings esSetting = Settings.builder()
 					.put("cluster.name", clusterName) // 集群名字
-//					.put("client.transport.sniff", true)// 增加嗅探机制，找到ES集群 只有在存在集群是才能开启嗅探
+//					.put("client.transport.sniff", true)// 增加嗅探机制，找到ES集群 (当前api无需嗅探，而且此处开启嗅探会导致链接失败)
 					.put("thread_pool.search.size", Integer.parseInt(poolSize))// 增加线程池个数，暂时设为5
 					.build();
 			// 配置信息Settings自定义