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

1576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhanghongqing
584ca1cfb1 ntcSubscribeIdCfgList修改名称 2018-08-21 18:00:20 +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
b1a2eae606 InterceptCfgService增加 2018-08-21 11:42:33 +08:00
duandongmei
b5d990c160 国际化文件恢复 2018-08-21 11:24:04 +08:00
fangshunjian
d52178a510 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-21 10:47:23 +08:00
fangshunjian
57ef37c743 1、修改文件策略不能更新 审计时间 
2、响应文件增加 必填 校验
 2018-08-21 10:46:59 +08:00
zhanghongqing
049b2aa893 修改是否记录日志默认值 2018-08-21 10:25:23 +08:00
wangxin
0b6aaa3f9e function_region_dict修改，增加config_region_sort列，根据config_region_sort列进行排序 2018-08-21 10:06:43 +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
52412bfc80 ip公共展示列表修改限速展示方式 2018-08-21 08:44:31 +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
738099ca4e 修复indexOf异常 2018-08-20 20:49:40 +08:00
wangxin
bfb5d0f476 防止不同页面冲突，加入判断 2018-08-20 20:11:06 +08:00
wangxin
3ea864a0c9 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 20:08:04 +08:00
wangxin
82b63a2ba7 ip部分页面修改为根据公共属性判断 2018-08-20 20:07:26 +08:00
zhanghongqing
fc2e0443fe 设置是否记录日志默认值同matt默认值，防止审核失败 2018-08-20 19:58:50 +08:00
wangxin
493ff4013f IP导入改为数字验证 2018-08-20 18:52:44 +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
zhanghongqing
73e41d4500 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 18:46:13 +08:00
leijun
18e8c872f3 类名报错 2018-08-20 18:39:06 +08:00
zhanghongqing
faf13409c3 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 17:47:01 +08:00
zhanghongqing
ada7d38be9 Revert "冲突" 
This reverts commit 8d9bbabbee.
 2018-08-20 17:46:28 +08:00
zhanghongqing
8d9bbabbee 冲突 2018-08-20 17:27:03 +08:00
leijun
2c3c545059 p2p文件名更正 2018-08-20 17:22:39 +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
wangxin
203cf3355b (1)取消点击触发的函数提取到common.js 
(2)搜索submitHandler中恢复loading
 2018-08-20 12:47:26 +08:00
zhanghongqing
26d4ed4a9c voip 拆分为VoIP IP跟VoIP Account 2018-08-20 11:35:07 +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
8033731f0e 导出加入关闭提示 2018-08-20 10:51:16 +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