gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,030 Commits
8 Branches
39 Tags
15 MiB
Commit Graph

1030 Commits (e06f93e3407d9139a4484efc711510a9130f07b8)

Author SHA1 Message Date
huangyao 8a7dbedb3c 字典ztree； 
字典模块引入系统模块；
 2021-01-12 22:50:19 +08:00
huangyao c7e145d607 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/roses-kernel 2021-01-12 22:49:34 +08:00
小庆 0902b7e681 【file】文件管理字段修改 列表展示fileBucket、fileObjectName字段 2021-01-12 22:38:45 +08:00
fengshuonan c4aed67af7 【log】更新日期判断 2021-01-12 22:14:28 +08:00
fengshuonan bdd2553013 【menu】更新新增菜单 2021-01-12 21:56:29 +08:00
liuhanqing d144158a9e 【notice\message】message 解析增加返回值 2021-01-12 21:54:26 +08:00
fengshuonan 34a8da5477 【log】整理操作日志代码 2021-01-12 21:53:07 +08:00
fengshuonan 0e4b3bead0 Merge remote-tracking branch 'origin/group5-log' 2021-01-12 21:44:59 +08:00
fengshuonan 42fad0f3ef Merge remote-tracking branch 'origin/group2-user' 
# Conflicts:
#	kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java
 2021-01-12 21:18:25 +08:00
fengshuonan 3c0a528f31 【timer】更新定时任务 2021-01-12 21:08:43 +08:00
fengshuonan 5df2221389 【user】更新查询增加一个条件 2021-01-12 21:08:20 +08:00
chenjinlong ffc37d9259 【SysUserMapper】增加组织机构子查询 2021-01-12 20:55:45 +08:00
liuhanqing e84869cc04 Merge branch 'master' into group5-notice 2021-01-12 20:19:16 +08:00
chenjinlong dcf4a0bf36 【SysUserRule】增加获取用户分配角色ID集合 2021-01-12 19:55:24 +08:00
fengshuonan 51fd74b889 【menu】修复一个auth为空应为null的bug 2021-01-12 18:46:43 +08:00
TSQ eceec0401e 完善日志管理去除无效引用包 2021-01-12 14:02:40 +08:00
TSQ 8668035ac1 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/roses-kernel 2021-01-12 13:42:26 +08:00
TSQ adb94b9277 完善日志管理功能，查看日志详情 2021-01-12 13:42:14 +08:00
huangyao 3c25754381 Merge branch 'master' of https://git.stylefeng.cn/guns-technology/roses-kernel 2021-01-12 12:53:19 +08:00
fengshuonan 05a3154861 更新组织机构树pid 2021-01-12 11:21:43 +08:00
fengshuonan 94f8d8224d 【system】修复user查询bug 2021-01-12 11:16:37 +08:00
fengshuonan 724e8f7051 【sql】更新一个菜单路径 2021-01-11 23:12:40 +08:00
fengshuonan 3d23ce9573 【system】更新在线用户的查询和踢下线 
【auth】登录用户新增了两个属性
 2021-01-11 23:11:09 +08:00
fengshuonan d6924fc276 【system】更新antdv版本组织机构树获取 2021-01-11 21:10:01 +08:00
liuhanqing cade0ff94e 【notice\message】增加message消息未读数量接口 2021-01-11 20:53:26 +08:00
fengshuonan 37438358fa 更新注释 2021-01-11 20:33:59 +08:00
小庆 acfcef2ce8 【file】文件管理字段和sql修改 2021-01-11 20:22:40 +08:00
rays 99565c0257 新增树获取接口 2021-01-11 19:35:46 +08:00
fengshuonan 04752b8641 【sql】更新layui菜单的路径 2021-01-10 20:00:16 +08:00
fengshuonan 0d5cf04f33 【rule】增加一个工具类获取本机hostname 2021-01-10 19:06:45 +08:00
chenjinlong 700d0bdb30 【sysUser】默认密码方法 权限相关配置挪至系统基础设置配置 2021-01-10 18:38:52 +08:00
huangyao 2a3251ffe2 获取字典类型详情 2021-01-10 18:28:20 +08:00
liuhanqing c869c7fcff 【notice】增加notice引用message包 2021-01-10 18:00:31 +08:00
fengshuonan 50c0557585 config增加唯一索引，config表增加一些配置 2021-01-10 14:05:01 +08:00
fengshuonan 1975701d70 格式化sql 2021-01-10 13:53:36 +08:00
fengshuonan c5e7b318ce Merge remote-tracking branch 'origin/group5-msg' 2021-01-10 13:48:55 +08:00
fengshuonan e6a5e4e9a7 【db】整理druid连接池监控的配置 
【config】找不到配置，修改提示改为warn级别
 2021-01-10 13:43:42 +08:00
liuhanqing 81bfd84c25 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-10 12:01:26 +08:00
liuhanqing 95d3765359 【message】通知管理数据库脚本文件 2021-01-10 11:58:36 +08:00
fengshuonan e73b2a4b70 整理代码 2021-01-10 10:03:18 +08:00
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