2215 Commits

Author SHA1 Message Date
zendwang
209654fdff fix selectPostListByUserId方法出参调整为Long 2021-12-02 20:13:47 +08:00
zendwang
f30aa02e7c fix 系统用户自定义导入时初始密码加密优化 2021-12-02 19:48:56 +08:00
疯狂的狮子li
dd4374229b fix 修复更改密码问题 由于移除redis上存储的密码 导致找不到缓存内的旧密码 2021-12-02 19:11:36 +08:00
疯狂的狮子li
7eedf37149 update 优化 pr !118 代码结构 2021-12-02 18:47:18 +08:00
疯狂的狮子Li
7aea32f48b !118 为Transactional注解设置rollback属性
Merge pull request !118 from zendwang/dev
2021-12-02 10:44:24 +00:00
zendwang
ac38f7b909 fix 为Transactional注解设置rollback属性 2021-12-02 18:34:49 +08:00
RuoYi
2c3f1c28e5 tomcat update 2021-12-02 16:31:51 +08:00
疯狂的狮子li
e8ee5ad691 update 用户登录 支持校验错误次数锁定登录 2021-12-02 16:04:45 +08:00
疯狂的狮子li
5322f5f707 update 常量类 接口化 2021-12-02 14:18:20 +08:00
疯狂的狮子li
408f5055a9 update 通用权限服务 迁移回 ruoyi-framework 模块 2021-12-02 14:02:00 +08:00
RuoYi
6bfae2652f 若依 3.8.0 2021-12-01 08:53:11 +08:00
疯狂的狮子li
9036370d67 remove 删除 jjwt 无用依赖 2021-11-30 17:34:31 +08:00
RuoYi
9bc730866f 🎉 RuoYi-Vue3(Vue3 Element Plus Vite)版本 2021-11-30 11:15:33 +08:00
RuoYi
a2d3f987c0 优化代码 2021-11-30 11:15:17 +08:00
疯狂的狮子li
5a271b8fde update 更改前端工程文件版本号 2021-11-30 11:11:32 +08:00
疯狂的狮子li
f43a5cb244 update 更改前端工程文件版本号 2021-11-30 11:11:03 +08:00
若依
bf4ac3ad7a !378 fix: crontab组件bug
Merge pull request !378 from fuzui/fix_cron_tool
2021-11-30 03:03:08 +00:00
疯狂的狮子li
4f0e73ba97 update 使用 hutool-jwt 替换老旧 jjwt 依赖 2021-11-30 10:33:35 +08:00
fuzui
f28a91969a fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明 2021-11-30 02:08:08 +08:00
fuzui
ca285f5e53 fix: crontab组件周显示及计算bug 2021-11-30 00:22:23 +08:00
fuzui
34f2552cad fix: crontab组件互斥bug 2021-11-30 00:17:12 +08:00
疯狂的狮子li
c8720b1524 update 调整 OSS 表字段内容长度
(cherry picked from commit c6fe27b0404301194f15894ff94ac512a13fb309)
2021-11-29 17:08:06 +08:00
疯狂的狮子li
4238266ea3 fix 修复 count 语法异常
(cherry picked from commit 3e2ddb3b25a99ba8a06096d88a78bbe97256d879)
2021-11-29 17:08:06 +08:00
疯狂的狮子li
230d19a7aa update 调整 OSS 表字段内容长度 2021-11-29 16:46:27 +08:00
疯狂的狮子li
d2b7843d97 fix 修复 count 语法异常 2021-11-29 16:41:20 +08:00
疯狂的狮子li
9351d47948 fix 修复 合并错误 2021-11-29 14:10:53 +08:00
疯狂的狮子li
bf98ee3c93 Merge remote-tracking branch 'origin/dev' into satoken 2021-11-29 14:03:25 +08:00
疯狂的狮子li
dbba894544 发布 v3.4.0 2021-11-29 14:01:28 +08:00
疯狂的狮子li
52673152cc 发布 v3.4.0 2021-11-29 13:58:42 +08:00
疯狂的狮子li
42295ef2ac Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
2021-11-29 13:56:25 +08:00
疯狂的狮子li
a8a4f2101d add 增加 mapper 目录下 package-info 防止建错目录 2021-11-29 09:59:53 +08:00
疯狂的狮子Li
f46bd8b6ba update 更新 Validation 框架国际化说明 2021-11-28 21:47:08 +08:00
疯狂的狮子Li
d4e1d4ec38 !117 fix: 修复Object剩余存活时间BUG
Merge pull request !117 from dawn9117/N/A
2021-11-28 13:22:26 +00:00
dawn9117
f517dc05ef fix: 修复Object剩余存活时间BUG 2021-11-28 13:16:35 +00:00
疯狂的狮子Li
a627de02c7 Merge remote-tracking branch 'origin/dev' into dev 2021-11-28 21:04:13 +08:00
疯狂的狮子Li
a94a0589dd update [重磅更新] Validator 校验框架支持国际化 2021-11-28 21:03:48 +08:00
疯狂的狮子li
81755a280d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/utils/index.js
	ruoyi-ui/src/views/register.vue
2021-11-28 15:10:05 +08:00
疯狂的狮子Li
89d776acb5 fix 修复 OSS 工厂 未实例化服务更新加载问题 2021-11-27 16:36:11 +08:00
疯狂的狮子Li
daf660e66d update 更改 excel 方法注释 更清晰明显用法 2021-11-27 13:20:50 +08:00
疯狂的狮子Li
e4020faff3 update 使用导入新写法 重构系统用户导入 2021-11-27 12:57:21 +08:00
疯狂的狮子Li
e11b727584 update 修改移除无用回执信息 2021-11-27 12:43:34 +08:00
疯狂的狮子Li
0a36a94b73 update 报错增加 excel 表头信息 2021-11-27 11:18:41 +08:00
RuoYi
89e7cb19b9 注册成功提示类型success 2021-11-26 18:11:57 +08:00
疯狂的狮子li
fa2bdcd5ac update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:11:41 +08:00
若依
ea71c9b214 !376 camelCase中应该转换下划线,而不是横杠
Merge pull request !376 from khejing/master
2021-11-26 10:07:58 +00:00
疯狂的狮子li
c00e397405 update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:06:44 +08:00
疯狂的狮子li
a2a2640d29 update 调整校验异常 返回完整信息 2021-11-26 18:05:47 +08:00
疯狂的狮子Li
7c4a104823 !113 add 新增 excel 导入支持开启 Validator 数据验证
Merge pull request !113 from Yjoioooo/auto-5403234-dev-1637903026810
2021-11-26 08:40:42 +00:00
疯狂的狮子li
7892ec5a59 fix 修复重复提交不生效问题 由于概念不同 使用 RedisUtils 重构 2021-11-26 16:32:56 +08:00
khejing
e5fd1f76db camelCase中应该是下划线,而不是横杠 2021-11-26 08:26:45 +00:00