zhangshilin
f78d508bf4
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 17:54:34 +08:00
chenjinsong
6e98f1ae1b
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 17:43:06 +08:00
chenjinsong
da187d17a6
修复系统业务类型列表的查询条件下拉框的显示错误
2018-04-09 17:42:50 +08:00
zhangwei
49fd0be72d
多条配置批量下发maat
2018-04-09 17:28:37 +08:00
zhangshilin
bab153cb72
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 16:57:42 +08:00
wangxin
3e1b3e391d
单域配置调整
...
(1)简化逻辑部分代码写到了BaseController里
(2)字符串，增强字符串配置的区域GK提交
(3)单域配置的审核部分目前不会下发area_ip_cfg给maat,后续会调整
2018-04-09 16:38:45 +08:00
chenjinsong
de3d730cd4
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 16:24:28 +08:00
chenjinsong
fdf20225aa
1.增加guava-18.0.jar，用于gson将json转为泛型list
...
2.调整欺骗ip下发的结构，外层加一层[]
2018-04-09 16:24:17 +08:00
wangxin
33382d4712
（1）调整删除配置方法
...
（2）多域IP修改时取消勾选，后台直接删除
2018-04-09 12:49:19 +08:00
zhangshilin
39fe509ba0
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 11:41:12 +08:00
chenjinsong
116087c068
修改ip类配置的默认值
...
简化欺骗ip校验
2018-04-09 11:26:14 +08:00
wangxin
e6e9c81672
加入common.js,共用的js方法写在里面
2018-04-09 11:03:22 +08:00
wangxin
689b4eb460
修复多域修改时IP配置如果不为空默认不显示的bug
2018-04-09 10:24:55 +08:00
zhangshilin
f502172b2b
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 09:54:54 +08:00
wangxin
7c94f86c20
单域配置验证调整，去掉页面中的验证js,改为通过class 的方式进行验证
2018-04-09 09:43:23 +08:00
zhangshilin
bc524a788c
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-09 08:41:49 +08:00
zhangshilin
251b6ea164
融合代码，
2018-04-09 08:41:23 +08:00
wangxin
f67c0dc72a
IP类配置的区域GK加入非空验证
2018-04-08 19:07:58 +08:00
chenjinsong
a65e7753c4
校验简化
2018-04-08 18:47:53 +08:00
zhangshilin
f0a4104d6b
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 17:56:14 +08:00
zhangshilin
c482540acd
融合代码，优化业务字典、系统字典、特定服务、协议ip校验处理方式，
2018-04-08 17:55:56 +08:00
zhangshilin
4aca555973
融合代码，提交到本地
...
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
Conflicts:
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
2018-04-08 17:52:28 +08:00
chenjinsong
080fe3e660
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 17:47:51 +08:00
chenjinsong
cb00922544
增加ipv6校验
2018-04-08 17:47:44 +08:00
zhangshilin
fb19efed18
优化业务字典、系统字典、特定服务、协议ip校验处理方式，融合代码
2018-04-08 17:41:55 +08:00
zhangwei
75cab20b25
社交应用功能，增加批量处理功能按钮。
2018-04-08 17:19:43 +08:00
chenjinsong
40ff67f6f2
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 17:07:39 +08:00
chenjinsong
1828b726ba
1.增加增强文本管控的ip类校验
...
2.将ip地址格式校验提示语提出至国际化配置
2018-04-08 17:07:32 +08:00
wangxin
b2ae24021a
增删改查审核成功结果提示替换为I18N code
2018-04-08 16:27:47 +08:00
wangxin
aaf8dd5afb
（1）IP类配置增加区域GK逻辑
...
（2）修复编译ID的重复获取BUG
（3）监测类配置目前不提供区域管控逻辑
2018-04-08 16:15:06 +08:00
chenjinsong
1f6bbc20ce
系统业务类型增加后台校验，初始数据不允许删除，只允许admin修改
2018-04-08 16:18:48 +08:00
chenjinsong
eb02e309ee
上次提交时漏提交的
2018-04-08 15:46:40 +08:00
chenjinsong
ae129ad6b4
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 15:45:07 +08:00
chenjinsong
f2741a00f4
1.欺骗ip表单页去掉desc的必填限制，修复来函不能正确限制的问题，修复大标题文字错误的问题
...
2.简化增强管控表单页的校验书写（ip类的简化此次未提交）
2018-04-08 15:44:57 +08:00
zhanghongqing
091a1560ca
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 15:08:43 +08:00
zhanghongqing
ce18c85ca2
头像文件夹
2018-04-08 15:07:57 +08:00
zhanghongqing
fd57a99f34
修复上传头像
2018-04-08 15:05:33 +08:00
wangxin
04c8c4e06a
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 15:03:17 +08:00
wangxin
1d589b5041
I18N加入审核成功，审核失败
2018-04-08 15:03:06 +08:00
wangxin
983acdf3d6
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 14:53:11 +08:00
wangxin
4dd3ea45cb
修复失败错误提示没有样式
2018-04-08 14:52:51 +08:00
wangxin
82eef927b8
修复IP配置为空的时候审核报错的bug
2018-04-08 14:09:21 +08:00
chenjinsong
2ed9333e69
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-08 11:11:05 +08:00
chenjinsong
aaa5c8ba87
系统业务类型 初始的数据不允许删除，并只允许admin修改
2018-04-08 11:10:53 +08:00
zhangshilin
b8fbd975c6
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-04 18:17:30 +08:00
chiguangxu
6ac47b1e80
界面样式调整
2018-04-04 18:17:53 +08:00
zhangshilin
42f388d874
sys_dict_info 新增is_initianlize字段（是否为初始化数据），不得删除初始化数据，仅admin可修改
2018-04-04 18:16:21 +08:00
zhangwei
12678d31e4
用户身份标识修正
2018-04-04 11:10:07 +08:00
zhanghongqing
915a8f2bbf
validate增加俄语
2018-04-04 09:04:03 +08:00
zhanghongqing
d7ab7d6782
国际化文件提交
2018-04-03 18:11:38 +08:00
