(1)IP类配置页面修改,支持多选的删除,审核,操作按钮上移
(2)修复验证方法ipCheck影响多个IP配置的bug
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
/**
|
||||
*@Title: HttpsContentReplaceConfig.java
|
||||
*@Package com.nis.domain.restful
|
||||
*@Description TODO
|
||||
*@author dell
|
||||
*@date 2018年2月6日 上午10:30:46
|
||||
*@version 版本号
|
||||
*/
|
||||
package com.nis.domain.configuration;
|
||||
|
||||
/**
|
||||
* @ClassName: HttpsContentReplaceConfig.java
|
||||
* @Description: TODO
|
||||
* @author (dell)
|
||||
* @date 2018年2月6日 上午10:30:46
|
||||
* @version V1.0
|
||||
*/
|
||||
public class HttpsContentReplaceCfg extends BaseStringCfg {
|
||||
|
||||
/**
|
||||
* @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么)
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = -116828220692786004L;
|
||||
/**
|
||||
* 网站名称
|
||||
*/
|
||||
private String webName;
|
||||
/**
|
||||
* 源内容
|
||||
*/
|
||||
private String srcContent;
|
||||
/**
|
||||
* 替换内容
|
||||
*/
|
||||
private String destContent;
|
||||
/**
|
||||
* webName
|
||||
* @return webName
|
||||
*/
|
||||
|
||||
public String getWebName() {
|
||||
return webName;
|
||||
}
|
||||
/**
|
||||
* @param webName the webName to set
|
||||
*/
|
||||
public void setWebName(String webName) {
|
||||
this.webName = webName;
|
||||
}
|
||||
/**
|
||||
* srcContent
|
||||
* @return srcContent
|
||||
*/
|
||||
|
||||
public String getSrcContent() {
|
||||
return srcContent;
|
||||
}
|
||||
/**
|
||||
* @param srcContent the srcContent to set
|
||||
*/
|
||||
public void setSrcContent(String srcContent) {
|
||||
this.srcContent = srcContent;
|
||||
}
|
||||
/**
|
||||
* destContent
|
||||
* @return destContent
|
||||
*/
|
||||
|
||||
public String getDestContent() {
|
||||
return destContent;
|
||||
}
|
||||
/**
|
||||
* @param destContent the destContent to set
|
||||
*/
|
||||
public void setDestContent(String destContent) {
|
||||
this.destContent = destContent;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.nis.domain.configuration.BaseStringCfg#initDefaultValue()
|
||||
*/
|
||||
@Override
|
||||
public void initDefaultValue() {
|
||||
// TODO Auto-generated method stub
|
||||
super.initDefaultValue();
|
||||
this.exprType=0;
|
||||
this.matchMethod=3;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -19,19 +19,20 @@ import java.util.Map;
|
||||
* @version V1.0
|
||||
*/
|
||||
public class MultipleCfg extends BaseCfg<MultipleCfg> {
|
||||
|
||||
/**
|
||||
* @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么)
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = -8369567908781421920L;
|
||||
/**
|
||||
* 配置关系表,一个compileId 中有哪些表存了数据
|
||||
*/
|
||||
private MultipleCfgRelation relation;
|
||||
private String mainTable;
|
||||
private String mainTableType;
|
||||
private String mainTableDesc;
|
||||
private List<TableBean> otherTables;//key 表名,value 类型
|
||||
// private BaseCfg mainCfg;
|
||||
//ip配置
|
||||
private Map<String,BaseIpCfg> ipCfg;
|
||||
//字符串配置
|
||||
@@ -168,4 +169,18 @@ public class MultipleCfg extends BaseCfg<MultipleCfg> {
|
||||
public void setMainTableDesc(String mainTableDesc) {
|
||||
this.mainTableDesc = mainTableDesc;
|
||||
}
|
||||
/**
|
||||
* relation
|
||||
* @return relation
|
||||
*/
|
||||
|
||||
public MultipleCfgRelation getRelation() {
|
||||
return relation;
|
||||
}
|
||||
/**
|
||||
* @param relation the relation to set
|
||||
*/
|
||||
public void setRelation(MultipleCfgRelation relation) {
|
||||
this.relation = relation;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
/**
|
||||
*@Title: MultipleCfgRelation.java
|
||||
*@Package com.nis.domain.configuration
|
||||
*@Description TODO
|
||||
*@author dell
|
||||
*@date 2018年4月10日 上午11:11:53
|
||||
*@version 版本号
|
||||
*/
|
||||
package com.nis.domain.configuration;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @ClassName: MultipleCfgRelation.java
|
||||
* @Description: TODO
|
||||
* @author (dell)
|
||||
* @date 2018年4月10日 上午11:11:53
|
||||
* @version V1.0
|
||||
*/
|
||||
public class MultipleCfgRelation implements Serializable{
|
||||
|
||||
/**
|
||||
* @Fields serialVersionUID:TODO(用一句话描述这个变量表示什么)
|
||||
*
|
||||
* @since 1.0.0
|
||||
*/
|
||||
|
||||
private static final long serialVersionUID = -615924510840736781L;
|
||||
private int compileId;
|
||||
private String tableName;
|
||||
private int isValid;
|
||||
/**
|
||||
* compileId
|
||||
* @return compileId
|
||||
*/
|
||||
|
||||
public int getCompileId() {
|
||||
return compileId;
|
||||
}
|
||||
/**
|
||||
* @param compileId the compileId to set
|
||||
*/
|
||||
public void setCompileId(int compileId) {
|
||||
this.compileId = compileId;
|
||||
}
|
||||
/**
|
||||
* tableName
|
||||
* @return tableName
|
||||
*/
|
||||
|
||||
public String getTableName() {
|
||||
return tableName;
|
||||
}
|
||||
/**
|
||||
* @param tableName the tableName to set
|
||||
*/
|
||||
public void setTableName(String tableName) {
|
||||
this.tableName = tableName;
|
||||
}
|
||||
/**
|
||||
* isValid
|
||||
* @return isValid
|
||||
*/
|
||||
|
||||
public int getIsValid() {
|
||||
return isValid;
|
||||
}
|
||||
/**
|
||||
* @param isValid the isValid to set
|
||||
*/
|
||||
public void setIsValid(int isValid) {
|
||||
this.isValid = isValid;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user