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

3349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wangwenrui
ea13a037e8 新增编辑在帮助文档功能 
(cherry picked from commit 1d5905fe47)
 2019-01-28 20:12:11 +08:00
张微
b2bfd83e1f Update README.md 2019-01-28 18:08:44 +08:00
zhanghongqing
00f40e6394 修改流量统计中协议详情跟网站详情界面按钮下移问题 2019-01-28 15:27:02 +06:00
duandongmei
40ad762853 ip白名单打开方向属性 2019-01-28 13:56:56 +06:00
duandongmei
e319a19135 多删除了commit提交语句bug更改 2019-01-28 09:50:07 +06:00
duandongmei
de813e15d9 Merge branch 'feature-traffic-log' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into feature-traffic-log 2019-01-27 20:01:06 +06:00
zhangwei
2febc9e5b7 临时修复apphttp,dns,ssl特征的导入 2019-01-27 19:32:56 +06:00
duandongmei
a7914aafac asn统计updatesql，不分批次提交 2019-01-27 18:15:14 +06:00
duandongmei
10e0064556 关键字转url，来函为null的情况修复 2019-01-27 13:39:07 +06:00
duandongmei
18491f2644 修复ASN v4和v6串列bug 2019-01-27 11:55:59 +06:00
zhangwei
2db43e69d9 合并develop分支定时器功能 
Conflicts:
	src/main/java/com/nis/domain/configuration/BaseCfg.java
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
 2019-01-27 11:06:46 +06:00
zhangwei
c1c5c8f5bb 修改定时器后台运行时无shiro权限导致根据functionId查询配置时引起的bug，查询菜单功能名称在menuCode方法中设置 2019-01-27 10:32:50 +06:00
duandongmei
1c2833ee8e asn v6_num国际化更改; 
asngrouplist界面asnip数获取bug更改
 2019-01-27 10:19:01 +06:00
zhanghongqing
8c70356e44 修改流量统计滚动条文字对齐bug 2019-01-26 20:31:34 +06:00
zhangwei
41e5202cbf Merge branch 'feature-traffic-log' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into feature-traffic-log 2019-01-26 20:20:40 +06:00
zhangwei
9d6e3a3d4a 增加定时器功能 
Conflicts:
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
 2019-01-26 20:18:01 +06:00
duandongmei
63882ac75e ddos的检索条件client ip去掉 2019-01-26 20:14:45 +06:00
duandongmei
0a76ce337a ASN定时计算v4和v6的IP个数； 
界面展示ASNIPv4和v6数

Conflicts:
	src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java
	src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml
	src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
	src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
 2019-01-26 20:13:44 +06:00
zhangwei
5c63f85483 定时器表单提交 2019-01-26 19:53:19 +06:00
zhangwei
2181a420b9 拦截策略无业务日志，删除日志总量一列 2019-01-26 19:45:14 +06:00
zhangwei
5d86fb0fd4 拦截策略列表删除doLog显示 2019-01-26 19:43:26 +06:00
zhangwei
9b304e3c13 增加定时器 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
 2019-01-26 19:23:00 +06:00
duandongmei
87e07376fa 修复asnip配置取消之后修改，is_audit状态未修改为0的问题 2019-01-25 17:48:58 +06:00
duandongmei
736c4cda04 16号之前的版本asn还是为单独业务，检索条件区分asn的block和monitor 2019-01-25 17:46:49 +06:00
zhangwei
a2dc1dd6f5 修改doLog的参数描述 
(cherry picked from commit 52fe56b59d)
 2019-01-25 09:45:29 +08:00
zhangwei
787484c721 修改通联关系日志中的查询条件描述domain->web 
(cherry picked from commit d51da59143)
 2019-01-25 09:45:17 +08:00
zhangwei
5c8b81c67e dns业务去掉do_blacklist选项的显示 
(cherry picked from commit 8bb1c6c857)
 2019-01-25 09:44:55 +08:00
duandongmei
56e9cebe26 保护名单提示、正在提交、登出的国际化更新 
(cherry picked from commit 25e6fa4a3f)
 2019-01-25 09:44:36 +08:00
duandongmei
469c753161 domain和url域新增时增加警告提示信息【后期需在审核时也增加此警告】。 
保护名单信息杨威提供后，再进行完善

(cherry picked from commit ea82be590e)
 2019-01-24 17:40:18 +08:00
