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

254 Commits (ebcf892adf0cda2b8a6c881d0fa028dd13540336)

Author SHA1 Message Date
liuhanqing 58903b66f0 合并冲突 2021-02-03 21:00:33 +08:00
chenjinlong 0770d68a51 【HrPosition】【SysMenuButton】dto位置调整 2021-02-03 20:55:48 +08:00
chenjinlong 905c641248 调整POJO结构并删除多余实体 2021-02-03 17:27:44 +08:00
chenjinlong cbb2a969c4 【SysUserResponse】删除多余的SysUserResponse 2021-02-03 17:20:32 +08:00
chenjinlong da18b5eec6 【SysUserDataScope】业务优化 2021-02-03 16:47:49 +08:00
chenjinlong 7871ab637f 【UserDataScopeRequest】新增dto 2021-02-03 16:47:23 +08:00
chenjinlong a464924c2e 【UserRoleRequest】新增dto 2021-02-03 16:47:04 +08:00
chenjinlong 0d01225b27 【UserOrg】业务优化 2021-02-03 14:33:20 +08:00
liuhanqing 213785d89f 通知管理，代码结构优化 2021-02-02 22:20:56 +08:00
fengshuonan 831525b71f 【file】更新用户头像预览 2021-02-02 20:31:37 +08:00
chenjinlong 5b7f690ab3 【HrOrganization】组织架构业务优化 2021-02-02 14:18:50 +08:00
chenjinlong 058bbe638a 【HrPosition】职位业务优化 2021-02-02 14:18:23 +08:00
chenjinlong 040336006c Merge remote-tracking branch 'origin/master' 2021-02-01 20:06:18 +08:00
chenjinlong 11723cf6c1 【Log】日志模块代码优化 2021-02-01 20:06:12 +08:00
fengshuonan 6aa8fbc291 【app】更新应用管理 2021-02-01 18:52:32 +08:00
fengshuonan acecbfffb4 【menu】整理菜单按钮的代码 2021-02-01 18:49:44 +08:00
fengshuonan 4f01a1570f 【menu】整理菜单的代码 2021-02-01 18:48:49 +08:00
fengshuonan 5a5145100f 【resource】整理资源代码 2021-02-01 18:19:39 +08:00
fengshuonan 498e99717e 【role】整理角色代码，todo没用的接口删除 2021-02-01 18:16:04 +08:00
fengshuonan 8d01a663cd 【org】增加xm-select组件的下拉实体 2021-01-31 19:17:34 +08:00
fengshuonan f22877c67a 【i18n】更新菜单的多语言翻译 2021-01-28 23:54:27 +08:00
fengshuonan 3103083eac Merge remote-tracking branch 'origin/dev-websocket' 2021-01-27 21:18:26 +08:00
chenjinlong d29a5e005f 【MenuButton】新增一键添加系统菜单默认按钮 2021-01-27 16:53:20 +08:00
chenjinlong 3d817dcc3e 【del_flag】字段insert 默认值 2021-01-27 16:52:14 +08:00
chenjinlong 21fb538b85 【SysRoleResponse】 新增角色分类 2021-01-26 23:54:55 +08:00
liuhanqing d36b61f3be 【message】 websocket发送消息 2021-01-26 19:23:54 +08:00
chenjinlong 415ecef05e 【SysUserOrgServiceServiceImpl】修复部门跟机构是否正在被使用的BUG 2021-01-25 11:12:32 +08:00
chenjinlong bcd0d7a090 【HrOrganizationServiceImpl】优化查询 2021-01-22 18:10:45 +08:00
chenjinlong a6cba98d7e 【SysUser】修改登录错误账号提示 2021-01-20 19:22:43 +08:00
chenjinlong f32847a931 【sms】短信验证码更新 2021-01-19 16:35:51 +08:00
fengshuonan 59f2191151 Merge remote-tracking branch 'origin/group5-dictTag' 2021-01-18 21:24:29 +08:00
fengshuonan 539176b691 【system】删除模块 2021-01-18 10:13:24 +08:00
liuhanqing 52bd2049ec Merge branch 'master' into group5-dictTag 2021-01-17 16:53:08 +08:00
liuhanqing 157b1b0d61 【sql】更新脚本 sysconfig 配置 2021-01-17 15:20:58 +08:00
fengshuonan a4bdef358e 【dict】整理字典序列化的逻辑 2021-01-17 14:42:07 +08:00
fengshuonan 04afa15e2a Merge remote-tracking branch 'origin/group5-dictTag' 2021-01-17 12:28:14 +08:00
chenjinlong 2c61248e71 【sms-business-validation】 模块位置移动 2021-01-17 00:35:27 +08:00
liuhanqing 64c608e35e 【dict】更新脚本，增加字典值 2021-01-16 23:41:55 +08:00
liuhanqing f9e85456e3 【dict】增加字典编码翻译通过jackson注解序列化 2021-01-16 23:38:50 +08:00
fengshuonan 813f998537 sql更新 2021-01-16 21:12:04 +08:00
liuhanqing de4d538f31 【user】 用户选择树接口开发 2021-01-16 19:34:11 +08:00
hansson 1619e5d2d7 【notice】修改拼写错误 2021-01-16 19:34:05 +08:00
fengshuonan 4debb92dc5 【validator】更新提示的逗号为中文 2021-01-16 18:57:39 +08:00
fengshuonan a45eaa2425 【validator】更新校验的提示 2021-01-16 18:19:53 +08:00
fengshuonan 61e8e5d104 【api】更新字段名称 2021-01-16 18:14:53 +08:00
fengshuonan e8bd583068 【api】完善api详情接口，增加对注解的校验提示 2021-01-16 18:13:16 +08:00
fengshuonan fead9657d1 【sms】修复一个包名错误 2021-01-16 15:41:58 +08:00
fengshuonan 0d78b68089 【scanner】更新资源扫描 2021-01-16 15:39:23 +08:00
fengshuonan 227e647c5d 更新sql增加阿里云短信配置 2021-01-16 10:50:09 +08:00
fengshuonan af68c371f6 【captcha】更新校验的判断 2021-01-16 10:41:47 +08:00
fengshuonan 26b77b3e34 【captcha】更新sql和默认装配值 2021-01-16 10:37:52 +08:00
fengshuonan d413d70bb3 【captcha】整理代码 2021-01-16 10:27:23 +08:00
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