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

3165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
duandongmei
e1d439655a Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2019-01-27 11:50:35 +06:00
duandongmei
2037c2f3b0 无变更 2019-01-27 11:50:13 +06:00
duandongmei
fc73585977 无变更 2019-01-27 11:48:26 +06:00
zhangwei
5f321f96ab 同步feature-traffic-log分支修改的增加定时器插件策略表单 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
 2019-01-27 11:18:34 +06:00
zhangwei
3373978073 修改编译jdk版本为1.8 2019-01-27 11:10:51 +06:00
段冬梅
67ed670053 Merge branch 'bugfix-20190127-Export' into 'develop' 
配置导出时是否区分大小写时，为是时导出无显示问题解决，日志http网页关键字查询是选择关键字监测/封堵时界面对应列显示不同国际化问题解决。

See merge request K18_NTCS_WEB/NTC!22
 2019-01-27 12:51:15 +08:00
zhanghongqing
14e3b828db 配置导出时是否区分大小写时，为是时导出无显示问题解决，日志http网页关键字查询是选择关键字监测/封堵时界面对应列显示不同国际化问题解决。 2019-01-27 12:46:18 +08:00
段冬梅
956f19ae2f Merge branch 'bugfix-20190127-export' into 'develop' 
修复缓存策略配置、IP分组管理、DNS分组管理导出黑屏bug

See merge request K18_NTCS_WEB/NTC!21
 2019-01-27 12:32:59 +08:00
段冬梅
fdfc608290 Merge branch 'dev-help-wwr' into 'develop' 
新增编辑在帮助文档功能

See merge request K18_NTCS_WEB/NTC!17
 2019-01-27 12:25:21 +08:00
duandongmei
a51718907d v6_num国际化更改 2019-01-27 10:21:55 +06:00
zhangwenqing
c9d7512a1b 修复缓存策略配置、IP分组管理、DNS分组管理导出黑屏bug 2019-01-27 12:03:39 +08:00
wangwenrui
da9744d60d 1.修改帮助显示，变更帮助页面实现，采用markdown格式文件 
2.添加markdown工具栏国际化
 2019-01-27 11:02:55 +08:00
duandongmei
923aca94a8 asn增加ipv4和ipv6个数 2019-01-26 20:21:46 +06:00
duandongmei
96df029f43 ASN定时计算v4和v6的IP个数； 
界面展示ASNIPv4和v6数
 2019-01-26 19:41:58 +06:00
zhangwei
f90ef5ab85 增加定时器功能 2019-01-26 18:02:44 +06:00
zhangwei
0fb4bf08a4 url白名单修改下发的maat的业务表名不做特殊处理。 2019-01-26 17:23:38 +06:00
duandongmei
c8c75e566e 受话人国际化更改为Callee 2019-01-26 10:51:14 +06:00
duandongmei
85633ee524 Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2019-01-26 10:48:13 +06:00
duandongmei
89f92e99fc ASN IP 导入并下发功能 2019-01-26 10:47:50 +06:00
董晓燕
5786412116 Merge branch 'bugfix-20190126-import' into 'develop' 
修复APP特征配置导入bug

See merge request K18_NTCS_WEB/NTC!20
 2019-01-26 12:07:01 +08:00
zhangwenqing
0cbe9c7ff7 修复APP特征配置导入bug 2019-01-26 11:56:10 +08:00
董晓燕
4304fe0077 Merge branch 'feature-2019012609-logs' into 'develop' 
ddos日志去掉client查询条件，攻击类型在字典界面设置保留DNS_Flood，NTP_Flood，SYN_Flood

See merge request K18_NTCS_WEB/NTC!19
 2019-01-26 11:31:18 +08:00
zhanghongqing
1cc0a4f2ea ddos日志去掉client查询条件，攻击类型在字典界面设置保留DNS_Flood，NTP_Flood，SYN_Flood 2019-01-26 10:27:05 +08:00
zhangwei
cb9cf1eac8 修改doLog参数选项的国际化 2019-01-25 13:54:39 +06:00
wangwenrui
e1efb84e1f Merge branch 'develop' into dev-help-wwr 2019-01-25 15:42:17 +08:00
王鑫
d0ca7f89d4 Merge branch 'bugfix-20190125-traffic' into 'develop' 
修改流量统计滚动条文字对齐bug

See merge request K18_NTCS_WEB/NTC!18
 2019-01-25 14:57:49 +08:00
