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

dolog改名Log Option，只要yes or no

Browse Source
This commit is contained in:
leijun
2018-09-26 15:46:50 +08:00
parent b25ecab8ff
commit 09baf72da3
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ 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_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);

5
src/main/resources/messages/message_en.properties
View File

@@ -1081,10 +1081,7 @@ domain_intercepter_ratelimit=Domain Intercept Ratelimit
app_built_in_features_config=APP Built-in Features
PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
do_log=Do Log
no_log=Not Do Log
all_log=Log All Logs
framework_log=Structured Logs
do_log=Log Option
file_strategy=File Strategy
file_desc=File Desc

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1081,9 +1081,6 @@ app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587
certificate=\u8BC1\u4E66
do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
no_log=\u4E0D\u8BB0\u5F55
all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7
file_strategy=\u6587\u4EF6\u7B56\u7565
file_desc=\u6587\u4EF6\u63CF\u8FF0\t
content_type=\u5185\u5BB9\u7C7B\u578B

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

@@ -508,7 +508,7 @@ ipv6_default_ip_range_value=::-::
port_default=0
port_mask_default=0/65535
#MAAT CFG \u4E00\u4E9B\u9ED8\u8BA4\u503C
maat_cfg_dolog_default=2
maat_cfg_dolog_default=1
maat_cfg_dolog_doblacklist_default=1
maat_cfg_dolog_configpercent_default=100
maat_cfg_dolog_configoption_default=1

4
src/main/resources/sql/20180926/update_dictionary_item.sql Normal file
View File

@@ -0,0 +1,4 @@
#配置是否记录日志修改
delete from sys_data_dictionary_item where dictionary_id = '103';
INSERT INTO `sys_data_dictionary_item` (`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('0', 'no', '否', '0', '1', '1', '103');
INSERT INTO `sys_data_dictionary_item` (`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('1', 'yes', '是', '0', '1', '1', '103');

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -848,7 +848,7 @@ var switchAction=function(action){
//如果表单非修改时，选中默认值
if(!$("input[name='compileId']").val()){
$(".doLog").removeClass("hidden");
$("input[name=doLog][value=2]").prop("checked",true);
$("input[name=doLog][value=1]").prop("checked",true);
$(".interceptDoLog").find("input[name=doLog][value=1]").prop("checked",true);
}
}
@@ -857,7 +857,7 @@ var switchAction=function(action){
$("input[name=doLog][value=0]").parent(".radio-inline").addClass("hidden");
if($("input[name=doLog][value=0]").is(":checked")){
$("input[name=doLog][value=0]").removeAttr("checked");
$("input[name=doLog][value=2]").prop("checked",true);
$("input[name=doLog][value=1]").prop("checked",true);
$(".interceptDoLog").find("input[name=doLog][value=1]").prop("checked",true);
}
}