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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
duandongmei
2019-01-16 17:02:39 +06:00
parent dc13216c0a a1e370be03
commit 45efcc0072
28 changed files with 1573 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/nis/domain/configuration/IpReuseDnatPolicyCfg.java
View File

@@ -40,7 +40,7 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
@Expose
@SerializedName("translatedDestIp")
@ExcelField(title="translated_dest_ip",sort=6)
//@ExcelField(title="translated_dest_ip",sort=6)
private String destIpAddress;
@Expose
@@ -54,8 +54,31 @@ public class IpReuseDnatPolicyCfg extends IpPortCfg{
@Expose
@SerializedName("effectiveRange")
private String areaEffectiveIds;
@ExcelField(title="user",sort=10)
@Expose
private String translatedUserId;
@Expose
@ExcelField(title="user_type",sort=9)
private String translatedUserType;
public String getTranslatedUserId() {
return translatedUserId;
}
public void setTranslatedUserId(String translatedUserId) {
this.translatedUserId = translatedUserId;
}
public String getTranslatedUserType() {
return translatedUserType;
}
public void setTranslatedUserType(String translatedUserType) {
this.translatedUserType = translatedUserType;
}
public String getIndexTable() {
return indexTable;
}

2
src/main/java/com/nis/domain/configuration/IpReusePolicyCfg.java
View File

@@ -36,7 +36,7 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
private Integer ipType;
private Integer ipPattern;
@ExcelField(title="ip",sort=6)
//@ExcelField(title="ip",sort=6)
private String srcIpAddress;
private String destIpAddress;
@Expose

22
src/main/java/com/nis/domain/dashboard/NtcRadiusReport.java
View File

@@ -1,14 +1,20 @@
package com.nis.domain.dashboard;
import java.io.Serializable;
import javax.xml.bind.annotation.XmlTransient;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
import com.google.gson.annotations.SerializedName;
import com.nis.domain.Page;
import com.nis.util.excel.ExcelField;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcRadiusReport {
public class NtcRadiusReport<T> implements Serializable {
private static final long serialVersionUID = -1434148698159286062L;
// @JsonInclude(value = Include.NON_NULL)
// @ApiModelProperty(value = "接入IP", required = true)
@ExcelField(title = "ip_address_control", sort = 2)
@@ -40,6 +46,8 @@ public class NtcRadiusReport {
protected String searchNasIp;
protected String searchAccount;
protected String groupType;
protected Page<T> page;
public String getNasIp() {
return nasIp;
@@ -146,5 +154,17 @@ public class NtcRadiusReport {
public void setGroupType(String groupType) {
this.groupType = groupType;
}
@JsonIgnore
@XmlTransient
public Page<T> getPage() {
if (page == null) {
page = new Page<T>();
}
return page;
}
public Page<T> setPage(Page<T> page) {
this.page = page;
return page;
}
}

637
src/main/java/com/nis/domain/dashboard/PageDashboard.java Normal file
View File

@@ -0,0 +1,637 @@
/**
* Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
*/
package com.nis.domain.dashboard;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.servlet.support.RequestContext;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.CookieUtil;
/**
* 分页类
* @author ThinkGem
* @version 2013-7-2
* @param <T>
*/
public class PageDashboard<T> {
private int pageNo = 1; // 当前页码
private int pageSize = Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)); // 页面大小，设置为“-1”表示不进行分页（分页无效）
private long count;// 总记录数，设置为“-1”表示不查询总数
private int first;// 首页索引
// private int last;// 尾页索引
private int prev;// 上一页索引
private int next;// 下一页索引
private boolean firstPage;//是否是第一页
private boolean lastPage;//是否是最后一页
// private int length = 8;// 显示页面长度
// private int slider = 1;// 前后显示页面长度
private List<T> list = new ArrayList<T>();
private String orderBy = ""; // 标准查询有效， 实例： updatedate desc, name asc
private String fields;//制定资源的字段
private String where;
private String alias;
private String funcName = "page"; // 设置点击页码调用的js函数名称，默认为page，在一页有多个分页对象时使用。
private String funcParam = ""; // 函数的附加参数，第三个参数值。
private String message = ""; // 设置提示消息，显示在“共n条”之后
private RequestContext requestContext;
private int maxExportSize=Constants.MAX_EXPORT_SIZE;
public PageDashboard() {
this.pageSize = -1;
}
/**
* 构造方法
* @param request 传递 repage 参数，来记住页码
* @param response 用于设置 Cookie，记住页码
*/
public PageDashboard(HttpServletRequest request, HttpServletResponse response){
this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)));
}
public PageDashboard(HttpServletRequest request, HttpServletResponse response,String alias){
this(request, response, Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30)),alias);
}
public PageDashboard(HttpServletRequest request, HttpServletResponse response, int defaultPageSize,String alias){
this.setAlias(alias);
this.initPage(request, response, defaultPageSize);
}
public PageDashboard(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
this.initPage(request, response, defaultPageSize);
}
private void initPage(HttpServletRequest request, HttpServletResponse response, int defaultPageSize){
try {
this.requestContext = new RequestContext(request);
// 设置页码参数（传递repage参数，来记住页码）
String no = request.getParameter("pageNo");
if (StringUtils.isNotBlank(no)) {
if (StringUtils.isNumeric(no)){
CookieUtil.addCookie(response, "pageNo", no);
this.setPageNo(Integer.parseInt(no));
}else if (request.getParameter("repage")!=null){
no = CookieUtil.getValue(request, "pageNo");
if (StringUtils.isNumeric(no)){
this.setPageNo(Integer.parseInt(no));
}
}
}
// 设置页面大小参数（传递repage参数，来记住页码大小）
String size = "";
if(defaultPageSize==-1){
size = "-1";
}else{
size = request.getParameter("pageSize");
}
if (StringUtils.isNotBlank(size)) {
if (StringUtils.isNumeric(size) || size.equals("-1")){
CookieUtil.addCookie(response, "pageSize", size);
this.setPageSize(Integer.parseInt(size));
} else if (request.getParameter("repage")!=null){
size = CookieUtil.getValue(request, "pageSize");
if (StringUtils.isNumeric(size)){
this.setPageSize(Integer.parseInt(size));
}
}
} else {
this.pageSize = defaultPageSize;
}
String fields = request.getParameter("fields");
if (StringUtils.isNotBlank(fields)){
this.setFields(fields);
}
// 设置排序参数
String orderBy = request.getParameter("orderBy");
if (StringUtils.isNotBlank(orderBy)){
this.setOrderBy(orderBy);
}
this.setWhere(getWhere(request));
} catch (Exception e) {
e.printStackTrace();
}
}
/**
*
* @Title: getWhere
* @Description: TODO(抽取where查询条件)
* @param @param request
* @param @return 入参
* @return String 返回类型
* @author （darnell）
* @throws
* @date 2016年8月17日 上午9:28:21
* @version V1.0
* wx:日期格式的数据用日期格式化函数格式化，带空格的数据加上引号
*/
private String getWhere(HttpServletRequest request) {
String format=Constants.SEARCH_DATEFORMAT;
SimpleDateFormat sdf=new SimpleDateFormat(format);
Map<String, String[]> requestMap = request.getParameterMap();
StringBuilder whereBuilder = new StringBuilder(512);
for(String paramName : request.getParameterMap().keySet()) {
if (requestMap.get(paramName)!=null&&paramName.startsWith("search_")&&StringUtils.isNotBlank(requestMap.get(paramName)[0])) {
String clomn=paramName.substring("search_".length());
String value=requestMap.get(paramName)[0].trim();
boolean isDate=false;
try {
sdf.parse(value);
isDate=true;
} catch (ParseException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
if(clomn.endsWith("_start")){
clomn=clomn.substring(0,clomn.lastIndexOf("_start"));
if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
whereBuilder.append(clomn).append(">=");
if(isDate){
whereBuilder.append("date_format('")
.append(value).append("','%Y-%m-%d %H:%i:%S')");
}else if(value.indexOf(" ")>-1){
whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
}else{
whereBuilder.append(requestMap.get(paramName)[0]);
}
whereBuilder.append(" and ");
}else if(clomn.endsWith("_end")){
clomn=clomn.substring(0,clomn.lastIndexOf("_end"));
if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
whereBuilder.append(clomn).append("<=");
if(isDate){
whereBuilder.append("DATE_FORMAT('")
.append(value).append("','%Y-%m-%d %H:%i:%S')");
}else if(value.indexOf(" ")>-1){
whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
}else{
whereBuilder.append(requestMap.get(paramName)[0]);
}
whereBuilder.append(" and ");
}else{
if(StringUtils.isNotBlank(alias)) whereBuilder.append(alias.trim()+".");
whereBuilder.append(clomn).append("=");
if(isDate){
whereBuilder.append("date_format('")
.append(value).append("','%Y-%m-%d %H:%i:%S')");
}else if(value.indexOf(" ")>-1){
whereBuilder.append("'").append(requestMap.get(paramName)[0]).append("'");
}else{
whereBuilder.append(requestMap.get(paramName)[0]);
}
whereBuilder.append(" and ");
}
}
}
if (whereBuilder.length() > 0) {
whereBuilder.delete(whereBuilder.lastIndexOf(" and "), whereBuilder.length());
}
return whereBuilder.toString();
}
/**
* 构造方法
* @param pageNo 当前页码
* @param pageSize 分页大小
*/
public PageDashboard(int pageNo, int pageSize) {
this(pageNo, pageSize, 0);
}
/**
* 构造方法
* @param pageNo 当前页码
* @param pageSize 分页大小
* @param count 数据条数
*/
public PageDashboard(int pageNo, int pageSize, long count) {
this(pageNo, pageSize, count, new ArrayList<T>());
}
/**
* 构造方法
* @param pageNo 当前页码
* @param pageSize 分页大小
* @param count 数据条数
* @param list 本页数据对象列表
*/
public PageDashboard(int pageNo, int pageSize, long count, List<T> list) {
this.setCount(count);
this.setPageNo(pageNo);
this.pageSize = pageSize;
this.list = list;
}
/**
* 初始化参数
*/
public void initialize(){
//1
this.first = 1;
//首页
if (this.pageNo <= 1) {
this.pageNo = this.first;
this.firstPage=true;
}
//最后一页
if(list.size()<this.pageSize){
this.lastPage=true;
}
//下一页
if (list.size() >= this.pageSize) {
this.next = this.pageNo + 1;
}
// 上一页
if (pageNo > 1) {
this.prev = this.pageNo - 1;
} else {
this.prev = this.first;
}
//2
if (this.pageNo < this.first) {// 如果当前页小于首页
this.pageNo = this.first;
}
}
/**
* 默认输出当前分页标签
* <div class="page">${page}</div>
*/
@Override
public String toString() {
if(list != null && list.isEmpty()&&pageNo<=1) {
return "<div class=\"none-data\"><i class=\"fa fa-warning font-red-flamingo\"></i>&nbsp;&nbsp;"+requestContext.getMessage("noneData")+"</div>";
}
StringBuilder sb = new StringBuilder();
sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+first+","+pageSize+",'"+funcParam+"');\">"+requestContext.getMessage("firstPage")+"</a></li>\n");
if (pageNo == first) {// 如果是首页
sb.append("<li class=\"disabled\"><a href=\"javascript:\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
} else {
sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+prev+","+pageSize+",'"+funcParam+"');\">&#171; "+requestContext.getMessage("previousPage")+"</a></li>\n");
}
sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+pageNo+"</a></li>\n");
// 最后一页 未铺满 集合不为空
if (list != null && !list.isEmpty()&&list.size()<pageSize) {
sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
}else if(pageNo>1&&list.isEmpty()){
sb.append("<li class=\"disabled\"><a href=\"javascript:\">"+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
}else {
sb.append("<li><a href=\"javascript:\" onclick=\""+funcName+"("+next+","+pageSize+",'"+funcParam+"');\">"
+ ""+requestContext.getMessage("nextPage")+" &#187;</a></li>\n");
}
sb.insert(0,"<ul>\n").append("</ul>\n");
sb.append("<div style=\"clear:both;\"></div>");
return sb.toString();
}
/**
* 获取分页HTML代码
* @return
*/
@JsonIgnore
public String getHtml(){
return toString();
}
/**
* 获取设置总数
* @return
*/
public long getCount() {
return count;
}
/**
* 设置数据总数
* @param count
*/
public void setCount(long count) {
this.count = count;
if (pageSize >= count){
pageNo = 1;
}
}
/**
* 获取当前页码
* @return
*/
public int getPageNo() {
return pageNo;
}
/**
* 设置当前页码
* @param pageNo
*/
public void setPageNo(int pageNo) {
this.pageNo = pageNo;
}
/**
* 获取页面大小
* @return
*/
public int getPageSize() {
return pageSize;
}
/**
* 设置页面大小（最大500）
* @param pageSize
*/
public void setPageSize(int pageSize) {
if (pageSize == -1 || pageSize > 0 ) {
this.pageSize = pageSize;
} else {
this.pageSize = Integer.valueOf(Configurations.getIntProperty("page.pageSize", 30));
}
}
/**
* 首页索引
* @return
*/
@JsonIgnore
public int getFirst() {
return first;
}
/**
* 是否为第一页
* @return
*/
@JsonIgnore
public boolean isFirstPage() {
return firstPage;
}
/**
* 是否为最后一页
* @return
*/
@JsonIgnore
public boolean isLastPage() {
return lastPage;
}
/**
* @return where
*/
@JsonIgnore
public String getWhere() {
return where;
}
/**
* @param where 要设置的 where
*/
public void setWhere(String where) {
this.where = where;
}
/**
* 上一页索引值
* @return
*/
@JsonIgnore
public int getPrev() {
if (isFirstPage()) {
return pageNo;
} else {
return pageNo - 1;
}
}
/**
* 下一页索引值
* @return
*/
@JsonIgnore
public int getNext() {
if (isLastPage()) {
return pageNo;
} else {
return pageNo + 1;
}
}
/**
* 获取本页数据对象列表
* @return List<T>
*/
public List<T> getList() {
return list;
}
/**
* 设置本页数据对象列表
* @param list
*/
public PageDashboard<T> setList(List<T> list) {
this.list = list;
initialize();
return this;
}
/**
* 获取查询排序字符串
* @return
*/
@JsonIgnore
public String getOrderBy() {
// SQL过滤，防止注入
String reg = "(?:')|(?:--)|(/\\*(?:.|[\\n\\r])*?\\*/)|"
+ "(\\b(select|update|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b)";
Pattern sqlPattern = Pattern.compile(reg, Pattern.CASE_INSENSITIVE);
if (sqlPattern.matcher(orderBy).find()) {
return "";
}
return orderBy;
}
/**
* 设置查询排序，标准查询有效， 实例： updatedate desc, name asc
*/
public void setOrderBy(String orderBy) {
this.orderBy = orderBy;
}
/**
* @return fields 字段属性查询，拼接用,分隔
*/
@JsonIgnore
public String getFields() {
return fields;
}
/**
* @param fields 要设置的 fields
*/
public void setFields(String fields) {
this.fields = fields;
}
/**
* 获取点击页码调用的js函数名称
* function ${page.funcName}(pageNo){location="${ctx}/list-${category.id}${urlSuffix}?pageNo="+i;}
* @return
*/
@JsonIgnore
public String getFuncName() {
return funcName;
}
/**
* 设置点击页码调用的js函数名称，默认为page，在一页有多个分页对象时使用。
* @param funcName 默认为page
*/
public void setFuncName(String funcName) {
this.funcName = funcName;
}
/**
* 获取分页函数的附加参数
* @return
*/
@JsonIgnore
public String getFuncParam() {
return funcParam;
}
@JsonIgnore
public int getMaxExportSize() {
return maxExportSize;
}
public void setMaxExportSize(int maxExportSize) {
this.maxExportSize = maxExportSize;
}
/**
* 设置分页函数的附加参数
* @return
*/
public void setFuncParam(String funcParam) {
this.funcParam = funcParam;
}
/**
* 设置提示消息，显示在“共n条”之后
* @param message
*/
public void setMessage(String message) {
this.message = message;
}
/**
* 分页是否有效
* @return this.pageSize==-1
*/
@JsonIgnore
public boolean isDisabled() {
return this.pageSize==-1;
}
/**
* 是否进行总数统计
* @return this.count==-1
*/
@JsonIgnore
public boolean isNotCount() {
return this.count==-1;
}
/**
* 获取 Hibernate FirstResult
*/
@JsonIgnore
public int getFirstResult(){
int firstResult = (getPageNo() - 1) * getPageSize();
if (firstResult >= getCount()) {
firstResult = 0;
}
return firstResult;
}
/**
* 获取 Hibernate MaxResults
*/
@JsonIgnore
public int getMaxResults(){
return getPageSize();
}
/**
* alias
* @return alias
*/
public String getAlias() {
return alias;
}
/**
* @param alias the alias to set
*/
public void setAlias(String alias) {
this.alias = alias;
}
}