zhanghongqing
e2e6ebfac1 修改流量统计滚动条文字对齐bug 2019-01-25 14:42:41 +08:00
dongxiaoyan
3daab5e49d add_pool_nam补充完整add_pool_name 2019-01-25 14:31:42 +08:00
dongxiaoyan
e5e63af738 添加默认动态ip池，并修改cfgid为0 2019-01-25 14:27:40 +08:00
wangwenrui
1d5905fe47 新增编辑在帮助文档功能 2019-01-25 14:19:00 +08:00
zhangwei
52fe56b59d 修改doLog的参数描述 2019-01-24 20:32:06 +06:00
zhangwei
d51da59143 修改通联关系日志中的查询条件描述domain->web 2019-01-24 20:24:33 +06:00
zhangwei
8bb1c6c857 dns业务去掉do_blacklist选项的显示 2019-01-24 20:14:50 +06:00
duandongmei
25e6fa4a3f 保护名单提示、正在提交、登出的国际化更新 2019-01-24 17:30:19 +06:00
duandongmei
ea82be590e domain和url域新增时增加警告提示信息【后期需在审核时也增加此警告】。 
保护名单信息杨威提供后，再进行完善
 2019-01-24 15:29:10 +06:00
zhanghongqing
1a6e771458 修改流量统计首页滚动条数字对齐 
(cherry picked from commit 2ca0a4714dfedbea53272f43169e4cf502e377f9)
 2019-01-24 14:57:01 +08:00
leijun
2ad34a552c snat地址池添加动态地址池信息 sql 
(cherry picked from commit c01a1ac22d0b8bd27de1d739b3c692b1fb8e32fa)
 2019-01-24 14:56:34 +08:00
leijun
e14cca6824 SNAT地址池添加一条动态地址池信息 
app域名特征添加拦截强度

(cherry picked from commit 1d71820d1ee3fbd21f201af14781849de9fb75a3)
 2019-01-24 14:56:09 +08:00
duandongmei
2e8d2cb7b2 ASN IP全量+数据入库提交 2019-01-23 19:32:47 +06:00
duandongmei
9fbd60ddf0 Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop 2019-01-23 19:28:44 +06:00
duandongmei
a31769f3cb ASN IP导入(全量+数据入库)开发 2019-01-23 19:28:13 +06:00
董晓燕
a960bb53ec Merge branch 'cherry-pick-6704549d' into 'develop' 
Merge branch 'bugfix-20190123-import' into 'dev-ycx'

See merge request K18_NTCS_WEB/NTC!15
 2019-01-23 18:45:54 +08:00
董晓燕
0858b89ffa Merge branch 'bugfix-20190123-import' into 'dev-ycx' 
修正Ip Spoofing配置导入模板'direction'字段默认值批注；修改配置导入域名字段校验；修复配置导入属性验证发生异常后无提示信息问题（王鑫）

See merge request K18_NTCS_WEB/NTC!11

(cherry picked from commit 6704549d61a525406f33a02eb8f93762d272aa40)

38f563ce 修正Ip Spoofing配置导入模板'direction'字段默认值批注；修改配置导入域名字段校验；修复配置导入属性验证发生异常后无提示信息问题（王鑫）
 2019-01-23 18:45:14 +08:00
董晓燕
65991514d7 Merge branch 'debug-26-流量统计bug' into 'develop' 
修复流量B和b换算问题

See merge request K18_NTCS_WEB/NTC!12
 2019-01-23 18:16:53 +08:00
tanghao
3cd969978e 修复流量B和b换算问题 2019-01-23 18:08:09 +08:00
董晓燕
44a8e8852e Merge branch 'cherry-pick-6fe94fa3' into 'develop' 
修改用户行为查询时间设置

See merge request K18_NTCS_WEB/NTC!10
 2019-01-23 16:39:51 +08:00
zhanghongqing
57793c7264 修改用户行为查询时间设置 
(cherry picked from commit 6fe94fa3b8e8a9e6a8ed1ae3454db78fa5eb9c1d)
 2019-01-23 16:39:24 +08:00
duandongmei
6885d467cb js国际化增加crlCheck信息，俄文国际化翻译 2019-01-23 11:30:26 +06:00
duandongmei
e5ce04e34b 国际化俄文翻译，并且去掉重复的desc国际化 2019-01-23 10:58:12 +06:00
duandongmei
fa42935d46 修复拥有用户管理权限的用户，修改其他用户密码后不生效问题。 2019-01-23 10:40:05 +06:00