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

635 Commits

Author SHA1 Message Date
duandongmei
78b35d49b2 dns\ssl\mail\http修改subscribeId不允许单独配置问题 2018-08-23 11:07:29 +08:00
zhangwenqing
4639fe0fdb 修改findSubscribeIdCfgList() xml. 2018-08-23 10:28:29 +08:00
zhangwenqing
38d9da2693 APP策略、文件摘要doLog CompileId 2018-08-23 10:08:55 +08:00
duandongmei
82664d2f21 dns mail http ssl增加subscribeId业务 2018-08-23 10:01:28 +08:00
duandongmei
2d2a342d44 Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop 2018-08-23 10:00:54 +08:00
zhanghongqing
f2e72bef46 修改ftp中dolog bug 2018-08-23 09:43:41 +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
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
wangxin
82a5d6696b IP,域名获取编译ID异常更改 2018-08-22 15:07:13 +08:00
zhangwenqing
16a65176a4 APP特征doLog cfgId查询. 2018-08-22 12:51:58 +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
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
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
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
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