gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cgi接口调整

Browse Source
This commit is contained in:
leijun
2018-11-29 14:06:47 +08:00
parent 7eececadca
commit 4edab49209
6 changed files with 60 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/java/com/nis/domain/configuration/UserManage.java
View File

@@ -28,8 +28,7 @@ public class UserManage extends BaseEntity<UserManage>{
private String newUserPwd; private String newUserPwd;
private String oldUserName;//原用户名 private String oldUserName;//原用户名
//用户名详细信息 //用户名详细信息
private String authType; /* private Date createOn;
private Date createOn;
private Date updatedOn; private Date updatedOn;
private String outgoingUnicastPackets; private String outgoingUnicastPackets;
private String outgoingUnicastTotalSize; private String outgoingUnicastTotalSize;
@@ -39,7 +38,7 @@ public class UserManage extends BaseEntity<UserManage>{
private String incomingUnicastTotalSize; private String incomingUnicastTotalSize;
private String incomingBroadcastPackets; private String incomingBroadcastPackets;
private String incomingBroadcastTotalSize; private String incomingBroadcastTotalSize;
private Integer numberOfLogins; private Integer numberOfLogins;*/
private String creatorName; private String creatorName;
private String editorName; private String editorName;
@@ -211,79 +210,6 @@ public class UserManage extends BaseEntity<UserManage>{
public void setTransferPackets(String transferPackets) { public void setTransferPackets(String transferPackets) {
this.transferPackets = transferPackets; this.transferPackets = transferPackets;
} }
public String getAuthType() {
return authType;
}
public void setAuthType(String authType) {
this.authType = authType;
}
public Date getCreateOn() {
return createOn;
}
public void setCreateOn(Date createOn) {
this.createOn = createOn;
}
public Date getUpdatedOn() {
return updatedOn;
}
public void setUpdatedOn(Date updatedOn) {
this.updatedOn = updatedOn;
}
public String getOutgoingUnicastPackets() {
return outgoingUnicastPackets;
}
public void setOutgoingUnicastPackets(String outgoingUnicastPackets) {
this.outgoingUnicastPackets = outgoingUnicastPackets;
}
public String getOutgoingUnicastTotalSize() {
return outgoingUnicastTotalSize;
}
public void setOutgoingUnicastTotalSize(String outgoingUnicastTotalSize) {
this.outgoingUnicastTotalSize = outgoingUnicastTotalSize;
}
public String getOutgoingBroadcastPackets() {
return outgoingBroadcastPackets;
}
public void setOutgoingBroadcastPackets(String outgoingBroadcastPackets) {
this.outgoingBroadcastPackets = outgoingBroadcastPackets;
}
public String getOutgoingBroadcastTotalSize() {
return outgoingBroadcastTotalSize;
}
public void setOutgoingBroadcastTotalSize(String outgoingBroadcastTotalSize) {
this.outgoingBroadcastTotalSize = outgoingBroadcastTotalSize;
}
public String getIncomingUnicastPackets() {
return incomingUnicastPackets;
}
public void setIncomingUnicastPackets(String incomingUnicastPackets) {
this.incomingUnicastPackets = incomingUnicastPackets;
}
public String getIncomingUnicastTotalSize() {
return incomingUnicastTotalSize;
}
public void setIncomingUnicastTotalSize(String incomingUnicastTotalSize) {
this.incomingUnicastTotalSize = incomingUnicastTotalSize;
}
public String getIncomingBroadcastPackets() {
return incomingBroadcastPackets;
}
public void setIncomingBroadcastPackets(String incomingBroadcastPackets) {
this.incomingBroadcastPackets = incomingBroadcastPackets;
}
public String getIncomingBroadcastTotalSize() {
return incomingBroadcastTotalSize;
}
public void setIncomingBroadcastTotalSize(String incomingBroadcastTotalSize) {
this.incomingBroadcastTotalSize = incomingBroadcastTotalSize;
}
public Integer getNumberOfLogins() {
return numberOfLogins;
}
public void setNumberOfLogins(Integer numberOfLogins) {
this.numberOfLogins = numberOfLogins;
}
public static String getTablename() { public static String getTablename() {
return tableName; return tableName;
} }

12
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -400,16 +400,8 @@ public class HttpClientUtil {
//获取响应结果 //获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON); Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
response= header.get(); response= header.get();
int status = response.getStatus(); result= response.readEntity(String.class);
if (status == HttpStatus.SC_OK) { logger.info("获取消息成功，相应内容如下： " + result);
result= response.readEntity(String.class);
result = galaxyMessageFormat(result);
logger.info("获取消息成功，相应内容如下： " + result);
} else {
logger.error("获取消息失败，相应内容如下： " + result);
throw new MaatConvertException(status+"");
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.error("获取消息失败，相应内容如下： " + result); logger.error("获取消息失败，相应内容如下： " + result);

13
src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
View File

@@ -1,6 +1,7 @@
package com.nis.web.controller.configuration.maintenance; package com.nis.web.controller.configuration.maintenance;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -144,17 +145,17 @@ public class UserManageController extends BaseController{
@ResponseBody @ResponseBody
@RequestMapping(value = "userInfo") @RequestMapping(value = "userInfo")
public List<UserManage> getUserInfo(String serverIp,HttpServletRequest request,HttpServletResponse response){ public List<Map<String,String>> getUserInfo(String serverIp,String userName,HttpServletRequest request,HttpServletResponse response){
String[] ipArray = serverIp.split(","); String[] ipArray = serverIp.split(",");
List<UserManage> userManageList=new ArrayList<UserManage>(); List<Map<String,String>> userManageList=new ArrayList<Map<String,String>>();
for(String ip :ipArray){ for(String ip :ipArray){
UserManage user=new UserManage(); UserManage user=new UserManage();
IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip); IpReuseIpCfg ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
//根据ip调用接口获取数据 //根据ip调用接口获取数据
//user=userManageService.getUser(ip, request); Map<String,String> map=userManageService.getUser(ip,userName, request);
if(ipReuseIpCfg!=null){ if(ipReuseIpCfg!=null ){
user.setServerIp(ipReuseIpCfg.getDestIpAddress()); map.put("serverIp", ipReuseIpCfg.getDestIpAddress());
userManageList.add(user); userManageList.add(map);
} }
} }
return userManageList; return userManageList;

96
src/main/java/com/nis/web/service/configuration/UserManageService.java
View File

@@ -7,28 +7,16 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.eclipse.jetty.util.ajax.JSON;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page; import com.nis.domain.Page;
import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.configuration.UserManage; import com.nis.domain.configuration.UserManage;
import com.nis.domain.log.NtcIpLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.maat.MaatCfg;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.exceptions.MaatConvertException; import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil; import com.nis.util.httpclient.HttpClientUtil;
@@ -73,13 +61,8 @@ public class UserManageService extends BaseService{
params.put("server_ip", ip); params.put("server_ip", ip);
params.put("user_name", entity.getUserName()); params.put("user_name", entity.getUserName());
params.put("user_pwd", entity.getUserPwd()); params.put("user_pwd", entity.getUserPwd());
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); Map<String,String> map=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) { } catch (MaatConvertException e) {
e.printStackTrace(); e.printStackTrace();
@@ -94,17 +77,15 @@ public class UserManageService extends BaseService{
UserManage olduser=userManageDao.getUserById(String.valueOf(entity.getId())); UserManage olduser=userManageDao.getUserById(String.valueOf(entity.getId()));
userManageDao.update(entity); userManageDao.update(entity);
//cgi接口删除旧数据 //cgi接口删除旧数据
/*String[] ipArray = olduser.getServerIp().split(","); String[] ipArray = olduser.getServerIp().split(",");
for(String ip :ipArray){ /*for(String ip :ipArray){
//循环调用接口删除 //循环调用接口删除
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", ip); params.put("server_ip", ip);
params.put("user_name", olduser.getUserName()); params.put("user_name", olduser.getUserName());
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
//返回处理 //返回处理
if (fromJson.getStatus().intValue() == 200) {
}else{
}
}*/ }*/
if(StringUtil.isEmpty(entity.getUserName())){ if(StringUtil.isEmpty(entity.getUserName())){
entity.setUserName(olduser.getUserName()); entity.setUserName(olduser.getUserName());
@@ -112,18 +93,16 @@ public class UserManageService extends BaseService{
if(StringUtil.isEmpty(entity.getUserPwd())){ if(StringUtil.isEmpty(entity.getUserPwd())){
entity.setUserPwd(olduser.getUserPwd()); entity.setUserPwd(olduser.getUserPwd());
} }
/* String[] newIpArray = entity.getServerIp().split(","); /*String[] newIpArray = entity.getServerIp().split(",");
for(String newIp :newIpArray){ for(String newIp :newIpArray){
//循环调用接口添加 //循环调用接口添加
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", newIp); params.put("server_ip", newIp);
params.put("user_name", entity.getUserName()); params.put("user_name", entity.getUserName());
params.put("user_pwd", entity.getUserPwd()); params.put("user_pwd", entity.getUserPwd());
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request); Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
//返回处理 //返回处理
if (fromJson.getStatus().intValue() == 200) {
}else{
}
}*/ }*/
}catch (Exception e) { }catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@@ -132,45 +111,43 @@ public class UserManageService extends BaseService{
} }
} }
} }
public LogRecvData<UserManage> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){ public Map<String,String> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
LogRecvData<UserManage> fromJson = new LogRecvData<UserManage>(); Map<String,String> map=new HashMap<String,String>();
try{ try{
String url ="URL"+ urlType ; String url =Constants.IP_REUSE_CALL_CGI_URL+ Constants.NTC_IP_REUSE_USER_GET ;
String recv = HttpClientUtil.getCGI(url, params, request); String recv = HttpClientUtil.getCGI(url, params, request);
logger.info("查询结果:" + recv); logger.info("查询结果:" + recv);
if (StringUtils.isNotBlank(recv)) { if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create(); map=(Map<String,String>)JSON.parse(recv);
fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("查询失败", e); logger.error("查询失败", e);
} }
return fromJson; return map;
} }
/* //根据vpn服务器ip获取用户vpn服务器ip信息 //根据vpn服务器ip获取用户vpn服务器ip信息
public UserManage getUser(String serverIp,HttpServletRequest request){ public Map<String,String> getUser(String serverIp,String userName,HttpServletRequest request){
UserManage user=new UserManage();
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", serverIp); params.put("server_ip", serverIp);
params.put("user_name", userName);
Map<String,String> map=new HashMap<String,String>();
try{ try{
String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST ; String url =Constants.IP_REUSE_CALL_CGI_URL+ Constants.NTC_IP_REUSE_USER_GET ;
//String recv = HttpClientUtil.getCGI(url, params, request); 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); logger.info("查询结果:" + recv);
if (StringUtils.isNotBlank(recv)) { if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create(); map=(Map<String,String>)JSON.parse(recv);
LogRecvData<UserManage> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
user=fromJson.getData().getList().get(0);
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("查询失败", e); logger.error("查询失败", e);
} }
return user; return map;
}*/ }
/** /**
* *
* @param isAudit * @param isAudit
@@ -179,7 +156,7 @@ public class UserManageService extends BaseService{
*/ */
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void delete(Integer isValid,String ids,HttpServletRequest request){ public void delete(Integer isValid,String ids,HttpServletRequest request){
/*try{*/ try{
String[] idArray = ids.split(","); String[] idArray = ids.split(",");
List<UserManage> userList=new ArrayList<UserManage>(); List<UserManage> userList=new ArrayList<UserManage>();
for(String id :idArray){ for(String id :idArray){
@@ -195,23 +172,20 @@ public class UserManageService extends BaseService{
userManageDao.update(entity); userManageDao.update(entity);
} }
//cgi接口删除旧数据 //cgi接口删除旧数据
/* for (int i = 0; i < userList.size(); i++) { /*for (int i = 0; i < userList.size(); i++) {
String[] ipArray = userList.get(i).getServerIp().split(","); String[] ipArray = userList.get(i).getServerIp().split(",");
for(String ip :ipArray){ for(String ip :ipArray){
//循环调用接口删除 //循环调用接口删除
Map<String, Object> params = new HashMap<String, Object>(); Map<String, Object> params = new HashMap<String, Object>();
params.put("server_ip", ip); params.put("server_ip", ip);
params.put("user_name",userList.get(i).getUserName()); params.put("user_name",userList.get(i).getUserName());
LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request); Map<String,String> map=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
//返回处理 //返回处理
if (fromJson.getStatus().intValue() == 200) { }
}else{ }*/
} } catch (Exception e) {
} logger.error("查询失败", e);
} }
} catch (Exception e) {
logger.error("查询失败", e);
}*/
} }
public List<UserManage> findUsers() { public List<UserManage> findUsers() {

1
src/main/resources/nis.properties
View File

@@ -565,3 +565,4 @@ userPasswordSet=UserPasswordSet
userDelete=UserDelete userDelete=UserDelete
userGet=UserGet userGet=UserGet
userList=UserList userList=UserList
ip_reuse_call_cgi_url=http://192.168.11.137:8090/command/?cmd=

24
src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
View File

@@ -51,7 +51,7 @@
$.ajax({ $.ajax({
type:'post', type:'post',
url:'${ctx}/maintenance/userManage/userInfo', url:'${ctx}/maintenance/userManage/userInfo',
data:{"serverIp":serverIp}, data:{"serverIp":serverIp,"userName":userName},
dataType:'json', dataType:'json',
async:false, async:false,
success:function(data){ success:function(data){
@@ -73,27 +73,27 @@
html+="</td>"; html+="</td>";
} }
html+="<td class='taskStatus'>"+data[i].serverIp+"</td>"; html+="<td class='taskStatus'>"+data[i].serverIp+"</td>";
html+="<td class='taskStatus'>"+(data[i].createOn==null?"":data[i].createOn); html+="<td class='taskStatus'>"+(data[i].Create_on==null?"":data[i].Create_on);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].updatedOn==null?"":data[i].updatedOn); html+="<td class='taskStatus'>"+(data[i].Updated_on==null?"":data[i].Updated_on);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].numberOfLogins==null?"":data[i].numberOfLogins); html+="<td class='taskStatus'>"+(data[i].Number_of_Logins==null?"":data[i].Number_of_Logins);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].outgoingUnicastPackets==null?"":data[i].outgoingUnicastPackets); html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Packets==null?"":data[i].Outgoing_Unicast_Packets);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].outgoingUnicastTotalSize==null?"":data[i].outgoingUnicastTotalSize); html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].outgoingBroadcastPackets==null?"":data[i].outgoingBroadcastPackets); html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].outgoingBroadcastTotalSize==null?"":data[i].outgoingBroadcastTotalSize); html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].incomingUnicastPackets==null?"":data[i].incomingUnicastPackets); html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].incomingUnicastTotalSize==null?"":data[i].incomingUnicastTotalSize); html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].incomingBroadcastPackets==null?"":data[i].incomingBroadcastPackets); html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
html+="</td>"; html+="</td>";
html+="<td class='taskStatus'>"+(data[i].incomingBroadcastTotalSize==null?"":data[i].incomingBroadcastTotalSize); html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Total_Size==null?"":data[i].Incoming_Broadcast_Total_Size);
html+="</td>"; html+="</td>";
html+="</tr>"; html+="</tr>";
} }