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

202 Commits (0770d68a51e43dbef4c2f9f02926db206d322a62)

Author SHA1 Message Date
chenjinlong d3e6943810 【sms】增加图形验证码验证和短信发送 2021-01-15 18:57:43 +08:00
chenjinlong cd2f4a1fc0 【sms】验证码发送业务挪至S模块下 2021-01-15 17:28:11 +08:00
chenjinlong 9a7cab9605 【SysUser】新增用户注册 2021-01-15 16:08:56 +08:00
chenjinlong ed5389e923 Merge remote-tracking branch 'origin/master' 2021-01-15 13:49:53 +08:00
chenjinlong ea0bc554ca 【validator-sdk-captcha】图形验证码模块【CaptchaController】图形验证码接口 2021-01-15 13:49:44 +08:00
fengshuonan f69f07228d 【system】没有绑定角色，获取用户角色接口返回空 2021-01-15 10:21:35 +08:00
fengshuonan 504aa0d1ed 【api】优化生成api接口的两个接口 2021-01-14 23:24:38 +08:00
fengshuonan 26c72f61fd 【sql】增加字典记录 2021-01-14 15:32:22 +08:00
fengshuonan 8b8661dd10 【sql】更新登录日志和菜单path 2021-01-13 20:42:31 +08:00
fengshuonan 3a2d344734 Merge remote-tracking branch 'origin/group2-loginlog' 
# Conflicts:
#	kernel-s-system/system-business-notice/pom.xml
 2021-01-13 20:03:50 +08:00
chenjinlong e81d3adfb3 【loginlog】新增登录日志模块 2021-01-13 19:49:44 +08:00
chenjinlong 1488f82b0a 【SysNoticeServiceImpl】删除多余引用并修改注入方式 2021-01-13 19:48:55 +08:00
fengshuonan 3d0ecbd9c3 【menu】修复删除错误 2021-01-13 13:29:19 +08:00
fengshuonan e27898adc0 【dict】整理dict模块 
【tree】整理tree节点放到rule模块
 2021-01-13 11:38:43 +08:00
fengshuonan 5a5b588f8d Merge remote-tracking branch 'origin/group5-notice' 2021-01-13 11:01:54 +08:00
fengshuonan bdd2553013 【menu】更新新增菜单 2021-01-12 21:56:29 +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 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
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
fengshuonan 37438358fa 更新注释 2021-01-11 20:33:59 +08:00
rays 99565c0257 新增树获取接口 2021-01-11 19:35:46 +08:00
fengshuonan 04752b8641 【sql】更新layui菜单的路径 2021-01-10 20:00:16 +08:00
chenjinlong 700d0bdb30 【sysUser】默认密码方法 权限相关配置挪至系统基础设置配置 2021-01-10 18:38:52 +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
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 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
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
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 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
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
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
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
fengshuonan 2e163bca6e 【menu】更新获取layui菜单管理的列表接口 2021-01-06 20:28:06 +08:00
fengshuonan 230ef9aaf7 【menu】更新获取layui菜单管理的列表接口，更新删除菜单接口 2021-01-06 18:15:48 +08:00
fengshuonan b5e00c27ee 【sql】更新菜单url和一个注释 2021-01-06 18:01:57 +08:00
fengshuonan 9ffcfbbf9a 【app】更新应用管理代码 2021-01-06 16:15:43 +08:00
fengshuonan ab766068d7 【role】更新角色表 2021-01-05 20:08:20 +08:00
fengshuonan cc47e1a0b8 【menu】更新菜单的sql 2021-01-05 16:45:55 +08:00
fengshuonan dc995e19cd 【menu】更新菜单的字段，layui和antd的区分 2021-01-05 16:42:52 +08:00
fengshuonan 0e5ff02cb2 【sql】资源表加一个viewFlag用来标识是否是视图控制器 2021-01-05 15:14:33 +08:00
fengshuonan 007194fb1e 【resource】资源模块加上viewFlag标识，用来区分控制器返回视图还是json，视图控制器默认以/view判定 2021-01-05 15:08:06 +08:00
liuhanqing 6a9c28487f 【message】系统消息模块开发 2021-01-04 23:24:39 +08:00
fengshuonan cb4a3126fb 【org】更新职务改为updateById的方式 2021-01-04 22:12:58 +08:00
fengshuonan 3982a9af98 【system】更新sql增加了一个config 2021-01-02 22:42:40 +08:00
fengshuonan 4b702db3e4 【rule】更新ant正则url校验和layui菜单拼接，增加context-path 2021-01-02 22:14:40 +08:00
fengshuonan 1a303301fd 【system】整理修改密码的业务，所有出现Bcrypt的地方用PasswordStoredEncryptApi接口替代 2021-01-02 11:27:02 +08:00
fengshuonan 48200d5fe6 【system】整理sql 2021-01-01 22:43:10 +08:00
fengshuonan f7714644f0 【system】整理更新用户信息接口 2021-01-01 22:40:04 +08:00
fengshuonan 07c579699d 【system】整理校验组，去掉group1-5 2021-01-01 22:18:18 +08:00
fengshuonan 2e19f3f42c 【system】更新获取当前用户信息的接口 2021-01-01 22:17:29 +08:00
fengshuonan b33e72d017 【system】layui版本首页顶部英文名称改为中文名称 2021-01-01 18:20:17 +08:00
fengshuonan 08565c886e 【system】更新文件表的sql 2021-01-01 16:15:42 +08:00
fengshuonan af935b4639 【file】整理文件预览的方法 2021-01-01 11:10:41 +08:00
fengshuonan 46e9de3ca0 Merge remote-tracking branch 'origin/group2' 2021-01-01 09:13:28 +08:00
fengshuonan bc61bd1f9d 【menu】增加一个路由字段 2020-12-31 14:40:03 +08:00
chenjinlong e2eb6fa56f 【HrPosition】【HrOrganization】增加删除字段默认值填充 2020-12-30 23:05:27 +08:00