diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index 97442a0d3..68d9565e4 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -373,4 +373,53 @@ public class HttpClientUtil { // // } + /** + * CGI get 获取消息 + * @param destUrl 业务地址 + * @param params 参数列表 + * @return 查询结果数据json + */ + public static String getCGI(String destUrl, Map params, HttpServletRequest req) throws IOException { + String result = null; + Response response=null; + String url = ""; + try { + URIBuilder uriBuilder = new URIBuilder(destUrl); + if(params!=null) { + for (String param : params.keySet()) { + if(!StringUtil.isBlank(param)&¶ms.get(param)!=null) { + uriBuilder.addParameter(param, params.get(param).toString()); + } + } + } + System.err.println(uriBuilder); + url=uriBuilder.toString(); + //创建连接 + WebTarget wt = ClientUtil.getWebTarger(url); + logger.info("getMsg url:"+url); + //获取响应结果 + Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); + response= header.get(); + int status = response.getStatus(); + if (status == HttpStatus.SC_OK) { + result= response.readEntity(String.class); + result = galaxyMessageFormat(result); + logger.info("获取消息成功，相应内容如下： " + result); + + } else { + logger.error("获取消息失败，相应内容如下： " + result); + throw new MaatConvertException(status+""); + } + } catch (Exception e) { + e.printStackTrace(); + logger.error("获取消息失败，相应内容如下： " + result); + logger.error("获取消息失败 ", e); + throw new MaatConvertException(":"); + }finally { + if (response != null) { + response.close(); + } + } + return result; + } } diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java index d3f0728f3..df0b54fcb 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java @@ -57,9 +57,9 @@ public class UserManageController extends BaseController{ @RequiresPermissions(value={"user:manage:config"}) public String delete(Integer isValid ,String ids - ,RedirectAttributes redirectAttributes){ + ,RedirectAttributes redirectAttributes,HttpServletRequest request){ try{ - userManageService.delete(isValid,ids); + userManageService.delete(isValid,ids,request); addMessage(redirectAttributes,"delete_success"); }catch(Exception e){ logger.error("Delete failed",e); @@ -151,17 +151,16 @@ public class UserManageController extends BaseController{ UserManage user=new UserManage(); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip); //根据ip调用接口获取数据 - //user=userManageService.getUserList(ip, request); + //user=userManageService.getUser(ip, request); if(ipReuseIpCfg!=null){ user.setServerIp(ipReuseIpCfg.getDestIpAddress()); - user.setRemarks(ipReuseIpCfg.getCfgDesc()); userManageList.add(user); } } return userManageList; } - @RequestMapping(value = "view") +/* @RequestMapping(value = "view") @RequiresPermissions(value={"user:manage:config"}) public String view(String serverIp,String userName,HttpServletResponse response,Model model){ UserManage user=new UserManage(); @@ -174,5 +173,5 @@ public class UserManageController extends BaseController{ } model.addAttribute("user", user); return "/cfg/maintenance/userManage/userView"; - } + }*/ } 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 6da3f6346..6de5cb043 100644 --- a/src/main/java/com/nis/web/service/configuration/UserManageService.java +++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java @@ -65,19 +65,29 @@ public class UserManageService extends BaseService{ entity.setCreatorId(entity.getCurrentUser().getId()); entity.setIsValid(Constants.VALID_NO); userManageDao.insert(entity); - } catch (MaatConvertException e) { - e.printStackTrace(); - logger.info("获取编译ID出错"); - throw new MaatConvertException(""); - } //cgi接口添加 /*String[] ipArray = entity.getServerIp().split(","); for(String ip :ipArray){ //循环调用接口增加 + Map params = new HashMap(); + params.put("server_ip", ip); + params.put("user_name", entity.getUserName()); + params.put("user_pwd", entity.getUserPwd()); + LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); + //返回处理 + if (fromJson.getStatus().intValue() == 200) { + }else{ + } String url="?cmd=UserCreate&server_ip="+ip+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd(); System.out.println(url); - }*/ + }*/ + } catch (MaatConvertException e) { + e.printStackTrace(); + logger.info("获取编译ID出错"); + throw new MaatConvertException(""); + } }else{ + try { entity.setEditTime(createTime); entity.setEditorId(entity.getCurrentUser().getId()); //获取修改之前数据 @@ -87,8 +97,14 @@ public class UserManageService extends BaseService{ /*String[] ipArray = olduser.getServerIp().split(","); for(String ip :ipArray){ //循环调用接口删除 - String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+olduser.getUserName(); - System.out.println(url); + Map params = new HashMap(); + params.put("server_ip", ip); + params.put("user_name", olduser.getUserName()); + LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); + //返回处理 + if (fromJson.getStatus().intValue() == 200) { + }else{ + } }*/ if(StringUtil.isEmpty(entity.getUserName())){ entity.setUserName(olduser.getUserName()); @@ -96,59 +112,65 @@ public class UserManageService extends BaseService{ if(StringUtil.isEmpty(entity.getUserPwd())){ entity.setUserPwd(olduser.getUserPwd()); } - /*String[] newIpArray = entity.getServerIp().split(","); + /* String[] newIpArray = entity.getServerIp().split(","); for(String newIp :newIpArray){ //循环调用接口添加 - String url="?cmd=UserCreate&server_ip="+newIp+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd(); - System.out.println(url); - }*/ + Map params = new HashMap(); + params.put("server_ip", newIp); + params.put("user_name", entity.getUserName()); + params.put("user_pwd", entity.getUserPwd()); + LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); + //返回处理 + if (fromJson.getStatus().intValue() == 200) { + }else{ + } + }*/ + }catch (Exception e) { + e.printStackTrace(); + logger.info("获取编译ID出错"); + throw new MaatConvertException(""); + } + } + } + public LogRecvData getUrl(Map params,String urlType,HttpServletRequest request){ + LogRecvData fromJson = new LogRecvData(); + try{ + String url ="URL"+ urlType ; + String recv = HttpClientUtil.getCGI(url, params, request); + logger.info("查询结果:" + recv); + if (StringUtils.isNotBlank(recv)) { + Gson gson = new GsonBuilder().create(); + fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + } + } catch (Exception e) { + logger.error("查询失败", e); } + return fromJson; } - //根据vpn服务器ip获取用户vpn服务器ip信息 +/* //根据vpn服务器ip获取用户vpn服务器ip信息 public UserManage getUser(String serverIp,HttpServletRequest request){ UserManage user=new UserManage(); Map params = new HashMap(); params.put("server_ip", serverIp); try{ - String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST; - String recv = HttpClientUtil.getMsg(url, params, request); + String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST ; + //String recv = HttpClientUtil.getCGI(url, params, request); + String recv="{\"data\":{\"list\":[{\"userName\":\"zhangsan\",\"createOn\":\"2018-11-01 14:51:12 \",\"updatedOn\":\"2018-11-02 10:54:07 \",\"outgoingUnicastPackets\":\"537,962\",\"outgoingUnicastTotalSize\":\"278,885\",\"outgoingBroadcastPackets\":\"51,130,890\"" + + ",\"outgoingBroadcastTotalSize\":\"4781,154\",\"incomingUnicastPackets\":\"454,121\",\"incomingUnicastTotalSize\":\"45,565\",\"incomingBroadcastPackets\":\"454,4545\"" + + ",\"incomingBroadcastTotalSize\":\"4781,154\",\"numberOfLogins\":\"124\"}]}}"; + recv=HttpClientUtil.galaxyMessageFormat(recv); logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); - if (fromJson.getStatus().intValue() == 200) { - - } + user=fromJson.getData().getList().get(0); } } catch (Exception e) { logger.error("查询失败", e); } return user; - } - - //根据vpn服务器ip,用户名获取用户信息 - public UserManage getUserManage(String serverIp,String userName,HttpServletRequest request){ - UserManage user=new UserManage(); - Map params = new HashMap(); - params.put("server_ip", serverIp); - params.put("user_name", userName); - try{ - String url ="URL"+ Constants.NTC_IP_REUSE_USER_GET; - String recv = HttpClientUtil.getMsg(url, params, request); - logger.info("查询结果:" + recv); - if (StringUtils.isNotBlank(recv)) { - Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); - if (fromJson.getStatus().intValue() == 200) { - - } - } - } catch (Exception e) { - logger.error("查询失败", e); - } - return user; - } + }*/ /** * * @param isAudit @@ -156,7 +178,8 @@ public class UserManageService extends BaseService{ * @param ids compileIds */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) - public void delete(Integer isValid,String ids){ + public void delete(Integer isValid,String ids,HttpServletRequest request){ + /*try{*/ String[] idArray = ids.split(","); List userList=new ArrayList(); for(String id :idArray){ @@ -172,16 +195,27 @@ 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){ //循环调用接口删除 - String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+userList.get(i).getUserName(); - System.out.println(url); + Map params = new HashMap(); + params.put("server_ip", ip); + params.put("user_name",userList.get(i).getUserName()); + LogRecvData fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); + //返回处理 + if (fromJson.getStatus().intValue() == 200) { + }else{ + } } } - } + } catch (Exception e) { + logger.error("查询失败", e); + }*/ + } + public List findUsers() { return userManageDao.findUsers(); } } + diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index b65141967..27e3adcc3 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1319,14 +1319,14 @@ transfer_bytes=\u4F20\u8F93\u6570\u636E\u5B57\u8282 user_info=\u7528\u6237\u4FE1\u606F user_list=\u7528\u6237\u5217\u8868 equal_password=\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF01 -outgoing_unicast_packets=\u8F93\u51FA\u5355\u5305 -outgoing_unicast_total_size=\u8F93\u51FA\u5355\u64AD\u603B\u5927\u5C0F -outgoing_broadcast_packets=\u8F93\u51FA\u5E7F\u64AD\u6570\u636E\u5305 -outgoing_broadcast_total_size=\u8F93\u51FA\u5E7F\u64AD\u603B\u5927\u5C0F -incoming_unicast_packets=\u8F93\u5165\u5355\u5305 -incoming_unicast_total_size=\u8F93\u5165\u5355\u64AD\u603B\u5927\u5C0F -incoming_broadcast_packets=\u8F93\u5165\u5E7F\u64AD\u6570\u636E\u5305 -incoming_broadcast_total_size=\u8F93\u5165\u5E7F\u64AD\u603B\u5927\u5C0F +outgoing_unicast_packets=\u4E0A\u4F20\u6570\u636E\u5305\u6570 +outgoing_unicast_total_size=\u4E0A\u4F20\u6570\u636E\u5305\u6570\u603B\u91CF +outgoing_broadcast_packets=\u4E0A\u4F20\u5B57\u8282\u6570 +outgoing_broadcast_total_size=\u4E0A\u4F20\u5B57\u8282\u6570\u603B\u91CF +incoming_unicast_packets=\u4E0B\u8F7D\u6570\u636E\u5305\u6570 +incoming_unicast_total_size=\u4E0B\u8F7D\u6570\u636E\u5305\u6570\u603B\u91CF +incoming_broadcast_packets=\u4E0B\u8F7D\u5B57\u8282\u6570 +incoming_broadcast_total_size=\u4E0B\u8F7D\u5B57\u8282\u6570\u603B\u91CF address_pool=\u5730\u5740\u6C60 ip_total=IP\u603B\u6570 available_ip_total=\u53EF\u7528IP\u6570 diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp new file mode 100644 index 000000000..c7b484e50 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp @@ -0,0 +1,69 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + - - -<%@include file="/WEB-INF/include/excel/importModal.jsp" %> -
-
- - X -
-
- - - - - - - - - - - -
-
-
- -
-
- -
-
- - X -
- - - - - - - - - - - -
    
     - - *
-
- - -
-
-
+ +<%@include file="/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp" %> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp index 731fdf38b..eab35e74c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -203,7 +203,7 @@
- <%--
+
@@ -263,7 +263,7 @@
-
--%> +