Commit Graph

401 Commits

Author SHA1 Message Date
wangxin
0354487dc8 ratelimit数据库改为varchar,pojo改为String 2018-08-25 16:37:39 +08:00
wangxin
c8a6dd4055 ip地址添加NTC_SUBSCRIBE_ID,丢弃和回流不加NTC_SUBSCRIBE_ID配置,不记录日志 2018-08-25 11:42:24 +08:00
wangxin
b8ce71e20e (1)域名白名单添加订阅ID,dolog
(2)WebsiteController redirect 使用RedirectAttributes
2018-08-25 01:55:10 +08:00
wangxin
e5e0d47a27 ip白名单修改,增加SUBSCRIBE_ID属性 2018-08-24 20:55:20 +08:00
wangxin
e62cace354 ip复用策略单独提出页面 2018-08-24 18:41:21 +08:00
duandongmei
d16db28a1e 拦截文件策略功能更改 2018-08-24 15:41:05 +08:00
zhanghongqing
b970557c78 统计图表增加详情静态页面 2018-08-24 14:17:53 +08:00
fangshunjian
a9e348b8a0 Merge remote-tracking branch 'origin/develop' into develop 2018-08-24 13:54:33 +08:00
fangshunjian
c07bb1b685 1、proxy 增加 do_log
2、proxy 增加 subcribe id
2018-08-24 13:53:23 +08:00
zhangwenqing
85e813a5d7 1.解决APP策略SubscribeId修改问题 2.APP特征dolog为0 2018-08-24 12:15:19 +08:00
wangxin
0ea0db2369 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-24 11:55:06 +08:00
wangxin
063fa03a94 (1)tree属性扩展,支持新增节点
(2)特定服务增加一列标记新增节点
2018-08-24 11:54:21 +08:00
leijun
f70838f4d4 1.XMPP增加subscribe_id 2.增加do_log 3.compileId查询 2018-08-24 11:45:35 +08:00
leijun
295d92fe79 增加APP session Feature 2018-08-24 10:25:01 +08:00
zhangwenqing
62549388fb APP策略、文件摘要加SubscribeId域. 2018-08-24 09:53:24 +08:00
zhanghongqing
50d8d8c10f 1.修改主题网站topic从码表中获取 2018-08-23 20:53:04 +08:00
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
0e0f574c97 域名拦截功能完成 2018-08-23 15:21:50 +08:00
wangxin
ac21f74043 隐藏isLeaf字段,修复insert没加businessType字段 2018-08-23 15:10:21 +08:00
duandongmei
78b35d49b2 dns\ssl\mail\http修改subscribeId不允许单独配置问题 2018-08-23 11:07:29 +08:00
zhangwenqing
38d9da2693 APP策略、文件摘要doLog CompileId 2018-08-23 10:08:55 +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
zhanghongqing
8884972507 1.ftp增加doLog2.增加subscribeId3.增加compileId查询 2018-08-22 22:42:12 +08:00
wangxin
5932b68c84 由于业务类别使用数字会与app以及基础协议重复早晨树层级混乱,修改了层级ID为字符串businessType+数字code 2018-08-22 20:16:04 +08:00
wangxin
abca1b273c 特定服务增加业务类别
基础协议,app策略以及app特征点击选择时展示业务类别的树
2018-08-22 19:48:20 +08:00
zhanghongqing
f07d194182 1.加密隧道协议增加subscribe_id 2.增加do_log 3.compileId查询 2018-08-22 18:19:29 +08:00
zhanghongqing
e0e2d342a2 1.VoIP增加compileId查询2.异常处理3.增加国家化 2018-08-22 15:46:27 +08:00
zhanghongqing
8087741d05 1.基础协议添加关键字域,dolog,配置id查询 2018-08-22 15:20:14 +08:00
leijun
e458363886 1、增加NTC_BGP_AS配置域
2、增加Subcribe ID配置域
3、增加do_log
2018-08-22 10:26:52 +08:00
duandongmei
ad364ba90d 修改不修饰ajax方法的路径,修改审核不通过后再次修改状态未修改成未审核状态bug 2018-08-22 09:27:06 +08:00
duandongmei
dd33e24e32 proxy intercept ip功能完成
http\dns\ssl\mail dolog添加
2018-08-21 21:26:05 +08:00
zhangwenqing
e31ba6c2e6 APP header配置提交,添加doLog属性. 2018-08-21 19:03:31 +08:00
duandongmei
122e763b1b 拦截IP相关功能提交 2018-08-21 13:38:26 +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
duandongmei
b1a2eae606 InterceptCfgService增加 2018-08-21 11:42:33 +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
zhangwenqing
f40b1c6bb0 APP SSL配置提交以及相关表结构、字典sql. 2018-08-20 21:01:58 +08:00
wangxin
82b63a2ba7 ip部分页面修改为根据公共属性判断 2018-08-20 20:07:26 +08:00
wangxin
493ff4013f IP导入改为数字验证 2018-08-20 18:52:44 +08:00
leijun
18e8c872f3 类名报错 2018-08-20 18:39:06 +08:00
leijun
2c3c545059 p2p文件名更正 2018-08-20 17:22:39 +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
zhangwenqing
b2bb12a52b 添加国际化代码. 2018-08-20 09:52:44 +08:00
zhangwenqing
ab07d98b55 p2p配置提交以及相关国际化代码. 2018-08-18 19:05:12 +08:00
duandongmei
e8d7fc7373 日志action条件修改 2018-08-18 14:59:49 +08:00
chenjinsong
a7d2b937a5 上步漏提交的 2018-08-17 16:27:16 +08:00