zhanghongqing
72b88b09c4 修改流量统计首页滚动条数字对齐 
(cherry picked from commit 2ca0a4714dfedbea53272f43169e4cf502e377f9)

(cherry picked from commit 1a6e771458)
 2019-01-24 16:13:04 +08:00
leijun
3e706f7027 SNAT地址池添加一条动态地址池信息 
app域名特征添加拦截强度

(cherry picked from commit 1d71820d1ee3fbd21f201af14781849de9fb75a3)

(cherry picked from commit e14cca6824)
 2019-01-24 16:12:46 +08:00
zhangwenqing
498fee3727 修正Ip Spoofing配置导入模板'direction'字段默认值批注；修改配置导入域名字段校验；修复配置导入属性验证发生异常后无提示信息问题（王鑫） 
(cherry picked from commit 38f563ceee07bfdaa4d94cc5ca6f712edb894d40)
 2019-01-24 16:10:14 +08:00
tanghao
1f4618ae7f 修复流量B和b换算问题 
(cherry picked from commit 3cd969978e)
 2019-01-24 09:52:06 +08:00
zhanghongqing
1f024e6b81 修改用户行为查询时间设置 
(cherry picked from commit 6fe94fa3b8e8a9e6a8ed1ae3454db78fa5eb9c1d)

(cherry picked from commit 57793c7264)
 2019-01-24 09:51:47 +08:00
duandongmei
839f06b495 js国际化增加crlCheck信息，俄文国际化翻译 
(cherry picked from commit 6885d467cb)
 2019-01-24 09:51:24 +08:00
duandongmei
e3bade38b9 国际化俄文翻译，并且去掉重复的desc国际化 
(cherry picked from commit e5ce04e34b)
 2019-01-24 09:51:05 +08:00
duandongmei
1346fd1bfc 修复拥有用户管理权限的用户，修改其他用户密码后不生效问题。 
(cherry picked from commit fa42935d46)
 2019-01-24 09:50:39 +08:00
zhanghongqing
da24fa3b84 修改日志详情中title判断条件 
(cherry picked from commit a464bd9443)
 2019-01-23 10:16:45 +08:00
zhangwei
ee20daadb3 新增定时任务相关国际化字典 
(cherry picked from commit 3087e5baf3)
 2019-01-23 10:16:25 +08:00
李皓宸
a80c9267df 日志检索->流量日志->邮件泛收和SSL泛收 移除cfgId查询条件,解决Js报错问题 
(cherry picked from commit 52bf2d3415)
 2019-01-23 10:16:05 +08:00
李皓宸
b0a6fe7c86 1.日志检索->国家代理->HTTP(S) 界面 原始请求体和原始应答体 列数据 增加点击下载功能 
2.实时报表->流量统计->流量统计和协议统计 界面 "方向"查询条件增加"请选择"选项(默认)

(cherry picked from commit ee411339c8)
 2019-01-23 10:15:52 +08:00
zhanghongqing
493c5e7c63 增加国际化配置，流量统计首页滚动条调整，保留两位小数 
(cherry picked from commit 3bf485b920)
 2019-01-23 10:15:32 +08:00
leijun
ad310f6d48 日志检索-snat、dnat复用策略 页面标题国际化对应调整 
(cherry picked from commit ab157b82db)
 2019-01-23 10:15:08 +08:00
tanghao
86365ad7b1 bps计算保留两位小数展示 
(cherry picked from commit 79de7b51df)
 2019-01-23 10:14:52 +08:00
zhanghongqing
372232d206 修改鼠标点击列表copy中的的空格，去掉 
(cherry picked from commit 0ed34ac938)
 2019-01-23 10:14:33 +08:00
zhanghongqing
4dfd9b2d70 补充提交去掉注释 
(cherry picked from commit 2eb2cd366e)
 2019-01-23 10:14:01 +08:00
zhanghongqing
f105fca9a7 解决日志详情中文字带换行空格问题 
(cherry picked from commit b03ec51aa4)
 2019-01-23 10:13:35 +08:00
zhanghongqing
c4db370870 流量统计修改国际化名称 
(cherry picked from commit 37dfdf1e3b)
 2019-01-23 10:13:01 +08:00
李皓宸
0756af0d6e 日志检索->国家代理->HTTP(S) 修正界面无法显示原始请求体和原始应答体数据问题 
(cherry picked from commit 859b3c72f9)
 2019-01-23 10:12:28 +08:00
duandongmei
daac82f77a 证书crl去掉必填校验 2019-01-22 10:27:18 +06:00