gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,814 Commits 14 Branches 0 Tags
4e98aa217f072ca7d6ded5630019076068a56fd9
Commit Graph

563 Commits

Author SHA1 Message Date
duandongmei
4a06fc5044 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	src/main/resources/nis.properties
 2018-10-12 22:33:13 +08:00
duandongmei
5722529e81 国际化增加 2018-10-12 20:25:15 +08:00
zhanghongqing
7c3d7c75c3 配置文件增加流量统计活跃IP近一小时的趋势接口路径 
增加活跃IPtop10的近一小时最大数据接口路径
 2018-10-12 20:10:58 +08:00
leijun
c91086c2d1 日志管理界面优化及国际化添加 2018-10-12 20:05:32 +08:00
leijun
5f671e9409 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-12 19:31:27 +08:00
leijun
cb2ce6f8ba Stream Media 域配置 
NTC_STREAM_MEDIA_URL
NTC_ SUBSCRIBE_ID
NTC_UNIVERSAL_IP[protocol_id=23]
NTC_UNIVERSAL_PROTO_TYPE
 2018-10-12 19:31:16 +08:00
zhanghongqing
6195d6042c 流量统计增加活跃IPTOP10一个小时内的趋势，增加一个小时内TOP10最大值，增加接口错误处理 2018-10-12 18:12:24 +08:00
zhangwei
cb65ec3f1d 修改中间服务层的测试服务URL 2018-10-12 17:37:02 +08:00
wangxin
99d1bfe116 （1）流媒体protocol字段国际化修改 
（2）流媒体接口url修改
（3）ip日志查询条件后台动作换成service
 2018-10-12 17:19:21 +08:00
zhangwq
a70a3b6367 提交国际化代码. 2018-10-12 13:22:58 +08:00
duandongmei
c5130454f1 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties

voip 和流媒体域与服务端表名更改
国际化文件增加voip和流媒体域描述
 2018-10-11 19:40:01 +08:00
duandongmei
e25be9a7a2 monitring和monit修改为monitor，增加voip和流媒体域国际化 2018-10-11 19:36:34 +08:00
wangxin
ef6d793d6b （1）调整ip配置界面 
（2）ip配置界面ip限速加入用户自定义域
 2018-10-11 19:09:28 +08:00
leijun
cfa8d8ed5b 文件摘要国际化添加 2018-10-11 18:38:26 +08:00
leijun
d47adc3ce1 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-11 18:36:19 +08:00
leijun
97a06a9874 VoIP ip配置修改 2018-10-11 18:33:23 +08:00
duandongmei
47697c9359 菜单国际化名称更改 
ippayload ip配置必输
topic domain去掉表达式和十六进制展示
 2018-10-11 15:52:11 +08:00
duandongmei
cdb48cebac Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
Stream模块相关的日志查询修改查询接口为ntcAppLogs接口
 2018-10-10 17:54:17 +08:00
duandongmei
a763e92aaf app的日志检索改为查ntcAppLogs接口，属性有变更 2018-10-10 17:50:36 +08:00
wangxin
653b56f5c6 bgp日志type字段换成字典取值，as字段换成asNum 2018-10-10 16:55:34 +08:00
wangxin
8d48d9a354 （1）音视频url日志字段修改 
（2）所有日志传输层协议国际化修改
（3）部分国际化修改
 2018-10-10 16:17:19 +08:00
Administrator
1f93df146c 1.提交修改数据库keywords长度2048，cfg_desc长度128，district长度128 
2.专项任务表单增加长度限制
3.关键字长度增加限制
4.实时报表来函列表过长省略
 2018-10-10 15:08:04 +08:00
duandongmei
608a74eace 实时统计增加合计国际化 2018-10-10 13:57:52 +08:00
wangxin
34d56b814e 调整协议字段取值 2018-10-06 23:10:54 +08:00
duandongmei
d7d0ad706f Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-06 12:16:52 +08:00
duandongmei
55d25bc92d service层 saveCfgIndexOf方法增加 
ip_drop国际化更改
 2018-10-06 12:16:12 +08:00
zhangwq
236660f3ce IP复用策略拆分为SNAT/DNAT复用策略. 2018-10-05 21:31:48 +08:00
leijun
c06d7e11cb http_url 
1、动作：白名单，阻断，监测
2、白名单业务为原有的域名白名单，阻断和监测业务为HTTP的阻断和监测业务
 2018-10-05 02:26:15 +08:00
wangxin
bcf66ef52d IP端口隐藏显示分开 2018-10-04 19:45:39 +08:00
duandongmei
6fb3d05a92 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时，无预配置也可提交的bug
 2018-10-04 13:13:00 +08:00
duandongmei
e6c8e78134 国际化文件更改 2018-10-04 12:59:52 +08:00
wx7614140
4c1bcce61d asn_reject,asn_monit国际化 2018-09-30 18:32:28 +08:00
zhangwei
fa082dc89f 增加APP特征的清库sql 
Signed-off-by: zhangwei <zhangwei@zdjizhi.com>
 2018-09-30 16:56:05 +08:00
zhangwei
0163de8120 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-09-30 16:53:58 +08:00
zhangwei
cd17eb37c4 修改俄文国际化 2018-09-30 16:50:45 +08:00
wangxin
47a0490b87 协议arbitrary修改为all 2018-09-30 16:00:21 +08:00
zhangwei
c7ab561590 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-09-30 14:39:21 +08:00
wangxin
14cc0cd496 修改PROTOCOL字典GRE项 2018-09-30 11:29:32 +08:00
duandongmei
97a8868998 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
ip_payload功能新增
 2018-09-30 10:01:52 +08:00
wangxin
61b56958c6 (1)ip地址功能整个asn功能 
(2)ip域处理提到单独的js ipRegion.js中
 2018-09-29 21:46:17 +08:00
leijun
9db2e73d04 新增界面去除title 2018-09-29 21:12:47 +08:00
leijun
5e2efc3e5a IP复用地址池国际化 2018-09-29 20:50:55 +08:00
zhanghongqing
04d8fb2438 voip ip和voipaccount合并数据库修改sql,新增页面增加协议提示 2018-09-29 10:31:42 +08:00
wangxin
7607649143 更改ip地址 ratelimit service_id 2018-09-29 09:09:17 +08:00
wangxin
75060d9a09 ip配置form表单调整action与协议 2018-09-28 19:34:04 +08:00
duandongmei
190d924195 group type去掉ip group type增加snat ip和dnat ip； 
ddos ip pattern只有ip和ipmask，port pattern只有port，direction只有single;
ip whitelist 去掉subscribe
 2018-09-28 18:36:04 +08:00
zhangwei
23ae8cfc64 修改数据库ip 2018-09-28 16:55:34 +08:00
zhangwei
2912aaee19 修改外网开发使用数据库名称 2018-09-28 16:18:25 +08:00
zhangwenqing
9ce49b9e25 1.生效区域下发格式修改 2.日志总量日志查询时间修改 2018-09-28 12:00:13 +08:00
wangxin
c36f8bf13f (1)jsp页面console.log注释 
(2)ssl表单域排序调整
 2018-09-27 10:57:01 +08:00