修复配置td title显示问题
http url界面增加配置来源信息
This commit is contained in:
duandongmei
@@ -192,6 +192,20 @@ public class WebsiteController extends BaseController{
|
||||
websiteCfgService.saveHttpCfg(entity);
|
||||
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
|
||||
}
|
||||
@RequestMapping(value = {"saveHttpUrlCfgs"})
|
||||
public String saveHttpUrlCfgs(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,CfgIndexInfo entity) {
|
||||
if(!StringUtil.isEmpty(entity) && !StringUtil.isEmpty(entity.getHttpUrlList())){
|
||||
for (HttpUrlCfg httpUrlCfg : entity.getHttpUrlList()) {
|
||||
CfgIndexInfo cfg=new CfgIndexInfo();
|
||||
List httpList=new ArrayList<>();
|
||||
BeanUtils.copyProperties(httpUrlCfg, cfg);
|
||||
httpList.add(httpUrlCfg);
|
||||
cfg.setHttpUrlList(httpList);
|
||||
websiteCfgService.saveHttpCfg(cfg);
|
||||
}
|
||||
}
|
||||
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
|
||||
}
|
||||
@RequestMapping(value = {"ajaxHttpSubList"})
|
||||
public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
|
||||
CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId);
|
||||
@@ -220,9 +234,11 @@ public class WebsiteController extends BaseController{
|
||||
try {
|
||||
websiteCfgService.auditHttpCfg(entity,isAudit);
|
||||
} catch (MaatConvertException e) {
|
||||
e.printStackTrace();
|
||||
logger.info("http配置下发失败："+e.getMessage());
|
||||
addMessage(redirectAttributes, e.getMessage());
|
||||
logger.error("http配置下发失败："+e.getMessage());
|
||||
addMessage(redirectAttributes, "request_service_failed");
|
||||
}catch (Exception e) {
|
||||
logger.error("http配置下发失败："+e.getMessage());
|
||||
addMessage(redirectAttributes, "audit_failed");
|
||||
}
|
||||
}
|
||||
return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+functionId;
|
||||
@@ -553,22 +569,6 @@ public class WebsiteController extends BaseController{
|
||||
pageInfo.setPageSize(-1);
|
||||
}
|
||||
Page<CfgIndexInfo> page = httpRedirectCfgService.getHttpRedirectList(pageInfo, entity);
|
||||
titleList.add(entity.getMenuNameCode());
|
||||
titleList.add("NTC_HTTP_URL");
|
||||
titleList.add("NTC_HTTP_REQ_HDR");
|
||||
titleList.add("NTC_HTTP_RES_HDR");
|
||||
titleList.add("NTC_HTTP_REQ_BODY");
|
||||
titleList.add("NTC_HTTP_RES_BODY");
|
||||
titleList.add("NTC_UNIVERSAL_IP");
|
||||
titleList.add("NTC_SUBSCRIBE_ID");
|
||||
classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
|
||||
classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
|
||||
classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class);
|
||||
classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
|
||||
classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
|
||||
classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
|
||||
classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class);
|
||||
classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
|
||||
String cfgIndexInfoNoExport=",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
|
||||
String httpUrlCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
|
||||
+ ",config_time,editor,edit_time,auditor,audit_time"
|
||||
@@ -597,16 +597,7 @@ public class WebsiteController extends BaseController{
|
||||
String ntcSubscribeIdCfgNoExport=",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
|
||||
+ ",config_time,editor,edit_time,auditor,audit_time"
|
||||
+",letter,whether_area_block,classification,attribute,label"
|
||||
+",userregion1,userregion2,userregion3,userregion4,userregion5,";
|
||||
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
|
||||
noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
|
||||
noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport);
|
||||
noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
|
||||
|
||||
+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
|
||||
List<BaseStringCfg> httpUrlList = new ArrayList<>();
|
||||
List<ComplexkeywordCfg> httpReqHdrList = new ArrayList<>();
|
||||
List<ComplexkeywordCfg> httpResHdrList = new ArrayList<>();
|
||||
@@ -630,15 +621,43 @@ public class WebsiteController extends BaseController{
|
||||
httpReqBodyList=BaseStringCfg.replaceBaseKeyList(httpReqBodyList);
|
||||
httpResBodyList=BaseStringCfg.replaceBaseKeyList(httpResBodyList);
|
||||
subscribeIdList=BaseStringCfg.baseHexList(subscribeIdList);
|
||||
titleList.add(entity.getMenuNameCode());
|
||||
classMap.put(entity.getMenuNameCode(), CfgIndexInfo.class);
|
||||
noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
|
||||
dataMap.put(entity.getMenuNameCode(), page.getList());
|
||||
dataMap.put("NTC_HTTP_URL", httpUrlList);
|
||||
dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
|
||||
dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
|
||||
|
||||
if(entity.getFunctionId()!=635){
|
||||
titleList.add("NTC_HTTP_URL");
|
||||
titleList.add("NTC_HTTP_REQ_HDR");
|
||||
titleList.add("NTC_HTTP_RES_HDR");
|
||||
classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
|
||||
classMap.put("NTC_HTTP_REQ_HDR", HttpReqHeadCfg.class);
|
||||
classMap.put("NTC_HTTP_RES_HDR", HttpResHeadCfg.class);
|
||||
noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_REQ_HDR", httpReqHeadCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_RES_HDR", httpResHeadCfgNoExport);
|
||||
dataMap.put("NTC_HTTP_URL", httpUrlList);
|
||||
dataMap.put("NTC_HTTP_REQ_HDR", httpReqHdrList);
|
||||
dataMap.put("NTC_HTTP_RES_HDR", httpResHdrList);
|
||||
}
|
||||
titleList.add("NTC_HTTP_REQ_BODY");
|
||||
titleList.add("NTC_HTTP_RES_BODY");
|
||||
classMap.put("NTC_HTTP_REQ_BODY", HttpBodyCfg.class);
|
||||
classMap.put("NTC_HTTP_RES_BODY", HttpBodyCfg.class);
|
||||
noExportMap.put("NTC_HTTP_REQ_BODY", httpReqBodyCfgNoExport);
|
||||
noExportMap.put("NTC_HTTP_RES_BODY", httpResBodyCfgNoExport);
|
||||
dataMap.put("NTC_HTTP_REQ_BODY", httpReqBodyList);
|
||||
dataMap.put("NTC_HTTP_RES_BODY", httpResBodyList);
|
||||
if(entity.getFunctionId()!=635){
|
||||
titleList.add("NTC_UNIVERSAL_IP");
|
||||
titleList.add("NTC_SUBSCRIBE_ID");
|
||||
classMap.put("NTC_UNIVERSAL_IP", IpPortCfg.class);
|
||||
classMap.put("NTC_SUBSCRIBE_ID", NtcSubscribeIdCfg.class);
|
||||
noExportMap.put("NTC_UNIVERSAL_IP", ipPortCfgNoExport);
|
||||
noExportMap.put("NTC_SUBSCRIBE_ID", ntcSubscribeIdCfgNoExport);
|
||||
dataMap.put("NTC_UNIVERSAL_IP", ipPortList);
|
||||
dataMap.put("NTC_SUBSCRIBE_ID",subscribeIdList);
|
||||
|
||||
}
|
||||
/*}*/
|
||||
this._export(model, request, response, redirectAttributes,entity.getMenuNameCode(),titleList,classMap,dataMap,noExportMap);
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -103,7 +103,7 @@ isp_manage=ISP
|
||||
ip_multiple_control=IP Multiple Control
|
||||
ip_port_control=IP+PORT Control
|
||||
website_multiple_control=Website Multiple Control
|
||||
mail_multiple_control=Mail Multiple Control
|
||||
mail_multiple_control=Mail Advanced
|
||||
request_header_control=Http Request Header Control
|
||||
plaintext_monitor=Plaintext Monitor
|
||||
ip_address_monitor=IP Monitor
|
||||
@@ -562,7 +562,7 @@ ssl_ip=SSL IP Configuration
|
||||
ssl_sni=SSL SNI Keyword Configuration
|
||||
ssl_san=SSL SAN Keyword Configuration
|
||||
ssl_ca=SSL CN Keyword Configuration
|
||||
http_control=HTTP Configuration
|
||||
http_control=HTTP Advanced
|
||||
ingress=Ingress
|
||||
egress=Egress
|
||||
fileTransfer_control=File Transfer Configuration
|
||||
@@ -1006,7 +1006,7 @@ browser=Browser
|
||||
trend=Trend
|
||||
traffic_website_list=Website TOP10
|
||||
traffic_website_type_chart=Website Type
|
||||
website=webSite
|
||||
website=Website
|
||||
#===============dashboard end===================================
|
||||
ratelimit_limit=Limit Rate must between 0 and 1
|
||||
Maintenance=Policy Object
|
||||
@@ -1234,7 +1234,7 @@ log_management=Log Management
|
||||
log_date=Date Range
|
||||
log_exception=Query Exception
|
||||
log_user=Operating User
|
||||
log_submission=Submission
|
||||
log_submission=Request Method
|
||||
log_ip=Operator IP
|
||||
log_exception_info=Exception Information
|
||||
system_log=Log Management
|
||||
@@ -1258,7 +1258,7 @@ pps_threadshold=Traffic Threshold(pps)
|
||||
one_more_greater_zero=At Least One Threshold Is Not 0.
|
||||
can_not_be= can not be %s
|
||||
the_same_ip_type_pattern=Client IP and Server IP must have the same IP type and the same IP pattern
|
||||
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit
|
||||
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0
|
||||
the_same_port_pattern=Client port and server port must in the same port pattern
|
||||
ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
|
||||
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
|
||||
@@ -1289,4 +1289,13 @@ http_keyword_reject=Website Keyword Block
|
||||
has_invisible_char=%s has invisible characters
|
||||
not_multiple=%s do not support multiple keywords
|
||||
template_error=The import template is incorrect. Pleace choose a proper template which has the same language with the system and the same configure type.
|
||||
asn_no=ASN
|
||||
asn_no=ASN
|
||||
query=Query
|
||||
cfg_operation_log=Configuration Operation Log
|
||||
function_name=Operation Module
|
||||
config_service_statistics=Config Statistics
|
||||
ruleLimitTip=The number of effective rules has reached the limit(%s).
|
||||
av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP.
|
||||
ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet
|
||||
log_to_url=To HTTP URL
|
||||
source_compile_id=Configuration Source
|
||||
@@ -1224,25 +1224,6 @@ area_group_manage=Group Area Manage
|
||||
stream_media_protocol=Stream Media Protocol
|
||||
new_link=New Link
|
||||
active_link=Active Link
|
||||
traffic_ipactive_hour_trend=Active IP TOP10 Trend In Nearly One Hour
|
||||
traffic_ipactive_hour_max=Active IP TOP10 Maximum In Nearly One Hour
|
||||
ip_addr=IP
|
||||
area_id=Area
|
||||
link_num=Link Number
|
||||
stat_time=Statistical Time
|
||||
log_menu=Operation Menu
|
||||
log_management=Log Management
|
||||
log_date=Date Range
|
||||
log_exception=Query Exception
|
||||
log_user=Operating User
|
||||
log_submission=Submission
|
||||
log_ip=Operator IP
|
||||
log_exception_info=Exception Information
|
||||
system_log=Log Management
|
||||
NTC_VOIP_ACCOUNT=VoIP \u0410\u043a\u043a\u0430\u0443\u043d\u0442
|
||||
stream_media_protocol=Stream Media Protocol
|
||||
new_link=New Link
|
||||
active_link=Active Link
|
||||
traffic_ipactive_hour_trend=Active IPTOP10 Trend In Nearly One Hour
|
||||
traffic_ipactive_hour_max=Active IPTOP10 Maximum In Nearly One Hour
|
||||
ip_addr=IP
|
||||
@@ -1254,10 +1235,10 @@ log_management=Log Management
|
||||
log_date=Date Range
|
||||
log_exception=Query Exception
|
||||
log_user=Operating User
|
||||
log_submission=Submission
|
||||
log_submission=Request Method
|
||||
log_ip=Operator IP
|
||||
log_exception_info=Exception Information
|
||||
system_log=Log Management
|
||||
system_log=Log Management
|
||||
protected_ddos=Protected DDOS
|
||||
usual_ddos=Usual DDOS
|
||||
mail_address=Mail Address
|
||||
@@ -1278,7 +1259,7 @@ pps_threadshold=Traffic Threshold(pps)
|
||||
one_more_greater_zero=At Least One Threshold Is Not 0.
|
||||
can_not_be=Can not be %s
|
||||
the_same_ip_type_pattern=Client IP and Server IP must have the same IP type and the same IP pattern
|
||||
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit
|
||||
protocol_and_port=Only when TCP protocol or UDP protocol is chosen can port greater than 0
|
||||
the_same_port_pattern=Client port and server port must in the same port pattern
|
||||
ip_range_in_c=Start IP and end IP in a IP range must with in C subnet
|
||||
ip_range_bit_field=Start IP and end IP in a IP range has the same network number bit field
|
||||
@@ -1306,4 +1287,12 @@ import_tip_excel=Please choose a valid Excel file with which it's subfix is .xls
|
||||
http_keyword=Website Keyword
|
||||
http_keyword_monit=Website Keyword Monit
|
||||
http_keyword_reject=Website Keyword Reject
|
||||
asn_no=ASN
|
||||
asn_no=ASN
|
||||
query=Query
|
||||
cfg_operation_log=Configuration Operation Log
|
||||
function_name=Operation Module
|
||||
config_service_statistics=Config Statistics
|
||||
ruleLimitTip=The number of effective rules has reached the limit(%s).
|
||||
av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP.
|
||||
log_to_url=To HTTP URL
|
||||
source_compile_id=Configuration Source
|
||||
@@ -103,7 +103,7 @@ isp_manage=\u8FD0\u8425\u5546\u7BA1\u7406
|
||||
ip_multiple_control=IP\u591A\u57DF\u7BA1\u63A7
|
||||
ip_port_control=IP+\u7AEF\u53E3\u7BA1\u63A7
|
||||
website_multiple_control=\u7F51\u7AD9\u591A\u57DF\u7BA1\u63A7
|
||||
mail_multiple_control=\u90AE\u4EF6\u591A\u57DF\u7BA1\u63A7
|
||||
mail_multiple_control=\u90AE\u4EF6\u9AD8\u7EA7\u914D\u7F6E
|
||||
request_header_control=\u8BF7\u6C42\u5934\u57DF\u7BA1\u63A7
|
||||
plaintext_monitor=\u660E\u6587\u5185\u5BB9\u76D1\u6D4B
|
||||
ip_address_monitor=IP\u5730\u5740\u76D1\u6D4B
|
||||
@@ -561,7 +561,7 @@ ssl_ip=SSL IP\u914D\u7F6E
|
||||
ssl_sni=SSL SNI\u5173\u952E\u5B57\u914D\u7F6E
|
||||
ssl_san=SSL SAN\u5173\u952E\u5B57\u914D\u7F6E
|
||||
ssl_ca=SSL CN\u5173\u952E\u5B57\u914D\u7F6E
|
||||
http_control=HTTP\u914D\u7F6E
|
||||
http_control=HTTP\u9AD8\u7EA7\u914D\u7F6E
|
||||
ingress=\u5165\u53E3\u65B9\u5411
|
||||
egress=\u51FA\u53E3\u65B9\u5411
|
||||
fileTransfer_control=\u6587\u4EF6\u4F20\u8F93\u914D\u7F6E
|
||||
@@ -962,7 +962,7 @@ app_byte_feature_monit=APP\u5B57\u8282\u7279\u5F81\u76D1\u6D4B
|
||||
proxy_domain_forward=\u57DF\u540D\u8F6C\u53D1
|
||||
ip_complex_loop=IP\u590D\u7528
|
||||
ddos_ip_drop=DDOS\u76EE\u6807\u9632\u62A4IP
|
||||
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u914D\u7F6E
|
||||
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41
|
||||
app_strategy_monit=APP\u7B56\u7565\u76D1\u6D4B
|
||||
app_strategy_drop=APP\u7B56\u7565\u4E22\u5F03
|
||||
ctrl_http_reject=HTTP(S)\u7BA1\u63A7
|
||||
@@ -1188,10 +1188,8 @@ APP_DNS_ADMIN=APP DNS Admin
|
||||
APP_SSL_ADMIN=APP SSL Admin
|
||||
APP_DK_GL=APP\u591A\u7528\u9014\u6807\u7B7E
|
||||
dnat_complex_loop=DNAT IP\u590D\u7528\u56DE\u6D41
|
||||
ip_reuse_adress_pool_loop=IP\u590D\u7528\u5730\u5740\u6C60\u56DE\u6D41
|
||||
snat_policy=SNAT\u590D\u7528\u7B56\u7565
|
||||
dnat_policy=DNAT\u590D\u7528\u7B56\u7565
|
||||
report_total=\u5408\u8BA1
|
||||
message_type=\u6D88\u606F\u7C7B\u578B
|
||||
as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7
|
||||
route=\u8DEF\u7531\u4FE1\u606F
|
||||
@@ -1228,7 +1226,7 @@ log_management=\u65E5\u5FD7\u7BA1\u7406
|
||||
log_date=\u65E5\u671F\u8303\u56F4
|
||||
log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F
|
||||
log_user=\u64CD\u4F5C\u7528\u6237
|
||||
log_submission=\u63D0\u4EA4\u65B9\u5F0F
|
||||
log_submission=\u8BF7\u6C42\u65B9\u6CD5
|
||||
log_ip=\u64CD\u4F5C\u8005IP
|
||||
log_exception_info=\u5F02\u5E38\u4FE1\u606F
|
||||
system_log=Log Management
|
||||
@@ -1252,7 +1250,7 @@ pps_threadshold=\u6D41\u91CF\u9608\u503C(pps)
|
||||
one_more_greater_zero=\u6D41\u91CF\u9608\u503C\u81F3\u5C11\u6709\u4E00\u4E2A\u4E0D\u4E3A 0
|
||||
can_not_be=\u4E0D\u80FD\u4E3A%s
|
||||
the_same_ip_type_pattern=\u6E90IP\u4E0E\u76EE\u7684IP\u7684IP\u7C7B\u578B\uFF0CIP\u683C\u5F0F\u5FC5\u987B\u76F8\u540C
|
||||
protocol_and_port=\u975ETCP\u534F\u8BAE\u4E0EUDP\u534F\u8BAE\u7AEF\u53E3\u5FC5\u987B\u4E3A0\uFF0C\u5168\u90E8\u534F\u8BAE\u65E0\u9650\u5236
|
||||
protocol_and_port=\u975ETCP\u534F\u8BAE\u4E0EUDP\u534F\u8BAE\u7AEF\u53E3\u5FC5\u987B\u4E3A0
|
||||
the_same_port_pattern=\u6E90\u7AEF\u53E3\u4E0E\u76EE\u7684\u7AEF\u53E3\u7AEF\u53E3\u683C\u5F0F\u5FC5\u987B\u76F8\u540C
|
||||
ip_range_in_c=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u5FC5\u987B\u5728C\u7F51\u6BB5
|
||||
ip_range_bit_field=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u7F51\u7EDC\u5730\u5740\u5FC5\u987B\u76F8\u540C
|
||||
@@ -1262,7 +1260,6 @@ certificate_error=\u516C\u94A5\u3001\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u
|
||||
public_file_error=\u516C\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
|
||||
keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
|
||||
private_file_error=\u79C1\u94A5\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
|
||||
keyframe_pic_required=\u5C1A\u672A\u9009\u62E9\u5173\u952E\u5E27\u56FE\u7247
|
||||
ipv4_range_tip=IPv4 Range
|
||||
ipv4_subnet_tip=IPv4/Subnet Mask
|
||||
ipv6_range_tip=IPv6 Range
|
||||
@@ -1284,4 +1281,13 @@ http_keyword_reject=\u7F51\u9875\u5173\u952E\u5B57\u963B\u65AD
|
||||
has_invisible_char=%s\u5305\u542B\u4E0D\u53EF\u89C1\u5B57\u7B26
|
||||
not_multiple=%s\u4E0D\u652F\u6301\u591A\u4E2A\u5173\u952E\u5B57
|
||||
template_error=\u5BFC\u5165\u6A21\u677F\u9519\u8BEF.\u8BF7\u9009\u62E9\u4E0E\u7CFB\u7EDF\u8BED\u8A00\u4E00\u81F4\uFF0C\u5E76\u4E14\u914D\u7F6E\u7C7B\u578B\u4E00\u81F4\u7684\u6A21\u677F\u5BFC\u5165.
|
||||
asn_no=ASN
|
||||
asn_no=ASN
|
||||
query=Query
|
||||
cfg_operation_log=\u914D\u7F6E\u64E6\u6B27\u6D32\u54E6\u65E5\u5FD7
|
||||
function_name=\u64CD\u4F5C\u6A21\u5757
|
||||
config_service_statistics=\u914D\u7F6E\u7EDF\u8BA1
|
||||
ruleLimitTip=\u6709\u6548\u89C4\u5219\u91CF\u5DF2\u8FBE\u5230\u9650\u5236(%s).
|
||||
av_protocol_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62EC RTSP\u3001RTMP\u3002
|
||||
ip_range_in_the_same=IP\u8303\u56F4\u7684\u8D77\u59CBIP\u4E0E\u7EC8\u6B62IP\u5FC5\u987B\u5728\u76F8\u540C\u7F51\u6BB5
|
||||
log_to_url=\u8F6CHTTP URL\u914D\u7F6E
|
||||
source_compile_id=\u914D\u7F6E\u6765\u6E90
|
||||
@@ -8,14 +8,12 @@ function changesel(){
|
||||
}
|
||||
</script>
|
||||
<div class="row"
|
||||
style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px; margin-left: 20px; line-height: 30px;">
|
||||
<div class="col-md-8">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font> <spring:message code="letter"/> </label>
|
||||
<div class="col-md-6">
|
||||
|
||||
style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px;line-height: 30px;">
|
||||
<div class="form-group" style="margin-left:5px">
|
||||
<div class="col-md-12">
|
||||
<label class=" "><font color="red">*</font> <spring:message code="letter"/> </label>
|
||||
<select id="requestIsAudit" name="requestId" onchange="changesel()"
|
||||
class="selectpicker field required form-control" data-live-search="true"
|
||||
class="selectpicker field required form-control input-medium " data-live-search="true"
|
||||
data-live-search-placeholder="search">
|
||||
<option value=""><spring:message code="select" /></option>
|
||||
<c:forEach items="${requestInfos}" var="requestInfo">
|
||||
@@ -27,6 +25,5 @@ function changesel(){
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--/row-->
|
||||
@@ -487,15 +487,15 @@
|
||||
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
|
||||
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
|
||||
<th class="sort-column a.action"><spring:message code="block_type"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="do_log"/></th>
|
||||
<th><spring:message code="log_total"/></th>
|
||||
<th><spring:message code="whether_area_block"/></th>
|
||||
<th><spring:message code="letter"/></th>
|
||||
<th><spring:message code="classification"/></th>
|
||||
<th><spring:message code="attribute"/></th>
|
||||
<th><spring:message code="label"/></th>
|
||||
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="log_total"/></th>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
|
||||
<th><spring:message code="editor"/></th>
|
||||
@@ -520,6 +520,14 @@
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon=""> <spring:message code="cancel_approved"/></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
|
||||
<c:if test="${dict.itemCode eq indexCfg.doLog }">
|
||||
@@ -527,6 +535,7 @@
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>
|
||||
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
|
||||
<c:if test="${indexCfg.isAreaEffective==1}">
|
||||
@@ -599,15 +608,6 @@
|
||||
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
|
||||
<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon=""> <spring:message code="cancel_approved"/></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -328,6 +328,7 @@
|
||||
<th class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
|
||||
<th class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
|
||||
<th class="sort-column a.action"><spring:message code="block_type"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<th><spring:message code="do_log"/></th>
|
||||
<th><spring:message code="whether_area_block"/></th>
|
||||
<th><spring:message code="letter"/></th>
|
||||
@@ -335,7 +336,6 @@
|
||||
<th><spring:message code="attribute"/></th>
|
||||
<th><spring:message code="label"/></th>
|
||||
<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
|
||||
<th><spring:message code="is_audit"/></th>
|
||||
<%-- <th><spring:message code="log_total"/></th> --%>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
|
||||
@@ -343,6 +343,7 @@
|
||||
<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
|
||||
<th><spring:message code="auditor"/></th>
|
||||
<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
|
||||
<th><spring:message code="source_compile_id"/></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -361,6 +362,14 @@
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon=""> <spring:message code="cancel_approved"/></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td>
|
||||
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
|
||||
<c:if test="${dict.itemCode eq indexCfg.doLog }">
|
||||
@@ -440,14 +449,6 @@
|
||||
<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
|
||||
<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
|
||||
</td>
|
||||
<td>
|
||||
<c:choose>
|
||||
<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon=""> <spring:message code="cancel_approved"/></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
@@ -455,6 +456,11 @@
|
||||
<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.auditorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>
|
||||
<c:if test="${!(empty indexCfg.sourceCompileId )}">
|
||||
${fns:getHttpBodyKeyword(indexCfg.sourceCompileId) }
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
|
||||
@@ -7,6 +7,13 @@
|
||||
</title>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
/* $('#contentTable thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
|
||||
$('#contentTable tbody tr td input.i-checks').iCheck('check');
|
||||
});
|
||||
|
||||
$('#contentTable thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定
|
||||
$('#contentTable tbody tr td input.i-checks').iCheck('uncheck');
|
||||
}); */
|
||||
//reset
|
||||
$("#resetBtn").on("click",function(){
|
||||
$("select.selectpicker").each(function(){
|
||||
@@ -20,8 +27,23 @@
|
||||
.attr("value",'');
|
||||
$("#searchForm")[0].reset();
|
||||
});
|
||||
$("#logToUrl").on("click",function(){
|
||||
var checkboxes=$("#contentTable tbody tr td input.i-checks:checkbox");
|
||||
if($(checkboxes).filter(":checked").length>0){
|
||||
$("#http_url_modal").modal({
|
||||
backdrop:"static",
|
||||
keyboard:false,
|
||||
show:true
|
||||
});
|
||||
}else{
|
||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}
|
||||
|
||||
});
|
||||
//筛选功能
|
||||
filterActionInit();
|
||||
|
||||
});
|
||||
</script>
|
||||
</head>
|
||||
@@ -38,7 +60,7 @@
|
||||
<div class="portlet">
|
||||
<div class="portlet-body">
|
||||
<div class="row" >
|
||||
<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/http/list" method="post" class="form-search">
|
||||
<form:form id="searchForm" modelAttribute="log" action="${ctx}/log/ntc/httpkey/list" method="post" class="form-search">
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
|
||||
@@ -84,6 +106,7 @@
|
||||
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<button type="button" class="btn btn-default" id="logToUrl"> <spring:message code="log_to_url"/></button>
|
||||
<a class="btn btn-icon-only btn-default setfields tooltips"
|
||||
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
|
||||
<i class="icon-wrench"></i>
|
||||
@@ -175,6 +198,7 @@
|
||||
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||
<th><spring:message code='cfg_id'/></th>
|
||||
<th><spring:message code="action"/></th>
|
||||
<th><spring:message code="found_time"/></th>
|
||||
@@ -214,6 +238,7 @@
|
||||
<tbody>
|
||||
<c:forEach var="log" items="${page.list }">
|
||||
<tr>
|
||||
<td><a class="hidden"></a><input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }"></td>
|
||||
<td>${log.cfgId }
|
||||
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
|
||||
</td>
|
||||
@@ -348,5 +373,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 转log to URL，start -->
|
||||
<%@include file="/WEB-INF/include/form/multiHttpUrlModal.jsp" %>
|
||||
</body>
|
||||
</html>
|
||||
@@ -36,18 +36,18 @@ $(function(){
|
||||
$("#contentTable").not(".logTb").find("td").each(function(i){
|
||||
//获取td当前对象的文本,如果长度大于25;
|
||||
if($(this).text().trim().length>28){
|
||||
//给td设置title属性,并且设置td的完整值.给title属性.
|
||||
var strTitle = $(this).text().trim();
|
||||
//解决火狐title不能自动换行
|
||||
var count = Math.floor(strTitle.length/64);
|
||||
for(var i=1;i<=count;i++){
|
||||
strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1);
|
||||
}
|
||||
//给td设置title属性,并且设置td的完整值.给title属性.
|
||||
var strTitle = $(this).text().trim();
|
||||
//解决火狐title不能自动换行
|
||||
var count = Math.floor(strTitle.length/64);
|
||||
for(var i=1;i<=count;i++){
|
||||
strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1);
|
||||
}
|
||||
$(this).attr("title",strTitle);
|
||||
//获取td的值,进行截取。赋值给text变量保存.
|
||||
var text=$(this).text().substring(0,25)+"...";
|
||||
//重新为td赋值;
|
||||
$(this).text(text);
|
||||
//获取td的值,进行截取。赋值给text变量保存.
|
||||
var text=$(this).text().trim().substring(0,25)+"...";
|
||||
//重新为td赋值;
|
||||
$(this).text(text);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1586,7 +1586,28 @@ var setHexCaseSenstive=function(){
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
var validateEffectiveRuleLimit=function(path,serviceId){
|
||||
var flag = true;
|
||||
$.ajax({
|
||||
url: path+"/configure/statistics/getEffectiveCfgNum",
|
||||
type: "POST",
|
||||
data:{"serviceId":serviceId},
|
||||
async: false, //表单提交前验证是否可提交，所以此参数必须为false
|
||||
success: function(data) {
|
||||
if(data.status==0){
|
||||
top.$.jBox.closeTip();
|
||||
alertx(data.msg);
|
||||
flag=false;
|
||||
}
|
||||
},
|
||||
error:function(jqXHR, textStatus, errorThrown){
|
||||
top.$.jBox.closeTip();
|
||||
alertx(errorThrown);
|
||||
flag=false;
|
||||
}
|
||||
});
|
||||
return flag;
|
||||
}
|
||||
function heightDiv(type){
|
||||
var hei=document.documentElement.clientHeight;
|
||||
hei=hei-91;
|
||||
|
||||
Reference in New Issue
Block a user