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

(1)maatCfg 加入requestId字段,注解为affairId，用来来函的实时统计

Browse Source 
(2)IP白名单导入，调整来函不验证
(3)基础协议，加密隧道行为，修改部分界面字段名
This commit is contained in:
wangxin
2018-07-26 11:04:57 +08:00
parent 05736d7d41
commit 6705bf02ec
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -73,6 +73,9 @@ public class MaatCfg implements Serializable {
@Expose
private Integer fatherCfgId;
@Expose
@SerializedName("affairId")
private Integer requestId;
@Expose
@SerializedName("opTime")
private Date auditTime;
@Expose
@@ -652,6 +655,13 @@ public class MaatCfg implements Serializable {
public void setIsValid(Integer isValid) {
this.isValid = isValid;
}
public Integer getRequestId() {
return requestId;
}
public void setRequestId(Integer requestId) {
this.requestId = requestId;
}
public void initDefaultValue() {
this.doLog=2;
this.doBlackList=1;

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

@@ -818,13 +818,22 @@ public class BaseController {
// requestId check start
Integer requestId=value.getRequestId();
if(requestId==null){
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("letter"))+";");
if("whitelistip".equals(specialItem)) {
value.setRequestId(0);
}else {
errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("letter"))+";");
}
}else{//查询数据库是否存在ID
RequestInfo info=requestInfoService.getRequestInfoById((long)requestId.intValue());
if(info==null){
errInfo.append(String.format(prop.getProperty("id_not_exists"),requestId, prop.getProperty("letter"))+";");
}else if(info.getIsValid()==Constants.VALID_NO||info.getIsValid()==Constants.VALID_DEL){
errInfo.append(String.format(prop.getProperty("id_not_valid"),requestId, prop.getProperty("letter"))+";");
if("whitelistip".equals(specialItem)) {
value.setRequestId(0);
}else {
RequestInfo info=requestInfoService.getRequestInfoById((long)requestId.intValue());
if(info==null){
errInfo.append(String.format(prop.getProperty("id_not_exists"),requestId, prop.getProperty("letter"))+";");
}else if(info.getIsValid()==Constants.VALID_NO||info.getIsValid()==Constants.VALID_DEL){
errInfo.append(String.format(prop.getProperty("id_not_valid"),requestId, prop.getProperty("letter"))+";");
}
}
}
// requestId check end