From c479a4053668e10fd983cb7b14e8765284f6d4e2 Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Thu, 29 Nov 2018 14:29:36 +0800
Subject: [PATCH] =?UTF-8?q?cgi=E6=8E=A5=E5=8F=A3=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/util/httpclient/HttpClientUtil.java   |  1 +
 .../configuration/UserManageService.java      | 19 +++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
index dcd2fa06c..77a6e6a10 100644
--- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
+++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
@@ -400,6 +400,7 @@ public class HttpClientUtil {
 			//获取响应结果
 			Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
 			response= header.get();
+			int status = response.getStatus();
 			result= response.readEntity(String.class);
 			logger.info("获取消息成功，相应内容如下： " + result);
 		} catch (Exception e) {
diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java
index 36c2fa89c..283902cdf 100644
--- a/src/main/java/com/nis/web/service/configuration/UserManageService.java
+++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java
@@ -54,7 +54,7 @@ public class UserManageService extends BaseService{
 				entity.setIsValid(Constants.VALID_NO);
 				userManageDao.insert(entity);
 		//cgi接口添加
-			/*String[] ipArray = entity.getServerIp().split(",");
+			String[] ipArray = entity.getServerIp().split(",");
 			for(String ip :ipArray){
 				//循环调用接口增加
 				Map<String, Object> params = new HashMap<String, Object>();
@@ -63,7 +63,7 @@ public class UserManageService extends BaseService{
 				params.put("user_pwd", entity.getUserPwd());
 				Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
 				//返回处理
-			 }*/
+			 }
 			} catch (MaatConvertException e) {
 				e.printStackTrace();
 				logger.info("获取编译ID出错");
@@ -78,7 +78,7 @@ public class UserManageService extends BaseService{
 			userManageDao.update(entity);
 			//cgi接口删除旧数据
 			String[] ipArray = olduser.getServerIp().split(",");
-			/*for(String ip :ipArray){
+			for(String ip :ipArray){
 				//循环调用接口删除
 				Map<String, Object> params = new HashMap<String, Object>();
 				params.put("server_ip", ip);
@@ -86,14 +86,14 @@ public class UserManageService extends BaseService{
 				Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
 				//返回处理
 				
-			}*/
+			}
 			if(StringUtil.isEmpty(entity.getUserName())){
 				entity.setUserName(olduser.getUserName());
 			}
 			if(StringUtil.isEmpty(entity.getUserPwd())){
 				entity.setUserPwd(olduser.getUserPwd());
 			}
-			/*String[] newIpArray = entity.getServerIp().split(",");
+			String[] newIpArray = entity.getServerIp().split(",");
 			for(String newIp :newIpArray){
 				//循环调用接口添加
 				Map<String, Object> params = new HashMap<String, Object>();
@@ -102,8 +102,7 @@ public class UserManageService extends BaseService{
 				params.put("user_pwd", entity.getUserPwd());
 				Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
 				//返回处理
-				
-		  }*/
+		  }
 		}catch (Exception e) {
 			e.printStackTrace();
 			logger.info("获取编译ID出错");
@@ -114,7 +113,7 @@ public class UserManageService extends BaseService{
 	public  Map<String,String> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
 		Map<String,String> map=new HashMap<String,String>();
 		try{ 
-			String url =Constants.IP_REUSE_CALL_CGI_URL+ Constants.NTC_IP_REUSE_USER_GET ;
+			String url =Constants.IP_REUSE_CALL_CGI_URL+ urlType ;
 			String recv = HttpClientUtil.getCGI(url, params, request);
 			logger.info("查询结果:" + recv);
 				if (StringUtils.isNotBlank(recv)) {
@@ -172,7 +171,7 @@ public class UserManageService extends BaseService{
 			userManageDao.update(entity);
 		}
 		//cgi接口删除旧数据
-		/*for (int i = 0; i < userList.size(); i++) {
+		for (int i = 0; i < userList.size(); i++) {
 			String[] ipArray = userList.get(i).getServerIp().split(",");
 			for(String ip :ipArray){
 				//循环调用接口删除
@@ -182,7 +181,7 @@ public class UserManageService extends BaseService{
 				Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
 				//返回处理
 			  }
-		   }*/
+		   }
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 	   }