Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
DuanDongmei
2018-11-26 10:19:26 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -16,9 +16,9 @@ public final class Constants {
* MaatConfig 默认值
*/
public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 2);
public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 2);
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", 2);
public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1);
/**
* iP默认值
*/

View File

@@ -512,9 +512,9 @@ port_default=0
port_mask_default=0/65535
#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c
maat_cfg_dolog_default=2
maat_cfg_dolog_doblacklist_default=2
maat_cfg_dolog_doblacklist_default=1
maat_cfg_dolog_configpercent_default=100
maat_cfg_dolog_configoption_default=2
maat_cfg_dolog_configoption_default=1
#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26
app_cfg_userregion_splitor=&
app_id_region=APP_ID