From 745713979b4b509dac69b7099338126b5463112d Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Wed, 12 Sep 2018 17:30:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=9C=8D=E5=8A=A1=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/httpclient/HttpClientUtil.java | 6 ++++--
 src/main/java/com/nis/web/controller/BaseController.java  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
index e07445cf0..b90f86caf 100644
--- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
+++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
@@ -222,9 +222,10 @@ public class HttpClientUtil {
 //				result = EntityUtils.toString(response.getEntity());
 				//调用处理数据方法
 				result = galaxyMessageFormat(result);
-				logger.debug("获取消息成功，相应内容如下： " + result);
+				logger.info("获取消息成功，相应内容如下： " + result);
 				
 			} else {
+				logger.error("获取消息失败，相应内容如下： " + result);
 				throw new MaatConvertException(status+"");
 			}
 		} /*catch (SocketTimeoutException e) {
@@ -237,8 +238,9 @@ public class HttpClientUtil {
 			throw new MaatConvertException(requestContext.getMessage("request_service_failed") + ":timeout");
 		}*/ catch (Exception e) {
 			e.printStackTrace();
+			logger.error("获取消息失败，相应内容如下： " + result);
 			logger.error("获取消息失败 ", e);
-			throw new MaatConvertException(requestContext.getMessage("request_service_failed"));
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
 		} /*finally {
 			try {
 				if (response != null) {
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 94c69a02e..537c83f8a 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -271,6 +271,8 @@ public class BaseController {
 				messages="data_format_error";
 			}else if("500".equals(status)){
 				messages="server_internal_error";
+			}else if(status.indexOf("request_service_failed")!=-1){
+				messages="server_internal_error";
 			}
 		}
 		model.addAttribute("message",messages);