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

1、接口date类型去掉时区，并将日期格式设置为yyyy-MM-dd HH:mm:ss；

Browse Source 
2、添加配置日志总量统计服务接口示例；
3、为DNS响应策略配置(service=65)和DNS欺骗地址(service=65)添加配置文件；
This commit is contained in:
zhangdongxu
2018-06-22 10:48:53 +08:00
parent 2185421a3b
commit ec90d8867b
21 changed files with 560 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/domain/restful/ConfigCommonSource.java
View File

@@ -11,6 +11,7 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
@@ -29,6 +30,7 @@ public abstract class ConfigCommonSource implements Serializable {
private static final long serialVersionUID = 152715081015545848L;
protected String version;//默认版本1.0
protected String operator;//操作人员
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
protected Date opTime;//操作时间
protected Integer opAction;//操作行为 1-插入 2-更新 3-删除 4-查询（暂无）
/**

10
src/main/java/com/nis/domain/restful/ConfigCompile.java
View File

@@ -12,9 +12,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
@@ -52,9 +50,11 @@ public class ConfigCompile implements Serializable {
private Integer doLog;
@ApiModelProperty(value = "生效范围", required = true)
private String effectiveRange;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "开始时间", required = true)
private Date startTime;
@ApiModelProperty(value = "结束时间", required = true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date endTime;
@ApiModelProperty(value = "用户自定义域", required = true)
private String userRegion;
@@ -65,6 +65,7 @@ public class ConfigCompile implements Serializable {
@ApiModelProperty(value = "父配置ID", required = true)
private Long fatherCfgId;
@ApiModelProperty(value = "操作时间", required = true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime;
@ApiModelProperty(value = "编译分组关系列表", required = true)
@@ -196,7 +197,6 @@ public class ConfigCompile implements Serializable {
/**
* @return startTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getStartTime() {
return startTime;
}
@@ -212,7 +212,6 @@ public class ConfigCompile implements Serializable {
/**
* @return endTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getEndTime() {
return endTime;
}
@@ -288,7 +287,6 @@ public class ConfigCompile implements Serializable {
/**
* @return opTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}

6
src/main/java/com/nis/domain/restful/ConfigGroupRelation.java
View File

@@ -11,9 +11,7 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
@@ -36,6 +34,7 @@ public class ConfigGroupRelation implements Serializable {
@ApiModelProperty(value = "有效标志", required = true)
private Integer isValid;
@ApiModelProperty(value = "操作时间", required = true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime;
@@ -87,7 +86,6 @@ public class ConfigGroupRelation implements Serializable {
/**
* @return opTime
*/
@JsonSerialize(using = JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}

3
src/main/java/com/nis/domain/restful/ConfigSource.java
View File

@@ -11,7 +11,9 @@ package com.nis.domain.restful;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateDeserializer;
import com.nis.util.JsonDateSerializer;
/**
@@ -82,6 +84,7 @@ public class ConfigSource extends ConfigCommonSource{
/**
* @param opTime 要设置的 opTime
*/
@JsonDeserialize(using=JsonDateDeserializer.class)
public void setOpTime(Date opTime) {
this.opTime = opTime;
}

11
src/main/java/com/nis/domain/restful/DigestRegion.java
View File

@@ -3,6 +3,8 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
public class DigestRegion implements Serializable{
/**
@@ -16,6 +18,7 @@ public class DigestRegion implements Serializable{
private String digest;
private Integer cfdsLevel;
private int isValid ;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime = new Date();
public Long getRegionId() {
return regionId;
@@ -59,9 +62,17 @@ public class DigestRegion implements Serializable{
public void setIsValid(int isValid) {
this.isValid = isValid;
}
/**
* @return opTime
*/
public Date getOpTime() {
return opTime;
}
/**
* @param opTime 要设置的 opTime
*/
public void setOpTime(Date opTime) {
this.opTime = opTime;
}

5
src/main/java/com/nis/domain/restful/IpRegion.java
View File

@@ -11,9 +11,8 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
@@ -62,6 +61,7 @@ public class IpRegion implements Serializable {
@ApiModelProperty(value="有效标志", required=true)
private Integer isValid;
@ApiModelProperty(value="操作时间", required=true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime;
@ApiModelProperty(value="版本序列号", required=true)
private Long procSeq;
@@ -286,7 +286,6 @@ public class IpRegion implements Serializable {
/**
* @return opTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}

86
src/main/java/com/nis/domain/restful/NtcHttpLog.java
View File

@@ -10,48 +10,21 @@ public class NtcHttpLog extends LogEntity {
private static final long serialVersionUID = 2553033624540656138L;
@ApiModelProperty(value="TCP初始序列号", required=true)
protected Long c2sIsn;
@ApiModelProperty(value="是否HTTP代理标志", required=true)
protected Long httpProxyFlag;
@ApiModelProperty(value="HTTP会话序列号", required=true)
protected Long httpSeq;
@ApiModelProperty(value="url地址", required=true)
protected String url;
@ApiModelProperty(value="请求行", required=true)
protected String reqLine;
@ApiModelProperty(value="请求头转储文件", required=true)
protected String reqHdrFile;
@ApiModelProperty(value="应答行", required=true)
protected String resLine;
@ApiModelProperty(value="请求体转储文件", required=true)
protected String reqBodyFile;
@ApiModelProperty(value="应答头转储文件", required=true)
protected String resHdrFile;
@ApiModelProperty(value="应答体转储文件", required=true)
protected String resBodyFile;
public Long getC2sIsn() {
return c2sIsn;
}
public void setC2sIsn(Long c2sIsn) {
this.c2sIsn = c2sIsn;
}
public Long getHttpProxyFlag() {
return httpProxyFlag;
}
public void setHttpProxyFlag(Long httpProxyFlag) {
this.httpProxyFlag = httpProxyFlag;
}
public Long getHttpSeq() {
return httpSeq;
}
public void setHttpSeq(Long httpSeq) {
this.httpSeq = httpSeq;
}
public String getUrl() {
return url;
@@ -61,19 +34,36 @@ public class NtcHttpLog extends LogEntity {
this.url = url;
}
public String getReqLine() {
return reqLine;
}
public String getReqHdrFile() {
return reqHdrFile;
}
public void setReqLine(String reqLine) {
this.reqLine = reqLine;
}
public void setReqHdrFile(String reqHdrFile) {
this.reqHdrFile = reqHdrFile;
}
public String getResLine() {
return resLine;
}
public String getReqBodyFile() {
return reqBodyFile;
}
public void setReqBodyFile(String reqBodyFile) {
this.reqBodyFile = reqBodyFile;
}
public String getResHdrFile() {
return resHdrFile;
}
public void setResHdrFile(String resHdrFile) {
this.resHdrFile = resHdrFile;
}
public String getResBodyFile() {
return resBodyFile;
}
public void setResBodyFile(String resBodyFile) {
this.resBodyFile = resBodyFile;
}
public void setResLine(String resLine) {
this.resLine = resLine;
}
}

180
src/main/java/com/nis/domain/restful/NtcPzReport.java Normal file
View File

@@ -0,0 +1,180 @@
package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import javax.xml.bind.annotation.XmlTransient;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.common.collect.Maps;
import com.nis.domain.Page;
import com.nis.util.JsonDateSerializer;
import com.wordnik.swagger.annotations.ApiModelProperty;
public class NtcPzReport implements Serializable{
private static final long serialVersionUID = 987165268916441272L;
@ApiModelProperty(value="配置ID", required=true)
protected Long cfgId;
@ApiModelProperty(value="业务类型", required=true)
protected Integer service;
@ApiModelProperty(value="日志数量", required=true)
protected Long sum;
@ApiModelProperty(value="统计时间", required=true)
protected Date reportTime;
/**
* 业务类型：1:配置命中总量业务 2:配置报表业务
*/
protected String searchBusinessType = "1";
protected String searchReportStartTime;
protected String searchReportEndTime;
protected Long searchReportStartTimeCluster;
protected Long searchReportEndTimeCluster;
protected String searchService;
protected String searchCfgId;
protected Page<NtcPzReport> page;
/**
* 自定义SQL（SQL标识，SQL内容）
*/
protected Map<String, String> sqlMap;
/**
*
*/
public NtcPzReport() {
super();
// TODO Auto-generated constructor stub
}
/**
* @param cfgId
* @param service
*/
public NtcPzReport(Long cfgId, Long sum) {
super();
this.cfgId = cfgId;
this.sum = sum;
}
public Long getCfgId() {
return cfgId;
}
public void setCfgId(Long cfgId) {
this.cfgId = cfgId;
}
public Integer getService() {
return service;
}
public void setService(Integer service) {
this.service = service;
}
public Long getSum() {
return sum;
}
public void setSum(Long sum) {
this.sum = sum;
}
@JsonSerialize(using=JsonDateSerializer.class)
public Date getReportTime() {
return reportTime;
}
public void setReportTime(Date reportTime) {
this.reportTime = reportTime;
}
@JsonIgnore
public String getSearchBusinessType() {
return searchBusinessType;
}
public void setSearchBusinessType(String searchBusinessType) {
this.searchBusinessType = searchBusinessType;
}
@JsonIgnore
public String getSearchReportStartTime() {
return searchReportStartTime;
}
public void setSearchReportStartTime(String searchReportStartTime) {
this.searchReportStartTime = searchReportStartTime;
}
@JsonIgnore
public String getSearchReportEndTime() {
return searchReportEndTime;
}
public void setSearchReportEndTime(String searchReportEndTime) {
this.searchReportEndTime = searchReportEndTime;
}
@JsonIgnore
public Long getSearchReportStartTimeCluster() {
return searchReportStartTimeCluster;
}
public void setSearchReportStartTimeCluster(Long searchReportStartTimeCluster) {
this.searchReportStartTimeCluster = searchReportStartTimeCluster;
}
@JsonIgnore
public Long getSearchReportEndTimeCluster() {
return searchReportEndTimeCluster;
}
public void setSearchReportEndTimeCluster(Long searchReportEndTimeCluster) {
this.searchReportEndTimeCluster = searchReportEndTimeCluster;
}
@JsonIgnore
public String getSearchService() {
return searchService;
}
public void setSearchService(String searchService) {
this.searchService = searchService;
}
@JsonIgnore
public String getSearchCfgId() {
return searchCfgId;
}
public void setSearchCfgId(String searchCfgId) {
this.searchCfgId = searchCfgId;
}
@JsonIgnore
@XmlTransient
public Page<NtcPzReport> getPage() {
if (page == null){
page = new Page<NtcPzReport>();
}
return page;
}
public Page<NtcPzReport> setPage(Page<NtcPzReport> page) {
this.page = page;
return page;
}
@JsonIgnore
@XmlTransient
public Map<String, String> getSqlMap() {
if (sqlMap == null){
sqlMap = Maps.newHashMap();
}
return sqlMap;
}
public void setSqlMap(Map<String, String> sqlMap) {
this.sqlMap = sqlMap;
}
}

5
src/main/java/com/nis/domain/restful/NumRegion.java
View File

@@ -11,9 +11,8 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
@@ -45,6 +44,7 @@ public class NumRegion implements Serializable{
@ApiModelProperty(value="是否有效", required=true)
private int isValid;
@ApiModelProperty(value="操作时间", required=true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime;
@ApiModelProperty(value="版本序列号", required=true)
private Long procSeq;
@@ -145,7 +145,6 @@ public class NumRegion implements Serializable{
/**
* @return opTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}

5
src/main/java/com/nis/domain/restful/StrRegion.java
View File

@@ -11,9 +11,8 @@ package com.nis.domain.restful;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.nis.util.JsonDateSerializer;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
@@ -48,6 +47,7 @@ public class StrRegion implements Serializable {
@ApiModelProperty(value="是否有效", required=true)
private int isValid;
@ApiModelProperty(value="操作时间", required=true)
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date opTime;
@ApiModelProperty(value="版本序列号", required=true)
private Long procSeq;
@@ -172,7 +172,6 @@ public class StrRegion implements Serializable {
/**
* @return opTime
*/
@JsonSerialize(using=JsonDateSerializer.class)
public Date getOpTime() {
return opTime;
}