gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,240 Commits
8 Branches
41 Tags
17 MiB
Commit Graph

2240 Commits (4037e15497851b71ae9e657b5c576d26c7262af8)

Author SHA1 Message Date
fengshuonan 4d86b36cf6 Merge remote-tracking branch 'origin/group3-timer' 2021-01-09 20:29:46 +08:00
fengshuonan d7f6fe7b20 Merge remote-tracking branch 'origin/group3-log' 2021-01-09 20:28:44 +08:00
fengshuonan 60fb62bb18 Merge remote-tracking branch 'origin/group1-role' 
# Conflicts:
#	kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/role/request/SysRoleRequest.java
#	kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/entity/SysMenuButton.java
#	kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/SysMenuButtonMapper.java
#	kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/mapper/mapping/SysMenuButtonMapper.xml
#	kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuButtonService.java
#	kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java
#	kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/role/modular/controller/SysRoleController.java
 2021-01-09 19:37:36 +08:00
fengshuonan 996bbb0442 【role】完善角色绑定数据范围的方法 2021-01-09 19:25:12 +08:00
rays 4345fb0e5b 1.新增角色菜单和按钮授权以及接口授权 
2.修改资源详情接口
 2021-01-09 19:18:57 +08:00
liuhanqing 0addfa1138 【notice】通知管理接口 2021-01-09 17:35:28 +08:00
fengshuonan 5c7d5159d5 【menu】更新菜单和按钮的逻辑 2021-01-09 17:02:55 +08:00
TSQ 29b2b33973 优化日志管理分页查询 2021-01-09 16:48:12 +08:00
fengshuonan 31e5d2d12f Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:32:21 +08:00
q18idc eca13201ca 【system】添加不允许修改菜单按钮code 2021-01-09 16:23:33 +08:00
fengshuonan fc2239f7ff Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:15:18 +08:00
q18idc e8d052f176 【system】菜单按钮模块更新注释 2021-01-09 16:09:35 +08:00
fengshuonan 9fb7e0db9a Merge remote-tracking branch 'origin/group1-button' 2021-01-09 16:04:24 +08:00
q18idc e89db183da 【system】完成菜单按钮管理相关接口 2021-01-09 15:15:46 +08:00
TSQ 3fa19c2d22 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/roses-kernel 2021-01-09 13:56:30 +08:00
TSQ 66bcb813cf 优化日志管理分页查询 2021-01-09 13:56:20 +08:00
fengshuonan 61e6c89764 【sql】增加分离版sql 2021-01-09 12:34:05 +08:00
fengshuonan 060c9cb89c 【sql】更新组织机构菜单的三个菜单 2021-01-09 12:32:16 +08:00
fengshuonan 0a30f6970c 【sql】更新角色绑定按钮的一些权限 2021-01-09 12:07:39 +08:00
fengshuonan 2bc5e18fe8 【auth】【system】增加角色关联button功能，增加校验当前用户有无button的权限方法 2021-01-09 11:53:58 +08:00
q18idc 2c329b4b90 【system】重命名菜单按钮service 2021-01-09 11:10:21 +08:00
q18idc 4f13607934 【system】添加菜单按钮实体、service、mapper 2021-01-09 11:07:44 +08:00
fengshuonan 26a79e6c21 【auth】【system】增加updateSession接口，更新头像会刷新缓存 2021-01-09 10:52:37 +08:00
fengshuonan 604d6027b3 【auth】更新注释 2021-01-09 10:42:16 +08:00
fengshuonan 740bd838c4 【sql】更新数据库表明，更新按钮表，更新角色按钮对应表 2021-01-08 23:01:12 +08:00
fengshuonan a2eef4ed81 【resource】更新资源查询接口 2021-01-08 22:22:23 +08:00
fengshuonan 1f94d549c8 【role】更新角色相关接口 2021-01-08 21:56:10 +08:00
fengshuonan 2caa1cd098 【menu】更新菜单layui图标 2021-01-08 21:23:52 +08:00
liuhanqing 1056a41826 【message】系统消息接口调试完成 2021-01-08 21:12:33 +08:00
fengshuonan 3272de48c5 【menu】更新layui版本获取初始菜单为激活应用的菜单 2021-01-08 20:53:28 +08:00
liuhanqing 17fedc40f3 【message】系统消息接口调试 2021-01-08 19:37:43 +08:00
liuhanqing 57df605600 Merge branch 'master' into group5-msg 2021-01-08 18:57:22 +08:00
fengshuonan 7808c2fecc 【menu】整理菜单详情和修改菜单 2021-01-08 18:35:35 +08:00
fengshuonan 9d3a780a20 【menu】更新获取antdv的所有菜单接口，删除菜单表path字段 2021-01-08 15:45:33 +08:00
hansson e19a0d582c 【message】增加批量更新系统消息接口 2021-01-08 15:04:55 +08:00
hansson c48f973e6b 【message】系统消息后台接口 2021-01-08 14:25:11 +08:00
@阿坤同学 22ba246369 【定时模块】编辑接口增加jobStatus非空验证 2021-01-08 09:11:59 +08:00
liuhanqing cc65953d31 Merge branch 'master' into group5-msg 
# Conflicts:
#	kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/UserServiceApi.java
#	kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
 2021-01-07 20:51:42 +08:00
liuhanqing 3cedc75acb 【message】增加脚本 2021-01-07 20:48:32 +08:00
fengshuonan 6473ee7479 【menu】更新sql 2021-01-07 18:45:35 +08:00
fengshuonan e2e1a15d10 【menu】更新antdv需要的一个获取所有菜单接口 2021-01-07 18:41:12 +08:00
rays d5d598631d 新增获取菜单接口 2021-01-07 16:52:12 +08:00
rays f6e609e742 新增登陆接口 2021-01-07 16:19:07 +08:00
fengshuonan 4b7e0d60e4 【menu】整理新增菜单方法 2021-01-06 22:36:49 +08:00
fengshuonan 29858b7f53 【menu】更新visable属性 2021-01-06 22:26:49 +08:00
fengshuonan f5eb9dfb18 【menu】增加获取父级菜单的下拉选择框，增加ztree的节点封装，用ztree不要用lombok 2021-01-06 22:18:13 +08:00
fengshuonan 09b397cc4b 【org】整理代码规范 2021-01-06 21:06:11 +08:00
peihongwei 34e7c3f026 在线用户列表 2021-01-06 20:40:50 +08:00
chenjinlong 7fce5793ac 【HrOrganizationController】新增机构树 2021-01-06 20:39:16 +08:00
chenjinlong 0139e9b0e7 【HrOrganizationRequest】修改orgPids参数校验 2021-01-06 20:39:16 +08:00