zhanghongqing
|
8db613d464
|
增加注解
|
2018-08-19 10:52:32 +08:00 |
|
zhanghongqing
|
8dbad03cb3
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-08-19 10:47:52 +08:00 |
|
zhanghongqing
|
30e2cc0805
|
码表标签直接取，注释缓存
|
2018-08-19 10:47:42 +08:00 |
|
zhangwenqing
|
fbdae196f8
|
提交新增字典数据sql
|
2018-08-19 10:42:26 +08:00 |
|
zhangwenqing
|
d1d29a52dd
|
提交新建库表结构sql文件.
|
2018-08-19 09:27:15 +08:00 |
|
duandongmei
|
af704de60a
|
修改增强字符串类域的region属性为动态展示
|
2018-08-18 20:47:32 +08:00 |
|
duandongmei
|
56cb6f1df2
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-08-18 20:41:38 +08:00 |
|
leijun
|
cbeaaadb00
|
修改基础协议界面标题及IP Address增加action查询条件
|
2018-08-18 19:58:08 +08:00 |
|
duandongmei
|
2b55c19c54
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-08-18 19:54:53 +08:00 |
|
duandongmei
|
69a8c8c616
|
冲突解决
|
2018-08-18 19:54:31 +08:00 |
|
zhangwenqing
|
ab07d98b55
|
p2p配置提交以及相关国际化代码.
|
2018-08-18 19:05:12 +08:00 |
|
duandongmei
|
0c653dc05b
|
日志修改direction取错字典的bug
|
2018-08-18 15:27:00 +08:00 |
|
duandongmei
|
e0b01d9c9a
|
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
|
2018-08-18 15:00:57 +08:00 |
|
wangxin
|
c6576ca65f
|
Merge branch 'demostration_08' into 'develop'
修复service总量查询functionId没有传到后台的bug
See merge request !35
|
2018-08-18 15:01:36 -04:00 |
|
duandongmei
|
e8d7fc7373
|
日志action条件修改
|
2018-08-18 14:59:49 +08:00 |
|
wangxin
|
51c6656258
|
修复service总量查询functionId没有传到后台的bug
|
2018-08-18 14:57:35 +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 |
|
wangxin
|
7ad811745c
|
Merge branch 'demostration_08' into 'develop'
含有tagsInput的页面加入不可见字符的验证
See merge request !34
|
2018-08-17 15:49:34 -04:00 |
|
wangxin
|
487dcd1028
|
含有tagsInput的页面加入不可见字符的验证
|
2018-08-17 15:46:44 +08:00 |
|
zhanghongqing
|
f236187231
|
ntcSubscribeIdCfg.java 直接继承使用字符串类，部分字段默认值
|
2018-08-17 15:35:12 +08:00 |
|
wangxin
|
6d46075f49
|
Merge branch 'demostration_08' into 'develop'
Demostration 08
See merge request !33
|
2018-08-17 15:34:02 -04:00 |
|
wangxin
|
cc56170346
|
tagsInput的非可见字符验证提取到common.js中
|
2018-08-17 15:28:15 +08:00 |
|
wangxin
|
05fca7be1b
|
http tags输入的标签做不可见字符的验证
|
2018-08-17 15:10:30 +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 |
|
wangxin
|
2601724cdb
|
Merge branch 'demostration_08' into 'develop'
Demostration 08
See merge request !31
|
2018-08-16 17:56:14 -04:00 |
|
wangxin
|
0cd9ca0488
|
(1)修复排除ID 0=''
(2)notAllowSelectRoot参数用来处理select选中项
(3)app，基础协议，加密隧道行为处理，不得选择rootNode
|
2018-08-16 17:49:50 +08:00 |
|
zhangwenqing
|
2e87ac174c
|
修改国际化.
|
2018-08-16 17:46:56 +08:00 |
|
zhangwenqing
|
e1bcd495cc
|
添加国际化.
|
2018-08-16 17:03:28 +08:00 |
|
zhanghongqing
|
0f13045065
|
Merge branch 'demostration_08' into 'develop'
去掉国际化汉语重复单词：来函
See merge request !30
|
2018-08-16 16:30:20 -04:00 |
|
chenjinsong
|
27ff08ca41
|
同步修改国际化代码refer为referer
|
2018-08-16 16:45:30 +08:00 |
|
chenjinsong
|
c2c97f222c
|
refer改为referer
|
2018-08-16 16:41:17 +08:00 |
|
zhanghongqing
|
e1a035762a
|
去掉重复单词：来函
|
2018-08-16 16:24:22 +08:00 |
|
duandongmei
|
9450df24b5
|
所有字符串域新增时，方便用户理解HEX和Case-senstive
将“是否hex二进制”属性隐藏，增加是否二进制和是否大小写敏感两个选项，common.js中根据界面两个选项，自动设置隐藏的“是否二进制“属性的值【注：十六进制时，大小写敏感】
其他后期新增的界面，也需要这样处理
|
2018-08-16 15:13:18 +08:00 |
|
duandongmei
|
c00f2a0999
|
Merge branch 'demostration_08' into 'develop'
Demostration 08
See merge request !29
|
2018-08-16 14:32:57 -04:00 |
|
wangxin
|
92d8e2f54c
|
Merge branch 'demostration_08' into 'develop'
Demostration 08
See merge request !28
|
2018-08-16 11:28:21 -04:00 |
|
wangxin
|
e193ebac3e
|
Merge branch 'demostration_08' of http://10.0.6.99/gwall/gwall.git into demostration_08
|
2018-08-16 14:35:12 +08:00 |
|
wangxin
|
ba6460a475
|
特定服务新增时是否叶子节点放开
|
2018-08-16 14:34:14 +08:00 |
|
duandongmei
|
c08b57a414
|
ip_multiplex_policy=IP\u590D\u7528\u7B56\u7565
target_ip_protect=\u6297DDOS\u653B\u51FB
ip_multiplex_pool_config=IP\u590D\u7528\u5730\u5740\u6C60
letter=\u61D2\u6C49
国际化中文更改
|
2018-08-16 14:24:39 +08:00 |
|
wangxin
|
67aa6d985d
|
修正tagtree选择时，树默认value在clear的时候展示为placeholder的展示bug
|
2018-08-16 12:53:46 +08:00 |
|
wangxin
|
c2d024a352
|
(1)app特征表单，基础协议，加密隧道行为tree根节点添加tittle
(2)特定服务表单验证位置调整
|
2018-08-16 11:20:43 +08:00 |
|
duandongmei
|
63ace090c6
|
Merge branch 'develop' into 'demostration_08'
Develop
See merge request !27
|
2018-08-15 20:38:36 -04:00 |
|
duandongmei
|
10ebfca48d
|
增加letter_statistics_info中文国际化
|
2018-08-15 20:32:48 +08:00 |
|
zhanghongqing
|
284f155ec2
|
Merge branch 'demostration_08' into 'develop'
增加标签字典码表sql文件
See merge request !26
|
2018-08-15 20:19:07 -04:00 |
|