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

396 Commits

Author SHA1 Message Date
zhanghongqing
cc8b3f566a 增加主题网站配置 2018-08-23 17:07:09 +08:00
fangshunjian
57bccca189 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 15:39:34 +08:00
duandongmei
78b35d49b2 dns\ssl\mail\http修改subscribeId不允许单独配置问题 2018-08-23 11:07:29 +08:00
wangxin
8b92242581 serviceId为1057,1058的function_id为302,303的菜单隐藏 2018-08-23 10:36:53 +08:00
fangshunjian
76b9a732e0 1、去掉文件策略 action 
2、调整service 接口
 2018-08-23 10:03:25 +08:00
duandongmei
82664d2f21 dns mail http ssl增加subscribeId业务 2018-08-23 10:01:28 +08:00
duandongmei
42554ecb8b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 09:36:09 +08:00
duandongmei
96217e2910 mail,dns,ssl,http冲突文件提交 2018-08-23 09:30:37 +08:00
wangxin
abca1b273c 特定服务增加业务类别 
基础协议，app策略以及app特征点击选择时展示业务类别的树
 2018-08-22 19:48:20 +08:00
zhanghongqing
e0e2d342a2 1.VoIP增加compileId查询2.异常处理3.增加国家化 2018-08-22 15:46:27 +08:00
wangxin
c75eee3dd0 (1)域名白名单页面删除无用的js代码 
(2)IPV4,IPV6的验证正则替换成与综合服务一致
 2018-08-22 11:05:08 +08:00
leijun
e458363886 1、增加NTC_BGP_AS配置域 
2、增加Subcribe ID配置域
3、增加do_log
 2018-08-22 10:26:52 +08:00
duandongmei
dd33e24e32 proxy intercept ip功能完成 
http\dns\ssl\mail dolog添加
 2018-08-21 21:26:05 +08:00
zhanghongqing
c98d319eda 1.修改appcfgDao.xml错误 2018-08-21 17:49:42 +08:00
zhanghongqing
81705b18cb 1.app_policy增加do_log字段，subcribeId相关增删改查方法写在stringCfgDao 2018-08-21 16:49:52 +08:00
duandongmei
549cae1823 修改en国际化冲突记录，修改ru国际化code 2018-08-21 14:10:35 +08:00
duandongmei
122e763b1b 拦截IP相关功能提交 2018-08-21 13:38:26 +08:00
duandongmei
5ee8b5a857 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-21 13:35:57 +08:00
duandongmei
29a1eeac70 国际化文件更改 2018-08-21 13:33:15 +08:00
duandongmei
d6a2b98ec9 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/java/com/nis/web/controller/BaseController.java
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
 2018-08-21 13:31:21 +08:00
leijun
de567f9e35 NTC MAIL 添加 eml_key字段 2018-08-21 12:02:00 +08:00
duandongmei
b5d990c160 国际化文件恢复 2018-08-21 11:24:04 +08:00
zhanghongqing
049b2aa893 修改是否记录日志默认值 2018-08-21 10:25:23 +08:00
wangxin
1106436f29 function_region_dict表增加一列config_region_sort,用作排序 2018-08-21 09:55:57 +08:00
wangxin
6f35a7707a 攻击类型字典修改提交 2018-08-21 09:24:16 +08:00
wangxin
5aa92ec478 voip ip加入function_region_dict 控制 2018-08-21 08:54:15 +08:00
wangxin
0f64a1c10e DDOS IP,PXY控制策略,FTP页面IP加入function_region_dict控制 2018-08-21 08:27:18 +08:00
wangxin
557be23566 (1)修改function_service_dict region_code字段为varchar,支持多个code 
(2)http,ssl,邮件IP调整
 2018-08-21 02:25:03 +08:00
wangxin
23f2910e7c Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 22:27:52 +08:00
wangxin
6c80e62a45 图片IP，APP IP IP白名单关系添加 2018-08-20 22:27:16 +08:00
fangshunjian
974a34ea49 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 22:17:34 +08:00
fangshunjian
1bb113766b 1、新增 http redirect&block 支持文件作为应答内容 2018-08-20 22:12:05 +08:00
wangxin
14301b43f3 修复common.js中的返回方法跳到首页的bug 
音视频页面修改由function_region_dict控制
 2018-08-20 21:29:56 +08:00
zhangwenqing
f40b1c6bb0 APP SSL配置提交以及相关表结构、字典sql. 2018-08-20 21:01:58 +08:00
wangxin
82b63a2ba7 ip部分页面修改为根据公共属性判断 2018-08-20 20:07:26 +08:00
zhanghongqing
aa7c75da99 1.增加do_log字典属性2.cfg_index_info增加do_log字段更新sql文件 
3.VoIP IP跟account增加do_log是否显示日志
 2018-08-20 18:48:10 +08:00
duandongmei
224402956b Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 16:19:58 +08:00
duandongmei
6aa6f253d4 增加proxy证书提交 2018-08-20 16:17:38 +08:00
leijun
a8aebd9e23 添加P2P日志查询 2018-08-20 11:33:34 +08:00
leijun
2c52a0acc3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 11:28:45 +08:00
leijun
e6bc92cb24 提交本地 2018-08-20 11:28:27 +08:00
leijun
488cdde3e6 提交本地 2018-08-20 11:15:02 +08:00
wangxin
7b86868cd1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 10:16:35 +08:00
duandongmei
fbbe28a619 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
 2018-08-20 10:03:10 +08:00
duandongmei
1b42f73d4e 国际化添加intercepter限速和替换 2018-08-20 10:01:52 +08:00
zhangwenqing
b2bb12a52b 添加国际化代码. 2018-08-20 09:52:44 +08:00
wangxin
5fa8ad485c region,service字典增加字段 2018-08-20 09:24:44 +08:00
duandongmei
45556b7e05 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 
Conflicts:
	src/main/resources/sql/function_region_dict_add_colunm.sql
	所有配置界面修改为使用region表动态属性值
 2018-08-19 15:55:27 +08:00
duandongmei
8c7e1d088d 字典增加域类型属性 2018-08-19 15:52:11 +08:00
zhangwenqing
fbdae196f8 提交新增字典数据sql 2018-08-19 10:42:26 +08:00