From 0ad1516d29d13796ae2355d83b04cbc9a23cbc7d Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 15 三月 2019 09:49:32 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/FaceSearchServer/main.cpp | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/main.cpp b/QiaoJiaSystem/FaceSearchServer/main.cpp
index fa14be5..08ca7be 100644
--- a/QiaoJiaSystem/FaceSearchServer/main.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/main.cpp
@@ -1,4 +1,5 @@
//
+// 浜鸿劯瀵规瘮涓昏繘绋嬪叆鍙�
// Created by pans on 4/27/18.
//
#include <iostream>
@@ -14,7 +15,7 @@
using namespace std;
int main(int argc, char **argv) {
- std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
+ std::cout << __DATE__ << " " << __TIME__ << std::endl;
SAVE_APP_ARGS;
ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
auto ich = Ice::initialize(argc, argv);
@@ -26,6 +27,8 @@
// appPref.setStringData("ipAdd", "192.168.1.185");
// appPref.setIntData("ipPort", 9200);
+
+ //璁剧疆es涓婁紶ip鍜岀鍙�
appPref.setStringData("ipAdd", appConfig.getStringProperty("ES_IP"));
appPref.setIntData("ipPort", appConfig.getIntProperty("ES_PORT"));
--
Gitblit v1.8.0