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

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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	证书颁发机构及 吊销列表功能提交
This commit is contained in:
duandongmei
2018-11-08 19:50:04 +08:00
parent 7a77f0ebcf 837574cd70
commit e59d98499e
181 changed files with 11974 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1319,7 +1319,6 @@ user_behavior_data=\u7528\u6237\u7edf\u8ba1
ip_behavior_data=\u7528\u6237IP\u7edf\u8ba1
not_valid_domain=%s\u4e0d\u662f\u4e00\u4e2a\u5408\u6cd5\u57df\u540d
cert_not_match_domain=\u57df\u540d\u4e0e\u6240\u9009\u8bc1\u4e66\u4fe1\u606f\u4e0d\u7b26\u5408\uff01
request_uri=SIP\u8bf7\u6c42URIcert_not_match_domain=\u57DF\u540D\u4E0E\u6240\u9009\u8BC1\u4E66\u4FE1\u606F\u4E0D\u7B26\u5408\uFF01
crl_file_error=CRL\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF
crl_issuer_error=crl\u6587\u4EF6\u7684issuer\u4E0E\u8BC1\u4E66\u6587\u4EF6\u7684issuer\u4E0D\u5339\u914D \u7FFB\u8BD1
cert_name=\u8BC1\u4E66\u540D\u79F0
@@ -1334,4 +1333,15 @@ sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
call_id=SIP\u4f1a\u8bddID
call_id=SIP\u4f1a\u8bddID
collect_voip=VoIP \u6cdb\u6536
rtp_d_ip=RTP\u670d\u52a1\u7aefIP\u5730\u5740
rtp_s_ip=RTP\u5ba2\u6237\u7aefIP\u5730\u5740
rtp_d_port=RTP\u670d\u52a1\u7aef\u7aef\u53e3
rtp_s_port=RTP\u5ba2\u6237\u7aef\u7aef\u53e3
sip_d_ip=SIP\u670d\u52a1\u7aefIP\u5730\u5740
sip_s_ip=SIP\u5ba2\u6237\u7aefIP\u5730\u5740
sip_d_port=SIP\u670d\u52a1\u7aef\u7aef\u53e3
sip_s_port=SIP\u5ba2\u6237\u7aef\u7aef\u53e3
call_id=SIP\u4f1a\u8bddID
request_uri=SIP\u8bf7\u6c42URI

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

@@ -269,6 +269,7 @@ pxyHttpLog=pxyHttpLogs
mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs
mmLogoDetectionLog=mmLogoDetectionLogs
mmFaceRecognizationLog=mmFaceRecognizationLogs
ntcCollectVoipLog=ntcCollectVoipLogs
########################################
#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/
@@ -543,5 +544,5 @@ cert_validate_success_info=Successful
#ipv4 range\u65b0\u683c\u5f0f0.0.0.1-2
ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)-(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)$
ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
#域名验证正则
#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$

BIN
src/main/resources/shell/x509
View File

Binary file not shown.

37
src/main/resources/sql/20181107/update_sys_menu Normal file
View File

@@ -0,0 +1,37 @@
alter table sys_menu modify column menu_bg varchar(1024) DEFAULT null COMMENT '原表示背景颜色，现用于记录功能帮助的URL信息';
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/ip_white_list' WHERE (`id`='607');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/ip_address' WHERE (`id`='609');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/DNS' WHERE (`id`='611');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_advanced' WHERE (`id`='612');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/stream_media' WHERE (`id`='624');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/voip' WHERE (`id`='628');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/audio_sample' WHERE (`id`='632');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/video_sample' WHERE (`id`='633');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/picture_sample' WHERE (`id`='634');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/voip_sample' WHERE (`id`='635');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/video_scene' WHERE (`id`='637');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/SSL' WHERE (`id`='680');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/Mail_advanced' WHERE (`id`='682');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/FTP' WHERE (`id`='694');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/BGP' WHERE (`id`='698');
UPDATE sys_menu SET `menu_bg`='/online-help/ysp/file_digest' WHERE (`id`='701');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_redirect_policy' WHERE (`id`='725');
UPDATE sys_menu SET `menu_bg`='/online-help/app/app' WHERE (`id`='738');
UPDATE sys_menu SET `menu_bg`='/online-help/app/IP_feature_advance' WHERE (`id`='739');
UPDATE sys_menu SET `menu_bg`='/online-help/app/HTTP_feature_advance' WHERE (`id`='740');
UPDATE sys_menu SET `menu_bg`='/online-help/app/domain_feature_advance' WHERE (`id`='741');
UPDATE sys_menu SET `menu_bg`='/online-help/app/basic_protocol' WHERE (`id`='902');
UPDATE sys_menu SET `menu_bg`='/online-help/app/tunnel_behavior' WHERE (`id`='903');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_block_policy' WHERE (`id`='911');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_redirect_policy' WHERE (`id`='912');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_replace_policy' WHERE (`id`='913');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_monitor_policy' WHERE (`id`='914');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/https_whiteList_policy' WHERE (`id`='915');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/p2p' WHERE (`id`='991');
UPDATE sys_menu SET `menu_bg`='/online-help/app/ssl_feature_advance' WHERE (`id`='1001');
UPDATE sys_menu SET `menu_bg`='/online-help/app/DNS_feature_advance' WHERE (`id`='1086');
UPDATE sys_menu SET `menu_bg`='/online-help/app/payload_feature_advance' WHERE (`id`='1087');
UPDATE sys_menu SET `menu_bg`='/online-help/proxy/ip_intercept_policy' WHERE (`id`='1099');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_URL' WHERE (`id`='1102');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/Mail' WHERE (`id`='1140');
UPDATE sys_menu SET `menu_bg`='/online-help/ntc/HTTP_website' WHERE (`id`='1149');