2
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -566,6 +566,8 @@ public class ExportExcel {
//1、非空
commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n";
index++;
commentStr=commentStr+"▶"+msgProp.getProperty("ip_check")+"(IPv4)\n";
index++;
}
if(region.getRegionType().equals(1)){//IP配置

74
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1,7 +1,6 @@
package com.nis.web.controller;
import java.beans.PropertyEditorSupport;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.ParseException;
@@ -73,7 +72,6 @@ import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.configuration.RequestInfo;
@@ -120,10 +118,8 @@ import com.nis.domain.maat.MaatCfg.GroupCfg;
import com.nis.domain.maat.MaatCfg.IpCfg;
import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
import com.nis.domain.maat.MaatCfg.StringCfg;
import com.nis.domain.report.NtcPzReport;
import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.domain.report.NtcPzReport;
import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils;
@@ -145,7 +141,6 @@ import com.nis.util.excel.thread.CheckDnsResStrategyFormatThread;
import com.nis.util.excel.thread.CheckIpFormatThread;
import com.nis.util.excel.thread.CheckStringFormatThread;
import com.nis.util.excel.thread.CheckTopicWebsiteFormatThread;
import com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.ArchiveServcie;
import com.nis.web.service.AreaService;
@@ -155,7 +150,6 @@ import com.nis.web.service.LogService;
import com.nis.web.service.MenuService;
import com.nis.web.service.OfficeService;
import com.nis.web.service.RoleService;
import com.nis.web.service.SpringContextHolder;
import com.nis.web.service.SystemService;
import com.nis.web.service.UserService;
import com.nis.web.service.basics.AsnGroupInfoService;
@@ -1640,17 +1634,12 @@ public class BaseController {
while(!ipPortCfgs.isEmpty()) {
ipPortCfgs.drainTo(_ipPortCfgs, Constants.MAAT_JSON_SEND_SIZE);
List<Integer> compileIds=Lists.newArrayList();
List<Integer> spoofingPoolIds=Lists.newArrayList();
List<Integer> regionIds=Lists.newArrayList();
List<Integer> groupIds=Lists.newArrayList();
List<Integer> numRegionGroupIds=Lists.newArrayList();
List<Integer> numRegionRegionIds=Lists.newArrayList();
List<PxyObjSpoofingIpPool> spoofingPools = new ArrayList<PxyObjSpoofingIpPool>();
PxyObjSpoofingIpPoolDao pxyObjSpoofingIpPoolDao = SpringContextHolder.getBean(PxyObjSpoofingIpPoolDao.class);
PxyObjSpoofingIpPoolService pxyObjSpoofingIpPoolService = SpringContextHolder.getBean(PxyObjSpoofingIpPoolService.class);
try {
compileIds = ConfigServiceUtil.getId(1,_ipPortCfgs.size());
spoofingPoolIds = ConfigServiceUtil.getId(1,_ipPortCfgs.size());
if(isSend.equals("1")) {
groupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
@@ -1707,67 +1696,8 @@ public class BaseController {
if(compileIds.size()==_ipPortCfgs.size()) {
cfg.setCompileId(compileIds.get(ind));
}
// 保存IP仿冒池
PxyObjSpoofingIpPool spoofingPool = new PxyObjSpoofingIpPool();
spoofingPool.setIpType(4);//ipv4
spoofingPool.setIpAddress(cfg.getUserRegion2());//仿冒IP
spoofingPool.setProtocol(0);
if("dnat".equals(cfg.getUserRegion1().toLowerCase())){//spoofing server ip->dnat
spoofingPool.setDirection(1);
}else{
spoofingPool.setDirection(2);//spoofing client ip->snat
}
spoofingPool.setPort("0");
spoofingPool.setUserRegion("0");
spoofingPool.setLocation(0);
spoofingPool.setServiceId(642);
spoofingPool.setAreaEffectiveIds("0");
spoofingPool.setIsAreaEffective(0);
spoofingPool.setCreateTime(date);
spoofingPool.setCreatorId(UserUtils.getUser().getId());
if(spoofingPoolIds.size()==_ipPortCfgs.size()) {
spoofingPool.setCompileId(spoofingPoolIds.get(ind));
}
spoofingPool.setAction(1);
spoofingPool.setFunctionId(666);
spoofingPool.setRequestId(0);
if(isSend.equals("1")) {
spoofingPool.setIsAudit(Constants.AUDIT_YES);
spoofingPool.setIsValid(Constants.VALID_YES);
spoofingPool.setAuditorId(UserUtils.getUser().getId());
spoofingPool.setAuditTime(date);
}else {
spoofingPool.setIsValid(Constants.VALID_NO);
spoofingPool.setIsAudit(Constants.AUDIT_NOT_YET);
}
pxyObjSpoofingIpPoolDao.insert(spoofingPool);//保存仿冒IP池配置
cfg.setUserRegion3(String.valueOf(spoofingPool.getCfgId()));//将仿冒IP池配置ID作为策略组ID
if(isSend.equals("1")) {
PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
pool.setCfgId(Long.valueOf(cfg.getUserRegion3()));
pool.setIsValid(cfg.getIsValid());
pool.setIsAudit(cfg.getIsAudit());
pool.setAuditorId(UserUtils.getUser().getId());
pool.setAuditTime(date);
pxyObjSpoofingIpPoolDao.update(pool);
spoofingPool.setAreaEffectiveIds("0");
spoofingPool.setGroupId(spoofingPool.getCfgId().intValue());
spoofingPools.add(spoofingPool);
}
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
BeanUtils.copyProperties(cfg, cfgIndexInfo,new String[] {"cfgId"});
cfgIndexInfos.add(cfgIndexInfo);
ind++;
}
if(isSend.equals("1") && spoofingPools.size()>0) {
pxyObjSpoofingIpPoolService.auditSpoofingPool(spoofingPools);
}
ipCfgService.saveAndSend(regionDict, serviceDict, specificServiceCfg, _ipPortCfgs, cfgIndexInfos, appPolicyCfgs,appFeatureIndexs,asnNoMaps,isSend.equals("1"));
cfgIndexInfos.clear();

2
src/main/java/com/nis/web/controller/configuration/LogSearchController.java
View File

@@ -77,7 +77,7 @@ public class LogSearchController extends BaseController{
Map<String, Object> fromJsonList = new HashMap<String, Object>();
List resultList = new ArrayList();
String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT;
url=url+"?searchBusinessType=2&searchCfgId="+cfgId;
url=url+"?pageSize=-1&searchBusinessType=2&searchCfgId="+cfgId;
if(!StringUtil.isEmpty(serviceId)){
url=url+"&searchService="+serviceId;
}

17
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -343,6 +343,10 @@ public class IpMultiplexController extends CommonController {
Page<BaseIpCfg> page = ipMultiplexService.findPageDnat(new Page<BaseIpCfg>(request, response, "r"), cfg);
model.addAttribute("page", page);
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
model.addAttribute("users", users);
initFormCondition(model, cfg);
return "/cfg/manipulation/ipmulitiplex/dnatPolicyList2";
@@ -363,6 +367,10 @@ public class IpMultiplexController extends CommonController {
} else {
initFormCondition(model, cfg);
}
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
model.addAttribute("users", users);
model.addAttribute("_cfg", cfg);
return "/cfg/manipulation/ipmulitiplex/dnatPolicyForm2";
}
@@ -581,7 +589,14 @@ public class IpMultiplexController extends CommonController {
logTotal.put("sum",0L);
logTotals.add(logTotal);
}
IpReuseDnatPolicyCfg dnat=(IpReuseDnatPolicyCfg) cfg;
if(dnat.getTranslatedUserType().equals("VPN")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_vpn_user","VPN"));
}else if(dnat.getTranslatedUserType().equals("SIPv4")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv4_user","SIPv4"));
}else if(dnat.getTranslatedUserType().equals("SIPv6")){
dnat.setTranslatedUserType(msgProp.getProperty("policy_sipv6_user","SIPv6"));
}
}
StringBuilder serviceIds=new StringBuilder(",");
for (Integer id : set) {

127
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java
View File

@@ -6,16 +6,13 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
@@ -28,22 +25,17 @@ import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.SysUser;
import com.nis.domain.dashboard.NtcRadiusReport;
import com.nis.domain.log.BaseLogEntity;
import com.nis.domain.dashboard.PageDashboard;
import com.nis.domain.maat.LogRecvData;
import com.nis.domain.report.NtcAsnRecord;
import com.nis.domain.report.NtcIpRangeReport;
import com.nis.util.Configurations;
import com.nis.util.Constants;
import com.nis.util.DateUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
import net.sf.json.JSONObject;
@SuppressWarnings("all")
@Controller
@RequestMapping("${adminPath}/traffic")
public class TrafficStatisticsReportController extends BaseController {
@@ -64,6 +56,13 @@ public class TrafficStatisticsReportController extends BaseController {
Map<String, Object> userJsonList = new HashMap<String, Object>();
Map<String, Object> ipJsonList = new HashMap<String, Object>();
String searchBusinessType = bean.getSearchBusinessType();
PageDashboard<NtcRadiusReport> page=new PageDashboard<NtcRadiusReport>(request, response);
int pageSize = page.getPageSize();
int pageNo = page.getPageNo();
if ("2".endsWith(searchBusinessType)) {
model.addAttribute("searchBusinessType", 2);// 用户查询
}
@@ -77,6 +76,7 @@ public class TrafficStatisticsReportController extends BaseController {
String nasIp = bean.getNasIp();
String destUrl = url + "?searchBusinessType=1";
String userUrl = url + "?searchBusinessType=2";
userUrl+="&pageSize="+pageSize+"&pageNo="+pageNo;
String ipUrl = url + "?searchBusinessType=3";
List list = new ArrayList();
List userList = new ArrayList();
@@ -110,7 +110,7 @@ public class TrafficStatisticsReportController extends BaseController {
}
model.addAttribute("nowTime", DateUtils.getDateTime());
// 用户及IP数据
String string = HttpClientUtil.get(destUrl);
/*String string = HttpClientUtil.get(destUrl);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>() {
}.getType());
@@ -142,8 +142,8 @@ public class TrafficStatisticsReportController extends BaseController {
System.out.println(
"-------------------:" + nasIpList.size() + "+++" + accountList.size() + "==================");
model.addAttribute("nasIpList", nasIpList);
model.addAttribute("accountList", accountList);
if (StringUtil.isBlank(account) && accountList != null && accountList.size() > 0
model.addAttribute("accountList", accountList);*/
/* if (StringUtil.isBlank(account) && accountList != null && accountList.size() > 0
&& !"3".equals(searchBusinessType)) {
Map accountMap = (Map) accountList.get(0);
String firstAccount = "";
@@ -175,26 +175,29 @@ public class TrafficStatisticsReportController extends BaseController {
model.addAttribute("ipList", ipList);
model.addAttribute("searchNasIp", firstIp);
}
}*/
if ("2".endsWith(searchBusinessType) && !StringUtil.isBlank(account)) {
String userString = HttpClientUtil.get(userUrl + "&searchAccount=" + account);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
userJsonList = usergson.fromJson(userString, new TypeToken<Map>() {
}.getType());
userList = (ArrayList) userJsonList.get("data");
model.addAttribute("userList", userList);
// userJsonList = usergson.fromJson(userString, new TypeToken<Map>() {}.getType());
LogRecvData<NtcRadiusReport> fromJson = usergson.fromJson(userString, new TypeToken<LogRecvData<NtcRadiusReport>>(){}.getType());
page.setList(fromJson.getData().getList());
List<NtcRadiusReport> list2 = page.getList();
model.addAttribute("userList", list2);
model.addAttribute("page", page);
model.addAttribute("searchAccount", account);
}
if ("3".endsWith(searchBusinessType) && !StringUtil.isBlank(nasIp)) {
String ipString = HttpClientUtil.get(ipUrl + "&searchNasIp=" + nasIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
ipJsonList = ipgson.fromJson(ipString, new TypeToken<Map>() {
}.getType());
ipList = (ArrayList) ipJsonList.get("data");
model.addAttribute("ipList", ipList);
LogRecvData<NtcRadiusReport> fromJson = ipgson.fromJson(ipString, new TypeToken<LogRecvData<NtcRadiusReport>>(){}.getType());
page.setList(fromJson.getData().getList());
List<NtcRadiusReport> list3 = page.getList();
model.addAttribute("ipList", list3);
model.addAttribute("page", page);
model.addAttribute("searchNasIp", nasIp);
}
} catch (Exception e) {
@@ -203,6 +206,86 @@ public class TrafficStatisticsReportController extends BaseController {
}
return "/dashboard/trafficUserBehavior";
}
/**
* 用户行为查询2
*
* @param bean
* @param model
* @param request
* @param response
* @return
*/
@RequestMapping("getUserBehaviorList")
public String getUserBehaviorList(@ModelAttribute("log")NtcRadiusReport bean, Model model, HttpServletRequest request,
HttpServletResponse response, RedirectAttributes redirectAttributes) {
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map<String, Object> userJsonList = new HashMap<String, Object>();
Map<String, Object> ipJsonList = new HashMap<String, Object>();
String searchBusinessType = bean.getSearchBusinessType();
PageDashboard<NtcRadiusReport> page=new PageDashboard<NtcRadiusReport>(request, response);
int pageSize = page.getPageSize();
int pageNo = page.getPageNo();
String url = Constants.DASHBOARD_URL + Constants.NTC_RADIUS_REPORT;
String statTime = bean.getSearchFoundStartTime();
String endTime = bean.getSearchFoundEndTime();
String account = bean.getAccount();
String nasIp = bean.getNasIp();
String userUrl = url + "?searchBusinessType=2";
userUrl+="&pageSize="+pageSize+"&pageNo="+pageNo;
String ipUrl = url + "?searchBusinessType=3";
ipUrl+="&pageSize="+pageSize+"&pageNo="+pageNo;
try {
if (StringUtil.isBlank(statTime) && StringUtil.isBlank(endTime)) {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
endTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cal.getTime());// 获取到完整的时间
cal.set(Calendar.HOUR_OF_DAY, cal.get(Calendar.HOUR_OF_DAY) - 1);
statTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(cal.getTime());
bean.setSearchFoundStartTime(statTime);
bean.setSearchFoundEndTime(endTime);
statTime = URLEncoder.encode(statTime, "UTF-8");
endTime = URLEncoder.encode(endTime, "UTF-8");
String paramUrl = "&searchReportStartTime=" + statTime + "&searchReportEndTime=" + endTime;
userUrl = userUrl + paramUrl;
ipUrl = ipUrl + paramUrl;
} else {
statTime = URLEncoder.encode(statTime, "UTF-8");
endTime = URLEncoder.encode(endTime, "UTF-8");
String paramUrl = "&searchReportStartTime=" + statTime + "&searchReportEndTime=" + endTime;
userUrl = userUrl + paramUrl;
ipUrl = ipUrl + paramUrl;
}
if ("2".endsWith(searchBusinessType) && !StringUtil.isBlank(account)) {
String userString = HttpClientUtil.get(userUrl + "&searchAccount=" + account);
// 指定用户 查询
Gson usergson = new GsonBuilder().create();
LogRecvData<NtcRadiusReport> fromJson = usergson.fromJson(userString, new TypeToken<LogRecvData<NtcRadiusReport>>(){}.getType());
page.setList(fromJson.getData().getList());
model.addAttribute("page", page);
model.addAttribute("searchAccount", account);
model.addAttribute("searchBusinessType", 2);// 用户查询
return "/dashboard/trafficNasIpList";
}
if ("3".endsWith(searchBusinessType) && !StringUtil.isBlank(nasIp)) {
String ipString = HttpClientUtil.get(ipUrl + "&searchNasIp=" + nasIp);
// 指定IP查询
Gson ipgson = new GsonBuilder().create();
LogRecvData<NtcRadiusReport> fromJson = ipgson.fromJson(ipString, new TypeToken<LogRecvData<NtcRadiusReport>>(){}.getType());
page.setList(fromJson.getData().getList());
model.addAttribute("page", page);
model.addAttribute("searchNasIp", nasIp);
model.addAttribute("searchBusinessType", 3);// ip查询
return "/dashboard/trafficUserList";
}
} catch (Exception e) {
e.printStackTrace();
addMessage(redirectAttributes, "error", "request_service_failed");
}
return null;
}
// 用户行为导出
@RequestMapping(value = "userBehaviorExport")

40
src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml
View File

@@ -45,7 +45,7 @@
<result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
<result column="ip_type" property="ipType" jdbcType="INTEGER" />
<result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
<result column="translated_dest_ip" property="destIpAddress" jdbcType="VARCHAR" />
<!-- <result column="translated_dest_ip" property="destIpAddress" jdbcType="VARCHAR" /> -->
<result column="original_dest_ip" property="srcIpAddress" jdbcType="VARCHAR" />
<result column="translated_dest_port" property="destPort" jdbcType="VARCHAR" />
<result column="original_dest_port" property="srcPort" jdbcType="VARCHAR" />
@@ -73,6 +73,9 @@
<result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
<result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
<result column="translated_user_type" property="translatedUserType" jdbcType="VARCHAR" />
<result column="translated_user_id" property="translatedUserId" jdbcType="VARCHAR" />
</resultMap>
<sql id="policyColumns">
@@ -86,11 +89,11 @@
<sql id="dnatPolicyColumns" >
a.cfg_id,a.cfg_desc,a.ip_type,a.original_dest_ip,a.ip_pattern,a.port_pattern,a.original_dest_port,
a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.translated_dest_ip,a.is_valid,
a.protocol,a.protocol_id,a.cfg_type,a.action,a.translated_dest_port,a.is_valid,
a.is_audit,a.creator_id,a.create_time,a.editor_id,a.edit_time,a.auditor_id,a.audit_time,
a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
a.area_effective_ids,a.function_id,a.cfg_region_code,a.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5
a.user_region3,a.user_region4,a.user_region5,a.translated_user_type,a.translated_user_id
</sql>
<select id="findPage" resultMap="policyMap">
@@ -438,7 +441,7 @@
port_pattern,
original_dest_ip,
original_dest_port,
translated_dest_ip,
<!-- translated_dest_ip, -->
translated_dest_port,
protocol,
protocol_id,
@@ -467,7 +470,9 @@
user_region2,
user_region3,
user_region4,
user_region5
user_region5,
translated_user_type,
translated_user_id
)VALUES (
#{cfgDesc,jdbcType=VARCHAR},
#{ipType,jdbcType=INTEGER},
@@ -475,7 +480,7 @@
#{portPattern,jdbcType=INTEGER},
#{srcIpAddress,jdbcType=VARCHAR},
#{srcPort,jdbcType=VARCHAR},
#{destIpAddress,jdbcType=VARCHAR},
<!-- #{destIpAddress,jdbcType=VARCHAR}, -->
#{destPort,jdbcType=VARCHAR},
#{protocol,jdbcType=INTEGER},
#{protocolId,jdbcType=INTEGER},
@@ -504,7 +509,9 @@
#{userRegion2,jdbcType=VARCHAR},
#{userRegion3,jdbcType=VARCHAR},
#{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}
#{userRegion5,jdbcType=VARCHAR},
#{translatedUserType,jdbcType=VARCHAR},
#{translatedUserId,jdbcType=VARCHAR}
)
</insert>
@@ -527,9 +534,9 @@
<if test="srcIpAddress != null">
original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR},
</if>
<if test="destIpAddress != null and destIpAddress != ''">
<!-- <if test="destIpAddress != null and destIpAddress != ''">
translated_dest_ip=#{destIpAddress,jdbcType=VARCHAR},
</if>
</if> -->
<if test="srcPort != null and srcPort !=''">
original_dest_port=#{srcPort,jdbcType=VARCHAR},
</if>
@@ -587,6 +594,12 @@
<if test="areaEffectiveIds != null" >
area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR},
</if>
<if test="translatedUserType != null and translatedUserType != ''">
translated_user_type=#{translatedUserType,jdbcType=VARCHAR},
</if>
<if test="translatedUserId != null and translatedUserId != ''">
translated_user_id=#{translatedUserId,jdbcType=VARCHAR},
</if>
</trim>
</set>
WHERE cfg_id = #{cfgId,jdbcType=BIGINT}
@@ -628,9 +641,9 @@
<if test="srcIpAddress != null and srcIpAddress != ''">
AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}
</if>
<if test="destIpAddress != null and destIpAddress != ''">
<!-- <if test="destIpAddress != null and destIpAddress != ''">
AND a.translated_dest_ip=#{destIpAddress,jdbcType=VARCHAR}
</if>
</if> -->
<if test="srcPort != null and srcPort !=''">
AND a.original_dest_port=#{srcPort,jdbcType=VARCHAR}
</if>
@@ -657,7 +670,7 @@
</if>
<if test="auditorName != null and auditorName != ''">
AND a.AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
</if>
</if>
<if test="serviceId != null">
AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
@@ -676,6 +689,9 @@
<if test="lable != null and lable != ''">
AND a.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
</if>
<if test="translatedUserId != null and translatedUserId != ''">
AND a.translated_user_id LIKE concat(concat('%',#{translatedUserId,jdbcType=VARCHAR}),'%')
</if>
<if test="functionId != null">
AND a.function_id=#{functionId,jdbcType=INTEGER}
</if>

108
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -71,6 +71,7 @@ import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpReusePolicyCfg;
import com.nis.domain.configuration.NtcSubscribeIdCfg;
import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.configuration.WebsiteDomainTopic;
@@ -86,6 +87,7 @@ import com.nis.domain.maat.ToMaatBean;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.specific.ConfigGroupInfo;
import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.exceptions.MaatConvertException;
//import com.nis.util.AsnCacheUtils;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Configurations;
@@ -103,6 +105,7 @@ import com.nis.web.dao.configuration.DdosCfgDao;
import com.nis.web.dao.configuration.DnsIpCfgDao;
import com.nis.web.dao.configuration.DnsResStrategyDao;
import com.nis.web.dao.configuration.IpCfgDao;
import com.nis.web.dao.configuration.PxyObjSpoofingIpPoolDao;
import com.nis.web.dao.configuration.StringCfgDao;
import com.nis.web.dao.specific.ConfigGroupInfoDao;
import com.nis.web.dao.specific.SpecificServiceCfgDao;
@@ -1671,6 +1674,10 @@ public abstract class BaseService {
}else if(list.get(0) instanceof AppTopicDomainCfg) {
type="AppTopicDomain";
}
if(regionDict.getFunctionId().equals(214)) { // 处理IpSpoofing配置导入
this.saveAndSendSpoofingIpPool(list,cfgIndexInfos,send);
}
if (cfgIndexInfos != null && cfgIndexInfos.size() > 0) {
this.saveCfgIndexOf(cfgIndexInfos);
}
@@ -3128,5 +3135,106 @@ public abstract class BaseService {
return commonGroupList;
}
/**
* 处理IpSpoofing配置导入
* @param list
* @param cfgIndexInfos
* @param send
*/
public void saveAndSendSpoofingIpPool(List<? extends BaseCfg> list, List<CfgIndexInfo> cfgIndexInfos, boolean send) {
List<BaseIpCfg> ipCfgList = (List<BaseIpCfg>)list;
List<Integer> spoofingPoolIds=Lists.newArrayList();
List<PxyObjSpoofingIpPool> spoofingPools = new ArrayList<PxyObjSpoofingIpPool>();
PxyObjSpoofingIpPoolDao pxyObjSpoofingIpPoolDao = SpringContextHolder.getBean(PxyObjSpoofingIpPoolDao.class);
try {
spoofingPoolIds = ConfigServiceUtil.getId(1,ipCfgList.size());
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
int index = 0;
for (BaseIpCfg cfg : ipCfgList) {
// 保存IP仿冒池
PxyObjSpoofingIpPool spoofingPool = new PxyObjSpoofingIpPool();
spoofingPool.setIpType(4);//ipv4
spoofingPool.setIpAddress(cfg.getUserRegion2());//仿冒IP
spoofingPool.setProtocol(0);
if("dnat".equals(cfg.getUserRegion1().toLowerCase())){//spoofing server ip->dnat
spoofingPool.setDirection(1);
}else{
spoofingPool.setDirection(2);//spoofing client ip->snat
}
spoofingPool.setPort("0");
spoofingPool.setUserRegion("0");
spoofingPool.setLocation(0);
spoofingPool.setServiceId(642);
spoofingPool.setAreaEffectiveIds("0");
spoofingPool.setIsAreaEffective(0);
spoofingPool.setCreateTime(cfg.getCreateTime());
spoofingPool.setCreatorId(UserUtils.getUser().getId());
if(spoofingPoolIds.size() == ipCfgList.size()) {
spoofingPool.setCompileId(spoofingPoolIds.get(index));
}
spoofingPool.setAction(1);
spoofingPool.setFunctionId(666);
spoofingPool.setRequestId(0);
if(send) {
spoofingPool.setIsAudit(Constants.AUDIT_YES);
spoofingPool.setIsValid(Constants.VALID_YES);
spoofingPool.setAuditorId(UserUtils.getUser().getId());
spoofingPool.setAuditTime(cfg.getAuditTime());
}else {
spoofingPool.setIsValid(Constants.VALID_NO);
spoofingPool.setIsAudit(Constants.AUDIT_NOT_YET);
}
pxyObjSpoofingIpPoolDao.insert(spoofingPool);//保存仿冒IP池配置
cfg.setUserRegion3(String.valueOf(spoofingPool.getCfgId()));//将仿冒IP池配置ID作为策略组ID
if(send) {
PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
pool.setCfgId(Long.valueOf(cfg.getUserRegion3()));
pool.setIsValid(cfg.getIsValid());
pool.setIsAudit(cfg.getIsAudit());
pool.setAuditorId(UserUtils.getUser().getId());
pool.setAuditTime(cfg.getAuditTime());
pxyObjSpoofingIpPoolDao.update(pool);
spoofingPool.setAreaEffectiveIds("0");
spoofingPool.setGroupId(spoofingPool.getCfgId().intValue());
spoofingPools.add(spoofingPool);
}
CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
BeanUtils.copyProperties(cfg, cfgIndexInfo,new String[] {"cfgId"});
cfgIndexInfos.add(cfgIndexInfo);
index ++;
}
if(send && spoofingPools.size()>0) {
//调用服务接口下发配置数据
String json=gsonToJson(spoofingPools);
if(spoofingPools.size()>10) {
logger.info("欺骗IP池配置下发配置条数：" + spoofingPools.size());
}else {
logger.info("欺骗IP池配置下发配置参数：" + json);
}
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("欺骗IP池配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("欺骗IP池配置配置下发失败",e);
throw e;
}
}
}
}

24
src/main/java/com/nis/web/service/configuration/PxyObjSpoofingIpPoolService.java
View File

@@ -270,30 +270,6 @@ public class PxyObjSpoofingIpPoolService extends BaseService{
}
/**
* IP Spoofing配置导入时 下发仿冒IP池配置
* @param spoofingPools
*/
public void auditSpoofingPool(List<PxyObjSpoofingIpPool> spoofingPools) {
//调用服务接口下发配置数据
String json=gsonToJson(spoofingPools);
if(spoofingPools.size()>10) {
logger.info("欺骗IP池配置下发配置条数：" + spoofingPools.size());
}else {
logger.info("欺骗IP池配置下发配置参数：" + json);
}
//调用服务接口下发配置
try {
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
if(result!=null){
logger.info("欺骗IP池配置下发响应信息："+result.getMsg());
}
} catch (Exception e) {
logger.error("欺骗IP池配置配置下发失败",e);
throw e;
}
}
}

2
src/main/resources/sql/20190110/update_region_dict.sql Normal file
View File

@@ -0,0 +1,2 @@
#<23><><EFBFBD><EFBFBD>SNAT<41><54>ַ<EFBFBD>ع<EFBFBD><D8B9><EFBFBD> IP<49>ĸ<EFBFBD>ʽΪ<CABD><CEAA>IP
update function_region_dict set config_ip_pattern='3' where dict_id='231';

111
src/main/resources/sql/20190116/device_isp_table_data.sql Normal file
View File

@@ -0,0 +1,111 @@
CREATE TABLE `sys_device_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`device_type` varchar(32) NOT NULL COMMENT '<EFBFBD>豸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`ip_addr` varchar(128) NOT NULL,
`device_id` int(11) NOT NULL COMMENT '<EFBFBD>豸ID<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͬ<EFBFBD>豸<EFBFBD>ɶ<EFBFBD>Ӧ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӫ<EFBFBD><EFBFBD>',
`link_id` int(11) NOT NULL COMMENT '<EFBFBD><EFBFBD>·<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`isp` int(11) NOT NULL COMMENT '<EFBFBD><EFBFBD>Ӫ<EFBFBD>̱<EFBFBD><EFBFBD>룬<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ktel-mxpe:1001',
`entrance_id` int(11) NOT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1-astana 2-alamty',
`status` int(11) NOT NULL COMMENT '0-δ<><CEB4><EFBFBD><EFBFBD> 1-<2D><><EFBFBD><EFBFBD> 2-<2D><><EFBFBD>ֽ<EFBFBD><D6BD><EFBFBD>',
`create_time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
CREATE TABLE `sys_isp_info` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`isp_name` varchar(64) NOT NULL COMMENT 'ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`isp_code` int(11) NOT NULL COMMENT 'ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӫ<EFBFBD>̱<EFBFBD><EFBFBD><EFBFBD>',
`business_type_name` varchar(64) NOT NULL COMMENT 'ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`business_type_code` int(11) NOT NULL COMMENT 'ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͱ<EFBFBD><EFBFBD><EFBFBD>',
`isp_key_name` varchar(64) NOT NULL COMMENT '<EFBFBD><EFBFBD>Ӫ<EFBFBD><EFBFBD>Ψһ<EFBFBD><EFBFBD>ʶ<EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ktel-mxpe:1001',
`isp_key_code` int(11) NOT NULL COMMENT '<EFBFBD><EFBFBD>Ӫ<EFBFBD><EFBFBD>Ψһ<EFBFBD><EFBFBD>ʶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
`create_time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
##INSERT INTO `galaxy-dev`.`sys_isp_info` (`id`, `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `#create_time`) VALUES ('1', '1', '1', '1', '1', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_isp_info` ( `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `create_time`) VALUES ( 'ktel', '100', 'mxpe', '1', 'ktel-mxpe', '1001', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_isp_info` ( `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `create_time`) VALUES ( 'ktel', '100', 'bng', '2', 'ktel-bng', '1002', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_isp_info` ( `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `create_time`) VALUES ( 'ktel', '100', 'mask', '1', 'ktel-mask', '1003', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_isp_info` ( `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `create_time`) VALUES ( 'transtel', '101', 'ALL', '0', 'transtel', '1010', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_isp_info` ( `isp_name`, `isp_code`, `business_type_name`, `business_type_code`, `isp_key_name`, `isp_key_code`, `create_time`) VALUES ( 'tnsplus', '102', 'ALL', '0', 'tnsplus', '1020', '2019-01-14 19:10:55');
##INSERT INTO `galaxy-dev`.`sys_device_info` (`id`, `device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('1', '10g', '10.4.2.1', '1', '3', '1', '1', '0', '2019-01-14 19:05:38');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.1', '1', '0', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.1', '1', '1', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.1', '1', '2', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.1', '1', '3', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.2', '2', '0', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.2', '2', '1', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.2', '2', '2', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.2', '2', '3', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.3', '3', '0', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.3', '3', '1', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.3', '3', '2', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.3', '3', '3', '1001', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.4', '4', '0', '1010', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.4', '4', '1', '1010', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.4', '4', '2', '1010', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.4.2.4', '4', '3', '1010', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.5', '5', '0', '1002', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.6', '6', '0', '1002', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.7', '7', '0', '1002', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.8', '8', '0', '1002', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.9', '9', '0', '1010', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.10', '10', '0', '1020', '1', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.4.2.11', '11', '0', 'Ԥ<><D4A4>100G<30>豸7', '1', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.1', '1', '0', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.1', '1', '1', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.1', '1', '2', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.1', '1', '3', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.2', '2', '0', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.2', '2', '1', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.2', '2', '2', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.2', '2', '3', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.3', '3', '0', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.3', '3', '1', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.3', '3', '2', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.3', '3', '3', '1001', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.4', '4', '0', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.4', '4', '1', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.4', '4', '2', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.4', '4', '3', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.5', '5', '0', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.5', '5', '1', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.5', '5', '2', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.5', '5', '3', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.6', '6', '0', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.6', '6', '1', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.6', '6', '2', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.6', '6', '3', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.7', '7', '0', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.7', '7', '1', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.7', '7', '2', '1020', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.7', '7', '3', '1020', '2', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.8', '8', '0', 'Ԥ<><D4A4>10G<30>豸8', '2', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.8', '8', '1', 'Ԥ<><D4A4>10G<30>豸8', '2', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.8', '8', '2', 'Ԥ<><D4A4>10G<30>豸8', '2', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('10g', '10.3.2.8', '8', '3', 'Ԥ<><D4A4>10G<30>豸8', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.9', '9', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.10', '10', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.11', '11', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.12', '12', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.13', '13', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.14', '14', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.15', '15', '0', '1002', '2', '1', '2019-01-14 19:10:55');
INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.16', '16', '0', '1002', '2', '1', '2019-01-14 19:10:55');
#INSERT INTO `galaxy-dev`.`sys_device_info` (`device_type`, `ip_addr`, `device_id`, `link_id`, `isp`, `entrance_id`, `status`, `create_time`) VALUES ('100g', '10.3.2.17', '17', '0', 'Ԥ<><D4A4>100G<30>豸7', '2', '1', '2019-01-14 19:10:55');

14
src/main/webapp/WEB-INF/include/excel/importModal.jsp
View File

@@ -47,6 +47,7 @@
<c:if test="${serviceIndex eq 0}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<!-- 拦截策略 -->
<c:if test="${service.functionId eq 200 }">
<c:if test="${service.action eq 1 }">
<spring:message code="intercept"/>
@@ -58,7 +59,18 @@
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:if>
<c:if test="${service.functionId ne 200 }">
<!-- Stream配置 -->
<c:if test="${service.functionId eq 407 || service.functionId eq 408 || service.functionId eq 63 }">
<c:choose>
<c:when test="${service.action eq 16}">
<spring:message code="block_drop"/>
</c:when>
<c:otherwise>
<spring:message code="${dict.itemValue }"/>
</c:otherwise>
</c:choose>
</c:if>
<c:if test="${service.functionId ne 200 && service.functionId ne 407 && service.functionId ne 408 && service.functionId ne 63}">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:if>

33
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
View File

@@ -149,9 +149,10 @@ var resetIndex = function(){
<c:forEach items="${serviceList}" var="service" varStatus="satus">
<label class="radio-inline">
<c:if test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -176,6 +177,32 @@ var resetIndex = function(){
</div>
</div>
<!-- dolog begin-->
<div class="row doLog">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
<!-- dolog end-->
<h4 class="form-section">
<spring:message code="address_pool_ip_configuration" />
<small>
@@ -227,7 +254,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
@@ -371,7 +398,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden" >
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">

1
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
View File

@@ -401,7 +401,6 @@
<th column="address_pool" class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th column="ip_total" class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>

35
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp
View File

@@ -90,7 +90,7 @@ $(function(){
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
@@ -201,7 +201,7 @@ $(function(){
</div>
</div>
<div class="row port">
<div class="col-md-6">
<%-- <div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="translated_dest_ip"/></label>
<div class="col-md-6">
@@ -209,7 +209,7 @@ $(function(){
</div>
<div for="destIpAddress"></div>
</div>
</div>
</div> --%>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="translated_dest_port"/></label>
@@ -219,6 +219,35 @@ $(function(){
<div for="destPort"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user_type"/></label>
<div class="col-md-6">
<select name="translatedUserType" class="selectpicker show-tick form-control required">
<%-- <option value=""><spring:message code="select"/></option> --%>
<option value="VPN" <c:if test="${_cfg.translatedUserType eq 'VPN' }">selected</c:if>><spring:message code="policy_vpn_user"/></option>
<%-- <option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option> --%>
</select>
</div>
<div for="translatedUserId"></div>
</div>
</div>
<div class="col-md-6 ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user"/></label>
<div class="col-md-6">
<select name="translatedUserId" class="selectpicker show-tick form-control required user" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${users}" var="user">
<option value="${user.userName}" <c:if test="${_cfg.translatedUserId eq user.userName }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach>
</select>
</div>
<div for="translatedUserType"></div>
</div>
</div>
</div>
<%-- <div class="row destPort">
<div class="col-md-6">

67
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
View File

@@ -19,9 +19,40 @@
$("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.destPort}"){
$("#intype").val("${cfg.destPort}");
}else if("${cfg.translatedUserId}"){
$("#intype").val("${cfg.translatedUserId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
// 处理用户类型检索条件
if($("#seltype").val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#isValid").selectpicker("hide");
}else{
$("#translatedUserType").selectpicker("hide");
}
$("#seltype").change(function(){
if($(this).val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#intype").val("");// 清空input条件
$("#translatedUserType").find("option").removeAttr("selected",false);
$("#translatedUserType").selectpicker("refresh");
$("#translatedUserType").selectpicker("show");
$("#isValid").selectpicker("hide");
}else if($(this).val() == "isValid"){
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");
}else{
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");// 隐藏下拉框
}
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
@@ -105,8 +136,10 @@
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="original_dest_ip"></spring:message></form:option>
<form:option value="srcPort"><spring:message code="original_dest_port"></spring:message></form:option>
<form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option>
<%-- <form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option> --%>
<form:option value="destPort"><spring:message code="translated_dest_port"></spring:message></form:option>
<form:option value="translatedUserId"><spring:message code="user"></spring:message></form:option>
<%-- <form:option value="translatedUserType"><spring:message code="user_type"></spring:message></form:option> --%>
<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -126,6 +159,13 @@
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
</form:select>
<form:select path="translatedUserType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="VPN"><spring:message code="policy_vpn_user"/></form:option>
<form:option value="SIPv4"><spring:message code="policy_sipv4_user"/></form:option>
<form:option value="SIPv6"><spring:message code="policy_sipv6_user"/></form:option>
</form:select>
</div>
</div>
</div>
@@ -309,9 +349,11 @@
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="original_dest_ip" ><spring:message code="original_dest_ip"/></th>
<th column="original_dest_port" ><spring:message code="original_dest_port"/></th>
<th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th>
<%-- <th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th> --%>
<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
@@ -348,7 +390,7 @@
</td> --%>
<td>${indexCfg.srcIpAddress }</td>
<td>${indexCfg.srcPort }</td>
<td>${indexCfg.destIpAddress }</td>
<%-- <td>${indexCfg.destIpAddress }</td> --%>
<td>${indexCfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
@@ -357,6 +399,25 @@
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${indexCfg.translatedUserType eq 'VPN' }">
<spring:message code="policy_vpn_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv4' }">
<spring:message code="policy_sipv4_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv6' }">
<spring:message code="policy_sipv6_user"/>
</c:if>
</td>
<td>
<c:forEach items="${users }" var="user">
<c:if test="${indexCfg.translatedUserId eq user.userName }">
<spring:message code="${user.userName }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>

3
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
View File

@@ -190,10 +190,11 @@ var switchUserType = function(obj){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

8
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
View File

@@ -124,9 +124,9 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
<%-- <form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option> --%>
<form:option value="userName"><spring:message code="user"></spring:message></form:option>
<form:option value="userType"><spring:message code="user_type"></spring:message></form:option>
<%-- <form:option value="userType"><spring:message code="user_type"></spring:message></form:option> --%>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -329,7 +329,7 @@
<th column="address_pool"><spring:message code="address_pool"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="ip"><spring:message code="ip"/></th>
<%-- <th column="ip"><spring:message code="ip"/></th> --%>
<th column="log_total"><spring:message code="log_total"/></th>
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -381,7 +381,7 @@
</c:if>
</c:forEach>
</td>
<td>${indexCfg.srcIpAddress }</td>
<%-- <td>${indexCfg.srcIpAddress }</td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>

4
src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
View File

@@ -41,7 +41,7 @@
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
</div>
<select id="entranceId" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>
@@ -93,7 +93,7 @@
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
<span class="selectpicker form-control" ><spring:message code="area_id"/></span>
</div>
<select id="entranceId" name="entranceId" class="selectpicker form-control" width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option>

133
src/main/webapp/WEB-INF/views/dashboard/trafficNasIpList.jsp Normal file
View File

@@ -0,0 +1,133 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<title><spring:message code="framed_ip"></spring:message></title>
<style>
.page-content{
padding: 15px;
}
</style>
<script>
function page(n,s){
$("#pageNo").val(n);
$("#pageSize").val(s);
$("#searchForm").submit();
return false;
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
//打印列表
function doPrint() {
$("#contentTable").print({
globalStyles: true,
iframe: true,
append: null
});
}
</script>
</head>
<body>
<div class="page-content" >
<h3 class="page-title">
<spring:message code="account"/> ${searchAccount }
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}" type="${messageType }"/>
<div class="row" hidden>
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/getUserBehaviorList" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="text" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="text" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="text" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left accountSearch">
<form:input path="account" class="form-control" value="${searchAccount}"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
</div>
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top"
data-original-title=<spring:message code="custom_columns"/>
href="javascript:;"> <i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap order_table">
<thead>
<tr>
<th><spring:message code="framed_ip"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="it">
<tr>
<td>${it.nasIp}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

264
src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
View File

@@ -5,9 +5,10 @@
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/global/css/layout.css" type="text/css" media="screen">
<script type="text/javascript" src="${pageContext.request.contextPath}/static/global/plugins/jquery-ui/jquery-ui.min.js"></script>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<script src="${ctxStatic }/login/assets/js/jquery.dataTables.min.js"></script>
<title><spring:message code="traffic_user_behavior"></spring:message></title>
<style>
td:hover{
.process-noyear:hover{
cursor: pointer;
}
.Wdate {
@@ -16,7 +17,6 @@
</style>
<script>
$(document).ready(function() {
// 获取查询类型
if($("#searchBusinessType").val()==3){
$(".userBtn").removeClass("active");
@@ -121,15 +121,16 @@
});
});
function searchList(){
function page(n,s){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
}
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#pageNo").val(n);
$("#pageSize").val(s);
// $("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
}
@@ -140,11 +141,25 @@
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#account").val(param);
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
var beginDate=$('#searchFoundStartTime').val();
var endDate=$('#searchFoundEndTime').val();
var url="${ctx}/traffic/getUserBehaviorList?searchFoundStartTime="+beginDate+"&searchFoundEndTime="+endDate+"&account="+param+"&searchBusinessType="+2;
$.jBox("iframe:"+url, {
title: null,
top: '1%',
showClose: false,
draggable:false,
width: $(document).width()*0.5,
height:$(document).height()*0.8,
showScrolling: true, /* 是否显示浏览的滚动条 */
iframeScrolling: 'yes',
buttons: { 'close': true },
loaded:function(h){
$(".jbox-content,top.document").css("overflow-y","hidden");
}
});
}
var dtable;
function searchNasIpForList(param){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
@@ -152,11 +167,24 @@
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#nasIp").val(param);
$("#searchForm").attr("action","${ctx}/traffic/userBehavior");
$("#searchForm").submit();
return false;
}
var beginDate=$('#searchFoundStartTime').val();
var endDate=$('#searchFoundEndTime').val();
var url="${ctx}/traffic/getUserBehaviorList?searchFoundStartTime="+beginDate+"&searchFoundEndTime="+endDate+"&nasIp="+param+"&searchBusinessType="+3;
$.jBox("iframe:"+url, {
title: null,
top: '1%',
showClose: false,
draggable:false,
width: $(document).width()*0.5,
height:$(document).height()*0.8,
showScrolling: true, /* 是否显示浏览的滚动条 */
iframeScrolling: 'yes',
buttons: { 'close': true },
loaded:function(h){
$(".jbox-content,top.document").css("overflow-y","hidden");
}
});
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
@@ -184,10 +212,6 @@
</head>
<body>
<div class="page-content">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/traffic/userBehavior'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.history.go(-1)"><spring:message code="back"/></button>
</div> --%>
<h3 class="page-title">
<spring:message code="traffic_user_behavior"></spring:message>
</h3>
@@ -207,22 +231,20 @@
</ul>
<br>
<!-- searchform -->
<div class="row" >
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/userBehavior" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="hidden" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<!-- <input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control Wdate " -->
<%-- value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left">
@@ -230,55 +252,32 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<!-- <input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control Wdate " -->
<%-- value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${nowTime}'});"/> --%>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'d','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left accountSearch">
<!--<form:select path="account" class="selectpicker select2 input-medium" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/> <spring:message code="user"/></form:option>
<c:forEach items="${accountList}" var="acc" >
<form:option value="${acc.account}">${acc.account}</form:option>
</c:forEach>
</form:select>-->
<form:input path="account" class="form-control"/>
</div>
<div class="pull-left nasIpSearch">
<!--<form:select path="nasIp" class="selectpicker select2 input-medium" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/> <spring:message code="ip"/></form:option>
<c:forEach items="${nasIpList}" var="nIp">
<form:option value="${nIp.nasIp}" >${nIp.nasIp}</form:option>
</c:forEach>
</form:select>-->
<form:input path="nasIp" class="form-control"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
<div class="pull-right">
<div class="pull-right" hidden>
<div class="btn-group">
<button type="button"
class="btn btn-default dropdown-toggle"
data-toggle="dropdown">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right"
style="min-width: 110px;">
<li><sys:delRow
url="${ctx}/traffic/userBehaviorExport?type=excel"
<ul class="dropdown-menu pull-right" style="min-width: 81px;right: 2px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/userBehavior" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow
url="${ctx}/traffic/userBehaviorExport?type=csv"
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/userBehavior" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
@@ -286,11 +285,7 @@
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top"
data-original-title=<spring:message code="custom_columns"/>
href="javascript:;"> <i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
@@ -298,71 +293,21 @@
</div>
<br>
<!-- searchform end-->
<div class="httpReqCfg">
<div class="row">
<c:if test="${!empty accountList}">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:hidden;">
<%-- <h5 class="ng-binding"><spring:message code="user_behavior_data"/></h5> --%>
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="ip"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${userList}" var="us">
<tr>
<td>${us.nasIp}</td>
<td>${us.reportTime}</td>
<td><fmt:formatNumber type="number" value="${us.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table> --%>
<table id="contentTable" class="table table-hover table-striped table-bordered table-condensed text-nowrap table-active">
<thead>
<tr>
<th><spring:message code="account"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${accountList}" var="data">
<tr>
<td onClick="return searchAccountForList('${data.account}')"><a title="${data.account}">${data.account}</a></td>
</tr>
</c:forEach>
</tbody>
</table>
<!-- </div> -->
</div>
</div>
</div>
<div class="col-md-11" >
<c:if test="${!empty userList}">
<div class="col-md-12" >
<div class=" ">
<div class="panel-body" style="height:500px">
<div class="panel-body">
<h5 class="ng-binding"><spring:message code="account"/> : ${searchAccount}</h5>
<div id="trend" style="height: 400px; position: relative;" >
<div id="trend" style="position: relative;" >
<!-- ===================1============== -->
<div class="scrollMouse text-center">
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<i class="icon icon-mouse"></i>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
</div>
<c:if test="${!empty userList}">
<div class="about">
<div class="about-body">
<div class="about-content process-content">
@@ -370,14 +315,14 @@
<div class="process-timeline draggable">
<div id="draggable">
<div class="process-body" width="auto">
<c:forEach items="${userList}" var="us">
<c:forEach items="${page.list}" var="us">
<div class="process-row">
<div class="process-time">
<div class="time-con">
<span class="year" title="<spring:message code="visits"/>: <fmt:formatNumber type='number' value='${us.num}' minFractionDigits='0'/>">${us.reportTime}</span>
</div>
</div>
<div class="process-noyear" title="${us.nasIp}">
<div class="process-noyear" title="${us.nasIp}" onClick="return searchNasIpForList('${us.nasIp}')">
${us.nasIp}
</div>
</div>
@@ -388,16 +333,14 @@
</div>
</div>
</div>
<div class="page">${page}</div>
</div>
</c:if>
<!-- ===================1============== -->
</div>
</div>
</div>
</div></c:if>
<c:if test="${empty accountList}">
</div>
</c:if>
<c:if test="${empty userList}">
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
</div>
@@ -405,70 +348,19 @@
<!-- IP -->
<div class="httpResCfg">
<div class="row">
<c:if test="${!empty nasIpList}">
<div class="col-md-1">
<div class=" " style="height: 500px;">
<div class="panel-body" style="max-height:460px;overflow-y:auto;overflow-x:auto;">
<%-- <h5 class="ng-binding"><spring:message code="ip_behavior_data"/></h5> --%>
<div id="deviceRank" class="drank hm-scroll">
<!-- <div class="table-responsive"> -->
<%-- <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${ipList}" var="it">
<tr>
<td>${it.account}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table> --%>
<table id="contentTable" class="table table-hover table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="ip"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${nasIpList}" var="data">
<tr>
<td onClick="return searchNasIpForList('${data.nasIp}')"><a title="${data.nasIp}">${data.nasIp}</a></td>
</tr>
</c:forEach>
</tbody>
</table>
<!-- </div> -->
</div>
</div>
</div>
</div>
<div class="col-md-11" >
<c:if test="${!empty ipList}">
<div class="col-md-12" >
<div class=" ">
<div class="panel-body" style="height: 500px">
<div class="panel-body">
<h5 class="ng-binding"><spring:message code="ip"/> : ${searchNasIp}</h5>
<div id="trend" style="height: 400px; position: relative;" >
<div id="trend" style="position: relative;" >
<!-- ===================2============== -->
<div class="scrollMouse text-center">
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-left"></i> </span>
<i class="icon icon-mouse"></i>
<span id="processRight" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
<span id="processLeft" style="display:inline-block"> <i class="fa fa-caret-right"></i> </span>
</div>
<!-- -->
<c:if test="${!empty ipList}">
<div class="about">
<div class="about-body">
<div class="about-content process-content">
@@ -485,7 +377,7 @@
</div>
</div>
<div class="process-noyear" title="${it.account}">
<div class="process-noyear" title="${it.account}" onClick="return searchAccountForList('${it.account}')">
${it.account}
</div>
</div>
@@ -496,17 +388,16 @@
</div>
</div>
</div>
<div class="page">${page}</div>
</div>
</c:if>
<!-- ===================2============== -->
</div>
</div>
</div>
</div></c:if>
<c:if test="${empty nasIpList}">
<c:if test="${empty ipList}">
<div class="none-data"><i class="fa fa-warning font-red-flamingo"></i>&nbsp;&nbsp;<spring:message code="noneData"/></div>
</c:if>
</c:if>
</div>
</div>
</div>
@@ -515,8 +406,5 @@
</div>
</div>
</div>
<!-- BEGIN PAGE LEVEL SCRIPTS -->
<!-- END PAGE LEVEL SCRIPTS -->
</body>
</html>

148
src/main/webapp/WEB-INF/views/dashboard/trafficUserList.jsp Normal file
View File

@@ -0,0 +1,148 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${ctxStatic }/pages/scripts/jQuery.print.js"></script>
<title><spring:message code="traffic_user_behavior"></spring:message></title>
<style>
.page-content{
padding: 15px;
}
</style>
<script>
function page(n,s){
if($(".httpReqCfg").hasClass("hidden")){
$("#searchBusinessType").val(3);
}
if($(".httpResCfg").hasClass("hidden")){
$("#searchBusinessType").val(2);
}
$("#pageNo").val(n);
$("#pageSize").val(s);
// $("#searchForm").attr("action","${ctx}/traffic/getUserBehaviorList");
$("#searchForm").submit();
return false;
}
function setReportTime(){
var chooseDate=new Date($('#searchFoundStartTime').val());
chooseDate=chooseDate.setDate(chooseDate.getDate()+7);
var modifyTime=new Date(chooseDate);
$('#searchFoundEndTime').val(modifyTime.getFullYear()+"-"+((modifyTime.getMonth()+1)>=10?(modifyTime.getMonth()+1):"0"+(modifyTime.getMonth()+1))+"-"+(modifyTime.getDate()>=10?modifyTime.getDate():'0'+modifyTime.getDate())+' '+(modifyTime.getHours()>=10?modifyTime.getHours():'0'+modifyTime.getHours())+':'+(modifyTime.getMinutes()>=10?modifyTime.getMinutes():'0'+modifyTime.getMinutes())+':'+(modifyTime.getSeconds()>=10?modifyTime.getSeconds():'0'+modifyTime.getSeconds()));
}
//打印列表
function doPrint() {
if($('.httpResCfg').is(':hidden')){
$(".httpReqCfg").print({
globalStyles: true,
iframe: true,
append: null
});
}else{
$(".httpResCfg").print({
globalStyles: true,
iframe: true,
append: null
});
}
}
</script>
</head>
<body>
<div class="page-content">
<h3 class="page-title">
<spring:message code="framed_ip"/> ${searchNasIp }
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}" type="${messageType }"/>
<div class="row" hidden>
<form:form id="searchForm" modelAttribute="log" action="${ctx}/traffic/getUserBehaviorList" method="post" class="form-search">
<input id="searchBusinessType" name="searchBusinessType" type="hidden" value="${searchBusinessType}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundStartTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setStartTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
value="${log.searchFoundEndTime}" onclick="WdatePicker({onpicked:function(){this.onchange()},dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{\'new Date()\'}'});" onchange="setEndTime('#searchFoundStartTime','#searchFoundEndTime',1,'w','yyyy-MM-dd hh:mm:ss',false)"/>
</div>
</div>
<div class="pull-left nasIpSearch">
<form:input path="nasIp" class="form-control" value="${searchNasIp}"/>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
<div class="pull-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i>
<spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;">
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=excel"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="excel"></sys:delRow></li>
<li><sys:delRow url="${ctx}/traffic/userBehaviorExport?type=csv"
searchUrl="${ctx}/traffic/getUserBehaviorList" id="contentTable"
maxRow="10000" label="csv"></sys:delRow></li>
</ul>
</div>
<div class="btn-group">
<button type="button" class="btn btn-default css-print" onClick="doPrint()"><i class="fa glyphicon glyphicon-print" style="top:3px;margin-right: 3px;"></i><spring:message code="print"/></button>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top"
data-original-title=<spring:message code="custom_columns"/>
href="javascript:;"> <i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>
<tr>
<th><spring:message code="account"/></th>
<th><spring:message code="stat_time"/></th>
<th><spring:message code="visits"/></th>
</tr>
</thead>
<tbody>
<c:forEach items="${page.list}" var="it">
<tr>
<td>${it.account}</td>
<td>${it.reportTime}</td>
<td><fmt:formatNumber type="number" value="${it.num}" minFractionDigits="0"></fmt:formatNumber></td>
</tr>
</c:forEach>
</tbody>
</table>
<div class="page">${page}</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

6
src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
View File

@@ -266,7 +266,7 @@
<div class="form-group">
<label class="control-label"><spring:message code='APP'/>：</label>
<select id="appSelect" name="appId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${appList}" var="app" >
<option value="${app.code}"><spring:message code="${app.item}"></spring:message></option>
</c:forEach>
@@ -278,7 +278,7 @@
<div class="form-group">
<label class="control-label"><spring:message code='application_layer_protocol'/>：</label>
<select id="protoSelect" name="protoId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${protocolList}" var="proto" >
<option value="${proto.code}"><spring:message code="${proto.item}"></spring:message></option>
</c:forEach>
@@ -290,7 +290,7 @@
<div class="form-group">
<label class="control-label"><spring:message code="domain_name"/>：</label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<option value=""><spring:message code="select"/></option>
<option value="" disabled="true"><spring:message code="select"/></option>
<c:forEach items="${webList}" var="web" >
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
</c:forEach>

14
src/main/webapp/static/global/css/layout.css
View File

@@ -25,21 +25,21 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.about .about-body .about-title h1{ font-size:30px; color: #666; }
.about .about-body .about-title .help-block{ color: #cbcbcb; font-size: 20px;}
.about .about-body .about-content{ position: relative; color: #666;line-height: 180%; font-size: 16px; padding-bottom: 200px;}
.about .about-body .about-content{ position: relative; color: #666;line-height: 180%; font-size: 16px; padding-bottom: 0px;}
.about .about-body .tree-bg{ background: url('../img/about_tree_bg.png') no-repeat right bottom;}
.about .about-body .about-content p{ color: #666; text-indent: 2em; line-height: 180%; font-size: 16px;}
/**
* 发展历程
*/
.process-timeline{ height: 387px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:48%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline{ height: 200px; width: 98%; position: relative; overflow:hidden;margin-right: 25px}
.process-timeline:after{content:"";position:absolute;top:45%;left:0;margin-left:0; overflow:hidden;background:url('../img/development_timeline.png') repeat-x; height:15px; width:98%; display:block}
.process-timeline .process-body{ position: relative; height: 100%; margin-left: 0; overflow:hidden;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 30px; position: relative; height: 300px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 48.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row{ cursor:move; display: inline-block; width: 150px; float: left; margin-top: 0px; position: relative; height: 192px;overflow:hidden;}
.process-timeline .process-row .process-time{ position: absolute; top: 45.7%; left: 10%; -wekit-top:48.8%;}
.process-timeline .process-row .process-time .time-con{ position: relative; text-align: center; }
.process-timeline .process-row .process-time .time-con .pic{position: absolute; }
.process-timeline .process-row .process-time .time-con .pic i{ font-size: 100px; color: #666; }
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 9px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .year{ position: absolute; font-size: 10px; color:#000; padding: 20px 5px 0 5px;margin-left: 5px; overflow:hidden;}
.process-timeline .process-row .process-time .time-con .bgcolor{ position: absolute; border-radius: 100%; margin-top: 48px; margin-left: 10px; width: 40px; height: 40px; }
.process-timeline .process-row .process-time .time-con .bgcolor.red{ background: red;}
@@ -51,7 +51,7 @@ a:hover,a:focus{outline:none;text-decoration: none;}
.process-timeline .process-row .process-time .time-con .orange i{ color: #ff9900;}
.process-timeline .process-row .process-noyear { position: absolute; top: 43%; width: 200px; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-noyear { position: absolute; top: 30%; width: auto; font-size: 16px;margin-left: 20px; overflow:hidden;margin-right:20px}
.process-timeline .process-row .process-content{padding-bottom: 40px; }
.process-timeline .process-row .process-content h2{ font-size: 16px; text-align: center;}
.process-timeline .process-row .process-content p{text-indent: 0 !important; font-size: 11px !important; height: 180px;color: #888; white-space:normal; }

2
src/main/webapp/static/global/plugins/My97DatePicker/WdatePicker.js
View File

File diff suppressed because one or more lines are too long