Commit Graph

3 Commits

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

Conflicts:
	src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
	限速模板增加ratelimit字段,修改导出protocol注释信息
2018-10-17 11:10:50 +08:00
duandongmei
6b610bf665 ip模板提交
样例的level改成下拉选项
拦截强度做成下拉选项
2018-10-17 10:06:08 +08:00
wangxin
8b3efbcfbf (1)复用类型Ip导入验证修复
(2)隧道类配置IP导入模板修改
(3)IP拦截配置导入模板修改
(4)IPSCIP配置导入验证逻辑修改,当action为drop的时候,输入50或者51,监测的时候为0
(5)IP拦截配置导入模板修改
2018-07-31 12:18:34 +08:00