YunaiV
|
0fedc8fece
|
合并 master 分支的代码
|
2021-03-14 19:21:14 +08:00 |
|
YunaiV
|
2e58e8585e
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127
Conflicts:
pom.xml
src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java
src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java
src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java
src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
|
2021-03-14 18:42:52 +08:00 |
|
YunaiV
|
11b8afc4c7
|
补下 sql 脚本
|
2021-03-14 18:04:35 +08:00 |
|
YunaiV
|
ef6dd91f2d
|
智障的我,补下 sql 脚本
|
2021-03-14 13:13:56 +08:00 |
|
YunaiV
|
2fcb54b576
|
增加数据库文档的 html、word、markdown 的导出
|
2021-03-14 00:58:39 +08:00 |
|
芋道源码
|
84ca9222c8
|
!19 infra logger junit
Merge pull request !19 from kevinwang0224/ut_infra_logger
|
2021-03-14 00:05:46 +08:00 |
|
YunaiV
|
570f9f0a69
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2021-03-14 00:02:46 +08:00 |
|
YunaiV
|
6e7f8f570d
|
增加全局 lombok 配置
|
2021-03-14 00:02:23 +08:00 |
|
wangkai
|
914626b850
|
Merge branch 'master' into ut_infra_logger
|
2021-03-13 23:21:17 +08:00 |
|
wangkai
|
32620fb3a7
|
infra logger 单元测试 (issues I3A9GW)
|
2021-03-13 23:20:29 +08:00 |
|
芋道源码
|
6cf1e920d7
|
!15 增加 个人信息设置 功能
Merge pull request !15 from niu_dehua/feat_userprofile
|
2021-03-13 23:17:40 +08:00 |
|
niudehua
|
aac051a615
|
Merge remote-tracking branch 'origin/feat_userprofile' into feat_userprofile
# Conflicts:
# src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java
# src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java
# src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
|
2021-03-13 23:10:14 +08:00 |
|
niudehua
|
61c24c0aa7
|
设置 事务 rollback 属性
增加 个人信息设置 功能
增加 个人信息设置 功能
|
2021-03-13 23:06:47 +08:00 |
|
芋道源码
|
4048e59805
|
!14 完成导出数据库文档
Merge pull request !14 from timfruit/feature/screw-export-dbdoc
|
2021-03-13 23:05:41 +08:00 |
|
timfruit
|
562f4cb953
|
根据艿艿的提示修改
|
2021-03-13 22:40:16 +08:00 |
|
niudehua
|
74669817d8
|
增加 个人信息设置 功能
|
2021-03-13 22:25:06 +08:00 |
|
niudehua
|
8297d94b51
|
增加 个人信息设置 功能
|
2021-03-13 22:24:02 +08:00 |
|
niudehua
|
2dd87e0414
|
设置 事务 rollback 属性
|
2021-03-13 22:16:40 +08:00 |
|
niudehua
|
cd854d0ee1
|
增加 个人信息设置 功能
|
2021-03-13 21:07:04 +08:00 |
|
niudehua
|
e4bda22b73
|
Merge branch 'master' into feat_userprofile
# Conflicts:
# src/main/resources/application-dev.yaml
# src/main/resources/application-local.yaml
|
2021-03-13 21:02:01 +08:00 |
|
YunaiV
|
4dc484f51d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2021-03-13 19:43:47 +08:00 |
|
芋道源码
|
82b73994cb
|
!18 解决页面操作按钮繁多时的用户体验问题
Merge pull request !18 from 幕羽/feature/muyu
|
2021-03-13 19:41:23 +08:00 |
|
YunaiV
|
8af60fdaa6
|
1. 验证码的单元测试
2. 修复 h2 脚本的问题
|
2021-03-13 19:34:26 +08:00 |
|
NiuXing
|
9c71274994
|
I3B7FG任务提交;解决页面操作按钮繁多时用户体验问题
|
2021-03-13 19:13:01 +08:00 |
|
YunaiV
|
cee1aa3e60
|
增加文件服务的展示
|
2021-03-13 13:37:59 +08:00 |
|
YunaiV
|
daa38661d2
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Conflicts:
pom.xml
|
2021-03-13 13:28:23 +08:00 |
|
timfruit
|
7089ef7651
|
根据艿艿的说明修改
|
2021-03-13 13:21:33 +08:00 |
|
Hccake
|
7861c3ec3f
|
🐛 修复 Lombok 建造模式,导致构造函数非 public, mapstruct 无法构造实例的问题
|
2021-03-13 12:38:52 +08:00 |
|
hccake
|
1d7bacb6c0
|
⚡ 添加 lombok-mapstruct-bind,避免高版本的不兼容问题
|
2021-03-13 12:33:23 +08:00 |
|
niudehua
|
3ca43b7d5e
|
Merge branch 'master' into feat_userprofile
|
2021-03-12 19:09:13 +08:00 |
|
hccake
|
efde1280e3
|
⚡ 添加 lombok-mapstruct-bind,避免高版本的不兼容问题
|
2021-03-12 14:02:12 +08:00 |
|
zengzefeng
|
225664550f
|
实现短信通过redis stream异步发送,实现短信callback处理
|
2021-03-12 11:32:04 +08:00 |
|
niudehua
|
0181baa72b
|
增加 个人信息设置 功能
|
2021-03-12 00:31:23 +08:00 |
|
timfruit
|
9891763015
|
完成导出数据库文档
|
2021-03-12 00:01:37 +08:00 |
|
芋道源码
|
4e5430b5c0
|
!3 system logger junit
Merge pull request !3 from kevinwang0224/unit_logger_system
|
2021-03-10 23:10:24 +08:00 |
|
wangkai
|
c197417d92
|
修改 system logger junit review 后提出的问题
|
2021-03-10 22:38:03 +08:00 |
|
wangkai
|
75d21928a4
|
Merge branch 'master' into unit_logger_system
# Conflicts:
# src/test/resources/sql/clean.sql
# src/test/resources/sql/create_tables.sql
|
2021-03-10 18:29:03 +08:00 |
|
YunaiV
|
28d9ecee3b
|
1. 处理 Job 日志导出的 excel 名字错误的问题
|
2021-03-10 01:32:11 +08:00 |
|
YunaiV
|
0e28ab169c
|
1. 优化 config 模板
|
2021-03-10 01:23:34 +08:00 |
|
芋道源码
|
00d22bf6d7
|
!12 通知公告模块单测
Merge pull request !12 from lianghusile/feature/notice_test
|
2021-03-10 00:49:11 +08:00 |
|
budliang
|
984113e6d9
|
Merge branch 'rouyi/master' into feature/notice_test
# Conflicts:
# src/test/resources/sql/create_tables.sql
|
2021-03-10 00:46:44 +08:00 |
|
budliang
|
ccba513f3b
|
更新通知公告模块单测
|
2021-03-10 00:43:15 +08:00 |
|
芋道源码
|
252a267879
|
!11 unit_system_dept service 单元测试
Merge pull request !11 from niu_dehua/unit_system_dept
|
2021-03-09 23:48:34 +08:00 |
|
niudehua
|
5a7e2f6327
|
unit_system_dept service 单元测试
|
2021-03-09 23:44:25 +08:00 |
|
budliang
|
72422ad284
|
Merge branch 'rouyi/master' into feature/notice_test
|
2021-03-09 23:39:06 +08:00 |
|
YunaiV
|
eb3ad70071
|
1. 上传最新 sql 脚本
2. 修改 readme
3. 优化 config 模块的排版
|
2021-03-09 20:45:00 +08:00 |
|
YunaiV
|
0b34694a64
|
1. 上传最新 sql 脚本
2. 修改 readme
3. 优化 config 模块的排版
|
2021-03-09 20:41:29 +08:00 |
|
芋道源码
|
570794a99c
|
!2 移除超时的在线用户-完成
Merge pull request !2 from LeeYan9/feature_user-session-timeout
|
2021-03-09 20:26:16 +08:00 |
|
Lyon
|
9bf4430553
|
Merge remote-tracking branch 'origin/master' into feature_user-session-timeout
|
2021-03-09 20:24:07 +08:00 |
|
Lyon
|
a9436d2931
|
移除超时的在线用户 优化一些代码风格,增加test校验
|
2021-03-09 20:23:36 +08:00 |
|