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

MaatCfg部分缺省值提到配置文件中，doLog缺省值改为1

Browse Source
This commit is contained in:
wangxin
2018-07-27 10:25:31 +08:00
parent 90de79f408
commit fc45958634
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -663,10 +663,10 @@ public class MaatCfg implements Serializable {
this.requestId = requestId; this.requestId = requestId;
} }
public void initDefaultValue() { public void initDefaultValue() {
this.doLog=2; this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
this.doBlackList=1; this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
this.configPercent=100; this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT;
this.configOption=1; this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT;
this.startTime=new Date(); this.startTime=new Date();
this.endTime=DateUtils.addYears(this.startTime, 2099-Integer.parseInt(DateUtils.getYear())); this.endTime=DateUtils.addYears(this.startTime, 2099-Integer.parseInt(DateUtils.getYear()));
this.fatherCfgId=0; this.fatherCfgId=0;

7
src/main/java/com/nis/util/Constants.java
View File

@@ -7,6 +7,13 @@ import java.util.Map;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
public final class Constants { public final class Constants {
/**
* MaatConfig 默认值
*/
public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 1);
public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 1);
public static Integer MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configpercent_default", 100);
public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1);
/** /**
* iP默认值 * iP默认值
*/ */

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

@@ -422,5 +422,11 @@ ipv4_default_ip_subnet_value=0.0.0.0/32
ipv6_default_ip_subnet_value=::/64 ipv6_default_ip_subnet_value=::/64
ipv4_default_ip_range_value=0.0.0.0-0.0.0.0 ipv4_default_ip_range_value=0.0.0.0-0.0.0.0
ipv6_default_ip_range_value=::-:: ipv6_default_ip_range_value=::-::
#端口默认值
port_default=0 port_default=0
port_mask_default=0/65535 port_mask_default=0/65535
#MAAT CFG 一些默认值
maat_cfg_dolog_default=1
maat_cfg_dolog_doblacklist_default=1
maat_cfg_dolog_configpercent_default=100
maat_cfg_dolog_configoption_default=1