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

1782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhangwq
c8dfee7970 配置列表检索条件修改. 2018-10-10 18:30:54 +08:00
duandongmei
a0bb2e5fff app日志增加属性实体类提交 2018-10-10 17:57:26 +08:00
duandongmei
e7e91a519a Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-10 17:56:43 +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
zhangwq
9b53712d3e snat/dnat复用策略列表修改. 2018-10-10 17:53:28 +08:00
duandongmei
a763e92aaf app的日志检索改为查ntcAppLogs接口，属性有变更 2018-10-10 17:50:36 +08:00
wangxin
9f0f87b745 专项任务表头修改 2018-10-10 17:21:03 +08:00
wangxin
ef2896e234 替换系统字典菜单ID，解决common.js中的字段省略处理对修改按钮的影响 2018-10-10 17:09:55 +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
leijun
8cc18a96a7 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-10 15:29:14 +08:00
leijun
1b3ee67f4c 区域和运营商管理的itemcode增加当前类型下的有效配置，itemcode不重复 2018-10-10 15:29:01 +08:00
Administrator
1f93df146c 1.提交修改数据库keywords长度2048，cfg_desc长度128，district长度128 
2.专项任务表单增加长度限制
3.关键字长度增加限制
4.实时报表来函列表过长省略
 2018-10-10 15:08:04 +08:00
duandongmei
24c7aaaed8 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
 2018-10-10 14:00:18 +08:00
duandongmei
608a74eace 实时统计增加合计国际化 2018-10-10 13:57:52 +08:00
wangxin
5042d6e99b (1)文件摘要日志检索功能提交 
(2)BGP日志增加字段type,as route
 2018-10-09 18:14:27 +08:00
wangxin
821132931a 捕捉异常后log日志打印改为logger.error 2018-10-09 16:36:11 +08:00
leijun
87c58379b8 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 16:12:22 +08:00
leijun
346f2982a1 文件长度增加单位 2018-10-09 16:12:09 +08:00
wangxin
4ee273acb3 解决EDGE下IP自动加入超链的问题 2018-10-09 15:29:55 +08:00
leijun
0e09654c56 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 15:00:02 +08:00
leijun
7915c4216b Special task的国际化改成Task 2018-10-09 14:59:49 +08:00
wangxin
69b3626ae2 业务配置界面Tag调整，修改支持全选，不选时默认值0的设置调整 2018-10-09 13:56:30 +08:00
zhangwq
6fa2926268 区域、运营商配置下发格式修改. 2018-10-09 11:53:09 +08:00
leijun
f73f390841 Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-09 10:21:07 +08:00
leijun
d0b7fbea4d 界面业务配置的检索条件Confirm Valid和列表的effective State保持一致 2018-10-09 10:20:54 +08:00
zhanghongqing
e70e7007fc 解决app特征中配置修改时新增配置无法显示问题 2018-10-09 09:44:48 +08:00
zhanghongqing
2b6997aa93 增加配置新增时描述的文字长显示128，配置列表的过长文字截取 2018-10-08 17:18:27 +08:00
wx7614140
c76064163b Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop 2018-10-08 11:27:55 +08:00
wangxin
ef651abc34 页面左侧菜单修复菜单管理的visible功能，isShow=1的时候才展示菜单 2018-10-08 11:27:45 +08:00
zhangwq
ced0fbda7f 顶部菜单鼠标悬停提示改为底部. 2018-10-08 10:36:02 +08:00
wangxin
f373fa1a3c 修正界面行为一列部分未展示的bug 2018-10-07 20:19:55 +08:00
wangxin
34d56b814e 调整协议字段取值 2018-10-06 23:10:54 +08:00
duandongmei
210ba71901 domainSub界面的十六进制信息展示更改 
摘要审核失败bug更改
文件拦截策略表单必填项增加校验
dnat复用地址池隐藏方向属性
snat复用地址池隐藏方向属性
 2018-10-06 15:01:10 +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
leijun
4d0fddf8e7 HTTP-URL页面优化 2018-10-06 00:27:06 +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
wangxin
af9d0bae48 加入验证规则TCP,UDP协议端口可以不为0其他协议端口必须为0端口号不为0时必须选择协议 2018-09-30 18:13:13 +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
duandongmei
47f39dfc99 业务配置标题与菜单名称保持一致 2018-09-30 11:36:09 +08:00