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

957 Commits

Author SHA1 Message Date
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
557be23566 (1)修改function_service_dict region_code字段为varchar,支持多个code 
(2)http,ssl,邮件IP调整
 2018-08-21 02:25:03 +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
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
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
wangxin
7b86868cd1 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-20 10:16:35 +08:00
zhangwenqing
b2bb12a52b 添加国际化代码. 2018-08-20 09:52:44 +08:00
wangxin
5fa8ad485c region,service字典增加字段 2018-08-20 09:24:44 +08:00
zhangwenqing
32b229e233 1.P2P审核未通过的配置修改后改为未审核状态 2.P2P新增界面Hash配置只能选择十六进制 2018-08-19 18:00:08 +08:00
duandongmei
86d8663994 region 字典增加configServiceType属性 2018-08-19 15:56:17 +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
zhanghongqing
8db613d464 增加注解 2018-08-19 10:52:32 +08:00
zhanghongqing
30e2cc0805 码表标签直接取，注释缓存 2018-08-19 10:47:42 +08:00
duandongmei
af704de60a 修改增强字符串类域的region属性为动态展示 2018-08-18 20:47:32 +08:00
zhangwenqing
ab07d98b55 p2p配置提交以及相关国际化代码. 2018-08-18 19:05:12 +08:00
duandongmei
e8d7fc7373 日志action条件修改 2018-08-18 14:59:49 +08:00
zhanghongqing
4fd3f5c210 提交配置公共类增加subscribe_id的集合 2018-08-18 13:12:03 +08:00
zhangwenqing
74a3dac925 补充提交. 2018-08-17 19:34:36 +08:00
zhangwenqing
ea99d23eec p2p配置部分提交. 2018-08-17 19:31:48 +08:00
chenjinsong
a7d2b937a5 上步漏提交的 2018-08-17 16:27:16 +08:00
chenjinsong
9888290add 1.bgp日志 
2.增加公共字段、调整部分日志展示项
 2018-08-17 16:23:03 +08:00
zhanghongqing
f236187231 ntcSubscribeIdCfg.java 直接继承使用字符串类，部分字段默认值 2018-08-17 15:35:12 +08:00
wangxin
18678f14b5 Maat 下发IP all格式修正 2018-08-17 14:19:41 +08:00
zhanghongqing
437680a569 修改公共类减少无用字段 2018-08-17 12:30:04 +08:00
zhanghongqing
5852483b88 提交公共类 2018-08-17 10:48:56 +08:00
zhanghongqing
03c1d559df 1.增加公共字符串类NtcSubscribeIdCfg.java 
2.音视频样例界面标题下加一条横线
 2018-08-17 10:48:18 +08:00
chenjinsong
c2c97f222c refer改为referer 2018-08-16 16:41:17 +08:00
wangxin
92eae3bf39 Merge branch 'demostration_08' into 'develop' 
异常提示调整

See merge request !17
 2018-08-14 18:01:51 -04:00
wangxin
3f9aa29320 (1)加入新异常，调用外部程序异常。原外部程序调用异常提示在在返回信息 
(2)音视频控制类异常处理，防止出现表单提交，审核时为了防止出现未知异常导致界面出错，catch
MaatCovertException修改为catch exeption,根据异常类型进行判断返回界面信息
(3)message.tag不够严谨，修改了success的判断
 2018-08-14 17:58:00 +08:00
duandongmei
c87ad112c5 增加request_service统计的requests空集合bug 2018-08-14 14:54:12 +08:00
wangxin
6ffd267c6a (1)tag根节点替换root_node 
(2)特定服务app列名替换
 2018-08-14 14:37:48 +08:00
zhanghongqing
32eaa9d4d8 修改http分页bug 2018-08-13 18:03:00 +08:00
zhanghongqing
b8d742e11c 日志行为识别去掉App_label字段，增加五个标签 
LABEL_PROTO_ID
LABEL_OS_ID
LABEL_BS_ID
LABEL_BEHAV_ID
LABEL_APP_ID
 2018-08-13 17:26:16 +08:00
wangxin
522bd14dbb IP导入4OVER6,6OVER4,ALL格式校验 2018-08-13 11:46:58 +08:00
duandongmei
96fa1eedb9 首页来函业务类型统计功能 
修改部分页面十六进制校验不生效bug
更换logo
 2018-08-10 16:24:07 +08:00
wangxin
1a716c394c 音视频样例异常展示由浅蓝色调整为红色 2018-08-09 19:01:46 +08:00
duandongmei
9b1f4d30cc //HTTP block： response code is not null ;response content 
null(userRegion is not null)
//HTTP redirect： response code is not null ;response content is not
null(userRegion is not null)
//HTTP replace： replace type is not null ;find is not null;replace with
is not null(userRegion is not null)
修复proxy 排序 查询列表bug
 2018-08-09 15:07:49 +08:00
duandongmei
5964eeca80 文件类型验证忽略大小写 
去掉制表符处理的js，影响了ysp的下发
 2018-08-09 13:21:21 +08:00