GTsoft/RuoYi-Vue-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,958 Commits 2 Branches 25 Tags 125 MiB
4d02466fed
Commit Graph

668 Commits

Author SHA1 Message Date
疯狂的狮子Li
03bda9422d update 修改 关于 BeanCopyUtils 工具的说明 避免问题 2022-01-25 20:17:45 +08:00
hewenqiang
cd510b43b1 fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。 2022-01-25 17:17:06 +08:00
疯狂的狮子li
76f1650109 fix vue3下点击编辑，取消修改报错问题 2022-01-21 18:34:41 +08:00
疯狂的狮子li
c636e6909b Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
 2022-01-21 18:29:44 +08:00
疯狂的狮子li
b87aeb9b95 update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换 2022-01-21 10:30:39 +08:00
疯狂的狮子li
911867d5a5 update 数据库更改 对接多用户体系 2022-01-17 17:09:27 +08:00
疯狂的狮子li
a43e6e06e0 update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存 2022-01-17 12:03:15 +08:00
phanes
868942e202 update 格式化代码结构 统一编码格式 2022-01-16 17:46:24 +08:00
mingliangyang
15f05b602f fix ruoyi-vue3下点击编辑，取消修改报错问题 2022-01-14 16:26:03 +08:00
RuoYi
3980b2f2ff 定时任务屏蔽违规的字符 2022-01-14 11:47:14 +08:00
疯狂的狮子li
6ca8535166 Merge remote-tracking branch 'origin/satoken' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.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/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
#	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2022-01-13 11:14:33 +08:00
疯狂的狮子li
8f6484e470 [重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖 2022-01-12 21:22:26 +08:00
疯狂的狮子li
26fc652d33 update 统一代码间隔符 2022-01-11 16:58:47 +08:00
疯狂的狮子li
6f222ab02b fix 修复 通配符匹配无效 2022-01-11 09:30:38 +08:00
疯狂的狮子li
d9a0de20f8 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
#	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
#	ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
 2022-01-07 15:41:18 +08:00
RuoYi
eb11337f7d 添加遗漏的分页参数合理化属性 2022-01-07 13:09:58 +08:00
RuoYi
1a5b024df6 定时任务目标字符串验证包名白名单 2022-01-06 14:50:56 +08:00
RuoYi
578d65dfb4 定时任务目标字符串过滤特殊字符 2022-01-05 14:56:05 +08:00
疯狂的狮子li
c526ab1870 add 增加 RedisUtils 工具 hasKey 检查key存在方法 2022-01-04 09:48:20 +08:00
RuoYi
6353f4ff09 若依 3.8.1 2021-12-31 00:00:06 +08:00
疯狂的狮子li
293db76bd6 remove 移除过期代码 分页工具相关 2021-12-28 14:33:26 +08:00
疯狂的狮子li
5b257b2b57 remove 移除过期代码 多数据源切换 2021-12-28 14:33:08 +08:00
疯狂的狮子li
4e04f5e967 remove 移除过期代码 数据权限 2021-12-28 14:32:53 +08:00
疯狂的狮子li
45e6accd2a add 增加邮箱与银行卡脱敏策略 并应用到 SysUser 2021-12-28 12:03:00 +08:00
疯狂的狮子li
51b19fcff4 update 优化 数据脱敏pr 使用接口提高扩展性 2021-12-28 11:51:01 +08:00
疯狂的狮子li
c4cfaab621 Merge remote-tracking branch 'origin/dev' into dev 2021-12-28 11:24:58 +08:00
疯狂的狮子Li
8bf27bf76b !127 add 新增数据脱敏注解，可根据菜单权限字符控制是否脱敏 
Merge pull request !127 from Yjoioooo/auto-5403234-dev-1640272112776
 2021-12-28 03:24:34 +00:00
疯狂的狮子li
ccb132374b update 更新 手动获取 延迟队列方法 2021-12-28 11:23:33 +08:00
疯狂的狮子li
c82afc8c46 update RedisUtils 迁移到 utils/redis 包下 2021-12-28 11:23:33 +08:00
疯狂的狮子li
08e0ed4fc6 [重磅更新] 增加 轻量级 分布式队列 支持 2021-12-28 11:23:32 +08:00
疯狂的狮子li
261d9f8ebc update 合并 dev 处理差异 2021-12-28 10:38:25 +08:00
疯狂的狮子li
948ad86049 Merge remote-tracking branch 'origin/dev' into satoken 2021-12-28 10:37:43 +08:00
疯狂的狮子li
ed659da488 发布 v3.5.0-release 正式版 2021-12-28 10:35:52 +08:00
疯狂的狮子li
dd37247e65 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	pom.xml
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.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-common/pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
 2021-12-27 09:50:42 +08:00
疯狂的狮子li
5ca038d888 update 调整监控依赖 从 common 迁移到 framework 2021-12-24 11:36:02 +08:00
Yjoioooo
caf93da26a add 新增数据脱敏注解，可根据菜单权限字符控制是否脱敏 2021-12-23 23:07:54 +08:00
疯狂的狮子li
b6442b4640 Merge remote-tracking branch 'ruoyi-vue/master' into dev 
# Conflicts:
#	pom.xml
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
 2021-12-22 10:10:29 +08:00
RuoYi
fd3a699ad8 SQL工具类新增检查关键字方法 2021-12-21 13:32:28 +08:00
RuoYi
7492dcc9e6 请求分页方法设置成通用方便灵活调用 2021-12-18 12:22:41 +08:00
疯狂的狮子Li
5d2b162bea add 增加 DataPermissionHelper 类 便于操作数据权限变量 2021-12-17 21:52:11 +08:00
疯狂的狮子Li
3fce90dbb9 update 优化数据权限缓存合并为一个 标注版本注释 2021-12-17 21:50:14 +08:00
疯狂的狮子li
e6b45d4cdb update 数据权限注解支持类标注 2021-12-16 10:54:44 +08:00
疯狂的狮子li
c2e28b5d94 update 修改 基础方法返回空判断 优化返回值 2021-12-16 10:54:26 +08:00
疯狂的狮子Li
44bc7dd9a5 update 修改已过期方法 调整编译警告 2021-12-16 00:11:38 +08:00
疯狂的狮子li
2455d0b859 add 增加 自定义 Xss 校验注解 用户导入增加 Bean 校验 2021-12-15 15:03:44 +08:00
疯狂的狮子li
b3c3afc2b4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
 2021-12-15 14:12:36 +08:00
疯狂的狮子li
3f97d19381 update [重磅更新] 重构分页 简化使用 2021-12-15 13:29:54 +08:00
疯狂的狮子li
bd89cc0287 update ServicePlusImpl 功能 下沉到 BaseMapperPlus 2021-12-15 12:17:04 +08:00
RuoYi
d365a52cd6 自定义xss校验注解实现 2021-12-15 10:50:10 +08:00
疯狂的狮子li
5e38e054a7 update hutool 工具 改为单包引入 减少无用依赖 2021-12-15 10:44:50 +08:00
疯狂的狮子li
c5dbd04c9c fix 修复数据权限 仅自己 相关问题 2021-12-14 10:11:16 +08:00
疯狂的狮子Li
aae3fe5305 update [重大更新] 重写数据权限实现 2021-12-13 03:49:05 +00:00
疯狂的狮子li
a9488ba3c9 update 多数据源切换标注过期 3.6.0 移除 推荐使用原生注解 2021-12-09 11:50:25 +08:00
疯狂的狮子li
a62d65a9b8 fix 修复 TreeBuildUtils 顶节点不为 0 问题 2021-12-09 11:48:55 +08:00
疯狂的狮子li
37def02ee1 fix 修复sql关键字处理 防止解析器报错 2021-12-07 15:16:37 +08:00
疯狂的狮子li
bcbc7c1d47 update 更新 RedisUtils 增加 注册监听器方法 2021-12-06 20:22:45 +08:00
疯狂的狮子li
1445d6d24a update 更新 RedisUtils 返回客户端实例 2021-12-06 19:52:27 +08:00
疯狂的狮子li
8f8e796c77 update tlog 1.3.4 => 1.3.5 启用 tlog 自动配置 2021-12-06 14:36:38 +08:00
疯狂的狮子li
a39a98cda9 update 移除 包错误引用 2021-12-06 14:35:55 +08:00
疯狂的狮子li
90ba39593a update 声明 cglib 依赖 控制版本 2021-12-06 12:12:20 +08:00
疯狂的狮子li
c3061a19a2 remove 移除过期工具 2021-12-06 11:01:07 +08:00
疯狂的狮子li
e11a6163dd update 禁止所有工具类实例化 优化代码书写规范 2021-12-06 10:59:54 +08:00
疯狂的狮子li
1b752c35cc update 使用 Cglib 重构 BeanCopyUtils 性能优异 2021-12-06 10:40:57 +08:00
疯狂的狮子li
8b9d3541dd update LoginUser 增加角色缓存 优化角色权限代码 2021-12-03 19:25:38 +08:00
疯狂的狮子li
dff7d70f0a update 更改角色刷新缓存 2021-12-03 19:13:15 +08:00
疯狂的狮子li
e763381186 update [重磅更新] 登录流程升级 支持缓存 2021-12-03 18:46:49 +08:00
疯狂的狮子li
b5db6fe186 update 重构分页工具 使用分页实体类 过期方法标注过期 3.6.0 移除 2021-12-03 15:57:11 +08:00
疯狂的狮子li
8d2886e1ca add 增加 分页查询实体类 2021-12-03 15:56:19 +08:00
疯狂的狮子li
e8ee5ad691 update 用户登录 支持校验错误次数锁定登录 2021-12-02 16:04:45 +08:00
疯狂的狮子li
5322f5f707 update 常量类 接口化 2021-12-02 14:18:20 +08:00
RuoYi
6bfae2652f 若依 3.8.0 2021-12-01 08:53:11 +08:00
疯狂的狮子li
4f0e73ba97 update 使用 hutool-jwt 替换老旧 jjwt 依赖 2021-11-30 10:33:35 +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
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
daf660e66d update 更改 excel 方法注释 更清晰明显用法 2021-11-27 13:20:50 +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
疯狂的狮子li
fa2bdcd5ac update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:11:41 +08:00
疯狂的狮子li
c00e397405 update 抽象 Excel 导入支持自定义监听器 2021-11-26 18:06:44 +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
9de0e9157a fix 接口重复鉴权BUG修复 2021-11-26 15:07:35 +08:00
疯狂的狮子li
e2d370bd9d update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异 2021-11-26 13:42:20 +08:00
疯狂的狮子li
2fe8291f1d update 修改 LOGIN_TOKEN_KEY 内容 对应 satoken 的 key 2021-11-26 13:40:52 +08:00
疯狂的狮子li
1010ccca4d update 更新 RedisUtils set保留ttl 兼容 5.X redis版本 2021-11-26 13:34:18 +08:00
zhujie
c3bb4d2a61 add 新增导入支持开启Validator数据验证，支持开启导入异常行继续读取，支持返回导入回执 2021-11-26 13:01:00 +08:00
疯狂的狮子li
2a3bf1d994 remove 删除无用 redis 依赖配置 2021-11-25 19:14:30 +08:00
疯狂的狮子li
d0c4b5bc76 add 增加 RedisUtils set 保留 TTL 有效期方法 2021-11-23 10:20:44 +08:00
疯狂的狮子Li
2cdea69719 add 增加 缓存懒加载 开关 2021-11-22 02:46:13 +08:00
疯狂的狮子Li
20eea9914e update 基于 DictService 重构 Excel 内字典查询功能 2021-11-22 02:44:46 +08:00
疯狂的狮子Li
6d3f4f5a04 update 抽象 DictService 通用 字典服务 2021-11-22 02:43:22 +08:00
疯狂的狮子Li
20e782eb21 update 抽象 ConfigService 通用 参数配置服务 2021-11-22 02:42:59 +08:00
疯狂的狮子Li
e30fa57ab4 update DictUtils 字典工具类 标记过期 3.5.0 版本移除 使用 DictService 代替 2021-11-22 02:42:14 +08:00
疯狂的狮子Li
019526fbe9 update 解耦 LoginUser 与 SysUser 强关联 2021-11-21 01:39:43 +08:00
疯狂的狮子Li
a4cd5bd424 update 统一接口命名 2021-11-21 01:33:31 +08:00
RuoYi
cedd2d1daf 优化导出数据操作 2021-11-17 11:57:17 +08:00
疯狂的狮子li
b374ff4d6d update 优化字典工具写法 2021-11-15 16:54:34 +08:00
疯狂的狮子li
223ff4ebff fix 分页工具 排序字段 null 处理 2021-11-11 12:47:26 +08:00
XTvLi
b00171366f 统一全局配置内容, 删除临时调用配置文件 2021-11-10 18:17:43 +08:00
疯狂的狮子li
7079a4e7e4 update satoken 1.27.0 => 1.28.0 使用 jwt 插件代理 token 生成逻辑 2021-11-10 13:31:54 +08:00
RuoYi
d185d4e4cc 增加sendGet无参请求方法 2021-11-10 11:13:27 +08:00
疯狂的狮子li
019f585c83 update 补全通用日志服务 注释 2021-11-04 19:01:33 +08:00
疯狂的狮子li
19b7f0747a update 补全通用用户服务接口注释 2021-11-04 19:00:49 +08:00
疯狂的狮子li
2f21f293c1 update 基于 hutool 封装树构建工具 重构部门与菜单树结构返回 2021-11-04 10:32:18 +08:00
疯狂的狮子li
5b3c390e08 remove 移除 MybatisPlusRedisCache 二级缓存 2021-11-03 15:04:10 +08:00
疯狂的狮子li
8a93371baa remove 移除 feign 相关代码与依赖 2021-11-03 15:02:29 +08:00
疯狂的狮子li
95dcae1a85 remove 移除 quartz 相关代码与依赖 2021-11-03 14:46:12 +08:00
疯狂的狮子li
03e2ff587e 同步 ruoyi 2021-11-03 13:58:59 +08:00
疯狂的狮子li
1d32420a27 add 增加 ValidatorUtils 校验框架工具 用于在非 Controller 的地方校验对象 2021-11-03 13:50:51 +08:00
疯狂的狮子Li
53dd9a35a0 fix 修复通用实体 传参无法接收问题 2021-11-02 22:46:22 +08:00
疯狂的狮子Li
0b35927b16 fix 修复通用实体 传参无法接收问题 2021-11-02 22:43:53 +08:00
RuoYi
cc4c52c998 任务屏蔽违规字符 2021-11-01 15:03:06 +08:00
RuoYi
bd09e5b11c 修复字符串无法被反转义问题 2021-11-01 15:02:47 +08:00
疯狂的狮子li
24ebc73ee5 Merge remote-tracking branch 'origin/dev' into satoken 2021-10-29 09:15:31 +08:00
疯狂的狮子li
d6e080d546 发布 v3.3.0 2021-10-29 09:14:49 +08:00
疯狂的狮子li
f5f16aac96 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-common/pom.xml
 2021-10-28 10:56:21 +08:00
疯狂的狮子li
5c6f30a8a9 update RedisUtils 更新删除 hash 数据方法 2021-10-28 10:43:46 +08:00
疯狂的狮子li
160beb8e1c update jdk11 适配依赖 调整到 common 包 2021-10-28 09:44:57 +08:00
疯狂的狮子li
3f0d3ffb8a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
 2021-10-28 09:40:02 +08:00
Awen
13c770b6be 优化一些布尔判断语法 2021-10-27 19:03:29 +08:00
RuoYi
839f631d6b 添加Jaxb依赖，防止jdk8以上出现的兼容错误 2021-10-27 16:22:57 +08:00
若依
b87e0fa124 !358 update ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java. 
Merge pull request !358 from 雪丛/N/A
 2021-10-27 07:34:47 +00:00
疯狂的狮子li
695cb6d76b Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
#	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/SysOssConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.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/constant/GenConstants.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
#	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
 2021-10-27 13:16:19 +08:00
疯狂的狮子li
61375c4bbb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/pom.xml
 2021-10-26 18:57:55 +08:00
Ricky
b6596d021b 替换自定义验证注解 2021-10-26 17:22:20 +08:00
雪丛
790aa0d24b update ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java. 
增加删除Hash中的数据
 2021-10-26 01:42:12 +00:00
疯狂的狮子Li
42a3117e2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ry.bat
 2021-10-25 18:24:55 +08:00
RuoYi
8a7dcf8a80 修正错别字 2021-10-25 10:26:00 +08:00
若依
0c30ffa11f !354 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java. 
Merge pull request !354 from Remenber_Ray/N/A
 2021-10-25 01:55:51 +00:00
疯狂的狮子Li
4583787759 fix 跨域访问之后 下载无法获取 download-filename 2021-10-24 17:13:04 +08:00
Remenber_Ray
17550a5f4b update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java. 
修复描述错误
 2021-10-24 02:34:25 +00:00
RuoYi
3dbbc6a223 AjaxResult重写put方法，以方便链式调用 2021-10-22 16:23:08 +08:00
疯狂的狮子li
b8a8b76c38 fix 修复跨域访问无权限获取请求头 download-filename 导致文件名为空问题 2021-10-22 12:38:33 +08:00
abbfun
2d7d137abd update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java. 
AjaxResult链式调用
 2021-10-22 03:09:54 +00:00
疯狂的狮子li
336adbd056 update 统一格式化代码结构 2021-10-22 10:04:15 +08:00
疯狂的狮子li
b6443e0c01 update quartz改为保留一个版本 2021-10-20 13:53:36 +08:00
疯狂的狮子li
9e0ec2b03c update 修改测试代码 测试通用实体通过 删除树实体不通用属性 2021-10-15 16:21:00 +08:00
疯狂的狮子li
284f47e76c update 代码生成 改为生成抽象实体 2021-10-15 16:19:51 +08:00
疯狂的狮子li
37a8addf52 update feign 标记过期 2021-10-15 15:55:44 +08:00
疯狂的狮子li
a6fb88d74c update [重大更新]全业务 增加 接口文档注解 格式化代码 2021-10-15 15:19:42 +08:00
疯狂的狮子li
6684812014 update 标记过期 推荐迁移至新框架 xxl-job 2021-10-15 11:31:26 +08:00
疯狂的狮子li
1419700c43 update 标记过期 推荐使用 spring-cache 2021-10-15 11:31:00 +08:00
疯狂的狮子li
cbb0c98f98 add [重磅更新] 增加分布式日志框架 TLog 2021-10-11 17:59:27 +08:00
RuoYi
eb4376b649 Excel导入支持@Excels注解 2021-10-10 14:30:08 +08:00
RuoYi
c4207f640b 使用JSONField忽略字段 2021-10-10 11:21:46 +08:00
RuoYi
7ae47b50b8 导入模板添加默认参数 2021-10-09 12:22:55 +08:00
RuoYi
0b14155a75 增加 sendGet 无参判断 2021-10-09 12:22:54 +08:00
疯狂的狮子li
a09f1b8666 update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:26:31 +08:00
疯狂的狮子li
100f6603f2 update 优化 代码生成常量 关于 BO VO 注释 2021-09-28 18:24:11 +08:00
疯狂的狮子li
0a9d4ea17b update 适配单体系与多体系用户权限 2021-09-28 17:56:19 +08:00
疯狂的狮子li
f05138df62 update 适配单体系与多体系用户权限 2021-09-28 17:55:01 +08:00
疯狂的狮子li
76a2e7f8e5 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
 2021-09-28 09:46:56 +08:00
疯狂的狮子li
3f142dd0fa 发布 v3.2.0 2021-09-28 09:41:37 +08:00
疯狂的狮子Li
49fc74be5d fix 修复更新问题 导出文件名乱码 2021-09-27 21:30:07 +08:00
疯狂的狮子li
b082da73a1 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
 2021-09-27 17:27:32 +08:00
疯狂的狮子li
75b22e9a23 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.vue
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/post/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-09-27 16:50:26 +08:00
疯狂的狮子li
c4f8c1b296 update 更新线程池策略说明 2021-09-27 15:00:36 +08:00
RuoYi
ded99502ae 新增通用方法简化下载使用 2021-09-27 10:38:29 +08:00
疯狂的狮子li
6f6a3566ac Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	pom.xml
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
 2021-09-26 17:15:40 +08:00
RuoYi
30c89b33fe Excel注解支持导入导出标题信息 2021-09-26 09:03:01 +08:00
RuoYi
7479ff4b06 修复xss过滤后格式出现的异常 2021-09-25 17:12:37 +08:00
疯狂的狮子li
9801e9c29a remove 移除过期工具 2021-09-24 15:13:11 +08:00
疯狂的狮子li
6f870e11ff update 优化空校验处理 2021-09-24 11:17:25 +08:00
疯狂的狮子li
553c29ab8a update 整合 satoken 权限、鉴权一体化框架 2021-09-23 19:13:58 +08:00
疯狂的狮子li
852bc4887a remove 移除无用字段 2021-09-23 14:58:48 +08:00
疯狂的狮子li
bdebca94b3 remove 移除无用合并 2021-09-22 12:38:52 +08:00
疯狂的狮子li
f85bad3388 update 调整依赖结构 解决依赖冲突 2021-09-22 11:10:10 +08:00
疯狂的狮子li
e9b0289eff update 优化代码生成 根据MP生成特性 调整导入表结构默认值合理化 2021-09-22 11:09:42 +08:00
疯狂的狮子li
76bf987203 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
 2021-09-22 10:09:15 +08:00
RuoYi
3b42abef44 Excel注解支持自定义数据处理器 2021-09-22 09:03:01 +08:00
RuoYi
26f0737c60 防重提交注解支持配置间隔时间/提示消息 2021-09-20 19:09:25 +08:00
RuoYi
54bfa627f0 防止Excel导入图片可能出现的异常 2021-09-20 19:04:57 +08:00
疯狂的狮子li
dcaeb18870 add 增加 集群限流功能 2021-09-17 17:22:45 +08:00
疯狂的狮子li
30fe14c0ff add 增加 获取redis客户端实例id工具 2021-09-17 17:22:25 +08:00
疯狂的狮子li
900867df02 add RedisUtils 增加限流工具 2021-09-17 16:19:12 +08:00
疯狂的狮子li
50599487f8 update [重大改动] 将 framework 与 system 模块 解耦 2021-09-17 14:48:36 +08:00
疯狂的狮子li
2b53e9d86a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
 2021-09-17 11:12:43 +08:00
RuoYi
23270c60bc 日志注解新增是否保存响应参数 2021-09-16 16:03:49 +08:00
抓蛙师
a7ecfb68c1 字典类型 数据解析状态对应字典调整 2021-09-13 13:57:03 +08:00
疯狂的狮子li
2af534eea4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210908.sql
 2021-09-13 13:03:58 +08:00
RuoYi
db193a46e8 若依 3.7.0 2021-09-13 09:36:38 +08:00
疯狂的狮子li
eca8ea1eb6 fix 修复 @Cacheable 与 @DataScope 冲突问题 2021-09-10 15:41:23 +08:00
RuoYi
a5e38f6f99 菜单管理支持配置路由参数 2021-09-08 09:28:23 +08:00
疯狂的狮子li
ddf8d6ad6b 发布 v3.1.0 2021-09-07 13:48:22 +08:00
疯狂的狮子li
182edef28a update 所有业务适配 RedisUtils 新工具 2021-09-07 13:20:24 +08:00
疯狂的狮子li
97cffa048e add 过期 RedisCache 新增 RedisUtils 工具类 更灵巧便于使用 2021-09-07 13:19:34 +08:00
疯狂的狮子li
c5d46591fe update 更新 jackson 配置 支持 LocalDateTime 全局格式化 2021-09-07 13:18:36 +08:00
疯狂的狮子li
e7f83fb695 update mybatis-plus 3.4.3 => 3.4.3.3 适配升级 (包含不兼容升级) 请详细阅读 mybatis-plus 官方升级文档 2021-09-06 10:19:58 +08:00
疯狂的狮子li
2d6c306ae1 update 优化 oss配置 使用发布订阅工具 刷新配置 2021-09-03 17:42:58 +08:00
疯狂的狮子li
b2ab087313 add PageUtils 增加构造无参 TableDataInfo 方法 2021-09-03 17:35:44 +08:00
疯狂的狮子li
22daef0b51 update 泛型统一使用 V 2021-09-03 17:14:19 +08:00
疯狂的狮子li
067029eebe update 优化分页工具排序处理 2021-09-03 17:06:18 +08:00
疯狂的狮子li
04c03d7ab7 add RedisCache 工具类 增加 发布订阅工具 2021-09-03 16:21:50 +08:00
疯狂的狮子li
80784433b8 remove 移除分页合理化参数 使用 MP 全局配置分页溢出 2021-09-02 15:59:42 +08:00
疯狂的狮子li
ab9bc35f9f update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理 2021-09-02 15:45:57 +08:00
疯狂的狮子li
f3d6d1e43b update 优化全局线程池配置 使用泛型 防止错误输入 2021-09-02 15:20:31 +08:00
疯狂的狮子li
8b2f7f0e64 update 优化验证码配置 使用泛型 防止错误输入 2021-09-02 15:19:18 +08:00
疯狂的狮子li
6801490e3b update 分页合理化 2021-09-02 11:29:50 +08:00
RuoYi
a15bfdfb46 防止表格最后页最后项删除变成暂无数据 2021-09-02 10:55:10 +08:00
疯狂的狮子li
1a695159e3 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-09-02 10:49:56 +08:00
RuoYi
ee823b8326 防止表格最后页最后项删除变成暂无数据 2021-09-02 10:19:04 +08:00
疯狂的狮子li
bdfd2f0787 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
	ruoyi-ui/src/api/login.js
 2021-08-30 12:49:19 +08:00
疯狂的狮子li
673d10c6c4 update 优化 saveAll 空列表校验 2021-08-30 12:36:01 +08:00
疯狂的狮子li
e54033f4e4 update 优化 saveOrUpdateAll 空列表校验 2021-08-30 12:24:24 +08:00
抓蛙师
41de169dd2 全量保存或更新时判断数组长度再继续 2021-08-30 11:29:33 +08:00
RuoYi
134835c870 验证码默认20s超时 2021-08-29 15:56:46 +08:00
疯狂的狮子li
23ce0af2e8 update 优化 ServicePlusImpl 的 vo 泛型 由K改成V 增加可读性 增加注释 2021-08-26 10:56:36 +08:00
疯狂的狮子li
7c6fe5f244 add 新增 saveOrUpdateAll 方法 可完美替代 saveOrUpdateBatch 高性能 2021-08-26 09:58:57 +08:00
抓蛙师
545f0bd4b0 saveAll支持有id则更新和无id则插入 2021-08-25 20:24:35 +08:00
疯狂的狮子li
8ffe111086 update 重写 InsertAll 方法实现 可完美替代 saveBatch 秒级插入上万数据 2021-08-25 18:01:52 +08:00
Ming
098c650655 update ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java. 
增加available方法于XssHttpServletRequestWrapper
 2021-08-24 08:42:56 +00:00
疯狂的狮子li
f5b90af6d0 add 增加 导出雪花id excel失真问题 2021-08-24 14:28:39 +08:00
疯狂的狮子li
5f2f4bb7ef add 增加查询校验组 2021-08-23 18:17:45 +08:00
疯狂的狮子li
0e2ff6a6da update 优化copy工具增加空判断 2021-08-22 10:41:26 +08:00
疯狂的狮子li
40347e4cb8 fix 修复 excel 导入与 class 未对应问题 2021-08-20 17:00:57 +08:00
疯狂的狮子li
c380b77617 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.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/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/src/layout/index.vue
 2021-08-19 17:33:46 +08:00
RuoYi
1e37f0430b 定时任务屏蔽ldap远程调用 2021-08-19 15:26:22 +08:00
疯狂的狮子Li
b19111b9bf Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-08-18 03:11:04 +00:00
疯狂的狮子li
a937e3f268 发布 v3.0.0 2021-08-18 11:09:14 +08:00
疯狂的狮子li
896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2021-08-17 14:23:19 +08:00
RuoYi
5c155f5f11 支持自定义注解实现接口限流 2021-08-17 14:08:18 +08:00
疯狂的狮子li
d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/components/Breadcrumb/index.vue
 2021-08-17 10:38:07 +08:00
RuoYi
03cf98d3c9 优化异常信息 2021-08-16 16:25:25 +08:00
稚屿
333e19339c 修正方法名单词拼写错误 2021-08-15 10:26:05 +00:00
RuoYi
3003bb0f50 Excel注解图片导入兼容xls 2021-08-13 10:56:35 +08:00
疯狂的狮子li
c9a9da7f49 remove 移除无用配置 2021-08-12 11:38:06 +08:00
疯狂的狮子li
8adbdee9d9 remove 移除无用配置 2021-08-12 11:37:12 +08:00
疯狂的狮子li
a48154a2ee update 补全基础实体 文档注解 2021-08-11 15:43:23 +08:00
RuoYi
7be17ea89a Excel注解支持Image图片导入 2021-08-11 10:13:34 +08:00
疯狂的狮子li
c2de299834 update 同步ruoyi 2021-08-09 10:05:27 +08:00
疯狂的狮子li
9bfa420a76 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	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/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
 2021-08-09 09:55:50 +08:00
RuoYi
7736097f6b 提取通用方法到基类控制器 2021-08-08 19:12:12 +08:00
疯狂的狮子li
8c912a8133 add 集成 性能分析插件 p6spy 更强劲的 SQL 分析 2021-08-05 13:30:36 +08:00
疯狂的狮子li
79bf332c53 remove 移除通用上传下载接口与配置 2021-08-04 19:11:39 +08:00
疯狂的狮子li
08db4a5f53 update 更改所有业务excel导出 2021-08-04 19:03:25 +08:00
疯狂的狮子li
ffed5a09cb remove 移除原生excel工具 2021-08-04 19:02:59 +08:00
疯狂的狮子li
9cf4794146 update 更新 SysUser 导入导出 2021-08-04 18:29:38 +08:00
疯狂的狮子li
0539c2f927 update 重写系统部分业务导出 2021-08-04 11:46:55 +08:00
疯狂的狮子li
170908ef8d add 增加 easyexcel 工具类 2021-08-03 19:28:15 +08:00
疯狂的狮子li
70b77d9801 add 增加 easyexcel 依赖 2021-08-03 19:27:48 +08:00
jackytang
ad15978ccb Fix 修复DictUtils方法报错 2021-08-02 16:10:31 +00:00
疯狂的狮子li
c813046594 update 日常校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 19:28:41 +08:00
疯狂的狮子li
f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 12:15:14 +08:00
疯狂的狮子li
cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-08-02 11:21:09 +08:00
RuoYi
5397e345ca 新增是否开启用户注册功能 2021-07-30 21:23:35 +08:00
疯狂的狮子li
c65acd6a28 update 重写 防重提交拦截器 支持全局与注解自定义 拦截时间配置配置 优化逻辑 2021-07-30 19:10:54 +08:00
RuoYi
8ed7916b61 定时任务屏蔽http(s)远程调用 2021-07-30 11:28:46 +08:00
疯狂的狮子li
0bfc4b433b update 优化 InsertAll 写法 2021-07-28 18:23:27 +08:00
RuoYi
6b5dd4d2be 优化XSS跨站脚本过滤 2021-07-28 16:04:59 +08:00