wangxin
|
caac10f967
|
修改random为当前时间戳，防止tomcat高版本因为非法字符导致请求失败
|
2018-07-12 10:14:36 +08:00 |
|
duandongmei
|
27858999be
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/resources/messages/message_en.properties
|
2018-07-12 09:32:44 +08:00 |
|
duandongmei
|
7386312fa6
|
去掉 proxy_http_res_body_replace
中的PXY
|
2018-07-12 09:21:56 +08:00 |
|
wangxin
|
cdde9c1f6c
|
（1）实时报表国际化
（2）恢复报表遮罩层
|
2018-07-12 09:08:25 +08:00 |
|
zhangwenqing
|
489a3f1088
|
报表页面修改.
|
2018-07-11 20:31:47 +08:00 |
|
zhanghongqing
|
b2d6524279
|
去掉统计图无用类
|
2018-07-11 19:05:08 +08:00 |
|
zhanghongqing
|
34892e5fd8
|
1.日志增加app,Ddos 2.修改日志类名3.增加国际化代码及日志nis配置4.修改页面需要的标签类
|
2018-07-11 18:15:59 +08:00 |
|
zhangwei
|
d303ffc9d7
|
修改顶部菜单内容过长时截取
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-11 18:00:13 +08:00 |
|
zhangwei
|
fa7ab0dd28
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-11 17:55:44 +08:00 |
|
zhangwei
|
4f1b7b0406
|
修改英文国际化文件
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-11 17:12:02 +08:00 |
|
wangxin
|
479f45a3d7
|
报表名称替换为国际化代码
|
2018-07-11 16:58:45 +08:00 |
|
wangxin
|
ec88f29689
|
IP白名单表单替换
|
2018-07-11 16:37:21 +08:00 |
|
duandongmei
|
4466b9c1e1
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/resources/messages/message_en.properties
|
2018-07-11 16:18:23 +08:00 |
|
duandongmei
|
89ec630a33
|
首页增加配置统计列表
|
2018-07-11 16:15:23 +08:00 |
|
chenjinsong
|
f067b24fba
|
report前端分页bug修复
|
2018-07-11 15:38:37 +08:00 |
|
zhangwei
|
84338393d9
|
修改音视频文件样例配置功能，表单界面删除样例文件的上传，改由后台调用外部程序生成样例文件。
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-11 14:20:01 +08:00 |
|
chenjinsong
|
e989f78fe6
|
1.report前端分页
2.report的时间搜索框显示默认时间（当日）
|
2018-07-11 13:50:24 +08:00 |
|
wangxin
|
37b358eecb
|
IP复用地址池审核权限修复
|
2018-07-10 17:50:39 +08:00 |
|
wangxin
|
7319513775
|
NtcPzReport移动到report包下，路径改为report
|
2018-07-10 17:26:43 +08:00 |
|
wangxin
|
e3e2417fca
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 16:51:33 +08:00 |
|
zhangwei
|
0504326fb6
|
国际化英文内容修改
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-10 17:03:50 +08:00 |
|
wangxin
|
d1ef4cfc15
|
修复修改样例文件配置时重新上传样例文件，下发MD5出错的bug
|
2018-07-10 16:50:46 +08:00 |
|
duandongmei
|
23c2da6dee
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 16:49:52 +08:00 |
|
duandongmei
|
83fb581fb5
|
冲突文件提交本地
|
2018-07-10 16:49:28 +08:00 |
|
zhangwei
|
73917c8a28
|
系统用户与系统角色在系统中尚未使用的字段属性使用隐藏域缺省值，不显示在界面中。
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-10 16:43:19 +08:00 |
|
wangxin
|
ad2e448e41
|
报表页面获取业务类型日志总量功能提交
|
2018-07-10 15:26:18 +08:00 |
|
wangxin
|
992cec2a17
|
报表列表界面只查询function_service_dict，其他属性的查询去掉
|
2018-07-10 14:00:24 +08:00 |
|
wangxin
|
96634ac0ba
|
报表tab默认选择标签
|
2018-07-10 13:51:33 +08:00 |
|
zhangwenqing
|
31a95bde28
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 14:03:59 +08:00 |
|
zhangwenqing
|
8d9d73a831
|
报表Controller修改.
|
2018-07-10 14:03:26 +08:00 |
|
wangxin
|
d1aa3227d9
|
标签，来函报表加入前台日期字段处理
|
2018-07-10 13:38:56 +08:00 |
|
wangxin
|
0e05e2a0e4
|
（1）境内源IP报表加入对界面时间字段的处理
（2）时间字段的处理放到baseController中
（3）界面ajax函数缩减为1个公用的函数
|
2018-07-10 13:33:28 +08:00 |
|
zhangwenqing
|
86fa5f0000
|
性质、各国家目的IP、运营商局点报表页面提交.
|
2018-07-10 13:25:41 +08:00 |
|
zhanghongqing
|
cd954463f5
|
1.修改日志显示问题，后台打印请求路径2.增加页面标签显示code类
|
2018-07-10 12:32:39 +08:00 |
|
zhangwei
|
c17501aa42
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 11:28:30 +08:00 |
|
zhangwei
|
c9c13b9c26
|
关键字与表达式限制最多4个关键字
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-10 11:26:21 +08:00 |
|
wangxin
|
78313edf7d
|
境内ip报表提交
|
2018-07-10 11:11:35 +08:00 |
|
chenjinsong
|
ba9d3644de
|
report日期选择方式更改(问题修复)
|
2018-07-10 10:31:15 +08:00 |
|
chenjinsong
|
77a002a770
|
report日期选择方式更改
|
2018-07-10 10:18:24 +08:00 |
|
chenjinsong
|
e2861c68b0
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 10:11:01 +08:00 |
|
chenjinsong
|
8f95c95b82
|
report日期选择方式更改
|
2018-07-10 10:08:36 +08:00 |
|
wangxin
|
c7fa2d3a94
|
ajax函数加入遮罩层
|
2018-07-10 09:49:30 +08:00 |
|
wangxin
|
74246e1f1f
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-07-10 09:31:39 +08:00 |
|
zhangwei
|
6c3e8c2375
|
将HTTP和DNS配置的自定义域参数的key提取到配置文件中
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-10 09:39:00 +08:00 |
|
wangxin
|
7b915cb717
|
新建package report,所有报表的pojo放入其中
|
2018-07-10 09:30:56 +08:00 |
|
wangxin
|
bdc2a88d5b
|
来文函号报表页面提交
|
2018-07-10 09:14:18 +08:00 |
|
wangxin
|
5c828fee58
|
ajax调用tag单独提出为一个函数
|
2018-07-09 18:08:54 +08:00 |
|
wangxin
|
3b60b81c72
|
提交标签报表页面第一版
|
2018-07-09 17:36:13 +08:00 |
|
zhangwei
|
5ed876e38d
|
修改表达式类型的“与表达式”与“无表达式”国际字典码
Signed-off-by: zhangwei <zhangwei@intranet.com>
|
2018-07-09 16:00:10 +08:00 |
|
duandongmei
|
2203786946
|
修改voip、dns响应策略、ip欺骗模块权限bug
系统管理模块所有提示信息增加国际化
增加清空数据sql
|
2018-07-09 15:49:03 +08:00 |
|