zhangwei
11f91c0578
增加音视频业务控制层
2018-05-17 14:56:26 +08:00
zhangwei
446eee86c3
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-05-17 14:48:47 +08:00
zhangwei
3e7821b9d6
增加音视频业务控制层
2018-05-17 14:48:18 +08:00
wangxin
42d7369136
修复bug
2018-05-16 11:41:24 +08:00
chiguangxu
912b3f7a21
图标相关修改
2018-04-17 17:00:50 +08:00
wangxin
59dbd75c7a
修复错误调用
2018-04-17 16:44:27 +08:00
chiguangxu
450a5bd7e7
菜单选中图标功能修复，根菜单修改图标
2018-04-16 17:54:20 +08:00
chiguangxu
da99177036
Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
2018-04-13 18:16:03 +08:00
chiguangxu
b386978b45
机构界面调整，分页实现后台国际化，列表数据为空显示提示
2018-04-13 18:15:54 +08:00
wangxin
f4d7128ef5
页面国际化代码添加
2018-04-13 14:31:22 +08:00
chenjinsong
3f054e468a
补充一处国际化配置
2018-04-13 14:26:09 +08:00
wangxin
9a130d864d
(1)为了使用批量更新，修改了updateByPrimaryKeySelective方法的方法名为update
...
(2)多域类配置加入地域IP
(3)多域类配置可任选
(4)多域类配置加入批量删除，审核
2018-04-13 13:50:29 +08:00
chenjinsong
0dd7f79af0
1.完善一些提示的国际化配置
...
2.欺骗ip权限控制调整
2018-04-13 13:47:22 +08:00
zhanghongqing
cfb453d310
补充国际化
2018-04-13 10:18:46 +08:00
zhanghongqing
056d5d6897
调节组织机构界面
2018-04-12 17:36:05 +08:00
wangxin
a539bad370
添加字段字段，可选，对应code为 optional
2018-04-12 14:10:28 +08:00
wangxin
7118b82d6d
(1)增强字符串多选修改
...
(2)增强字符串权限增加
2018-04-11 18:47:02 +08:00
chenjinsong
a7b4b1edfb
补充上一次提交
2018-04-11 18:24:50 +08:00
zhanghongqing
318431e153
新增国际化代码
2018-04-11 17:53:03 +08:00
wangxin
3d13e39305
(1)字符串类配置修改支持批量操作
...
(2)字符串类配置权限增加
2018-04-11 16:44:45 +08:00
chenjinsong
5fcd54c5f4
1.优化sql，提升用户登录速度
...
2.增加欺骗ip权限控制
2018-04-11 15:19:52 +08:00
wangxin
1f9a190924
(1)权限微调
...
(2)分页函数移动到common.js
2018-04-11 14:30:15 +08:00
wangxin
76d190e78a
(1)IP类配置页面修改，支持多选的删除，审核，操作按钮上移
...
(2)修复验证方法ipCheck影响多个IP配置的bug
2018-04-11 13:45:04 +08:00
zhanghongqing
f94e377819
增加国际化
2018-04-11 11:50:49 +08:00
zhangshilin
ea1cdfb5f8
将业务/系统字典，特定服务，协议ip权限控制add和delete从edit中细分出来
2018-04-10 18:04:25 +08:00
wangxin
00b1d19065
(1)删除配置时级联删除配置相关的区域IP
...
(2)修复ip配置删除完成跳转到审核菜单的bug
2018-04-10 10:42:24 +08:00
zhangshilin
4e11a9ce02
修订校验提示，，更改范围校验方式为表单标签内部校验方式，融合代码，
2018-04-09 17:56:41 +08:00
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
