226 Commits

Author SHA1 Message Date
疯狂的狮子li
b01d45cf5c add 增加 RedisUtils 操作原子值方法 2022-05-05 15:07:23 +08:00
疯狂的狮子Li
4941aaa5c1 update 重构 pr_172 集成邮件发送功能 2022-05-02 23:12:16 +08:00
zlyx
92f030887b [add]:
1. (common) pom.xml - 增加邮件依赖 ;
2. (admin) application-dev.yml - 增加邮件配置 ;
3. (framework) MailProperties, MailConfig - 增加邮件属性配置 ;
4. (common) MailUtils - 重写 Hutool MailUtil方法 ;
5. (demo) MailController - 邮件发送测试方法 ;
2022-05-02 21:21:14 +08:00
疯狂的狮子Li
e18cf51c01 update 优化 RedisUtils 重构过期方法 2022-04-30 22:21:49 +08:00
疯狂的狮子Li
eaef38f79c fix 修复 ExcelUtil 表达式解析 参数添反导致无法解析问题 2022-04-25 15:24:10 +08:00
疯狂的狮子li
67140f996b fix 修复 BeanCopyUtils 工具导包错误 2022-04-20 10:41:27 +08:00
疯狂的狮子Li
30f0bdc754 update 使用 spring cglib 替换 停止维护的 cglib 2022-04-16 14:08:11 +08:00
疯狂的狮子Li
ebd005e1b1 update 优化 DateUtils 代码格式 2022-03-30 23:22:31 +08:00
疯狂的狮子Li
9ba61037a4 update 优化代码与注释 2022-03-30 23:04:51 +08:00
疯狂的狮子li
eefdba947c remove 删除无用合并 2022-02-28 12:17:40 +08:00
疯狂的狮子li
b9afd55856 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-02-28 12:16:18 +08:00
RuoYi
ac030b7275 优化Excel格式化不同类型的日期对象 2022-02-26 09:54:52 +08:00
RuoYi
927b05713a 组件fileUpload支持多文件同时选择上传 2022-02-25 11:51:29 +08:00
xueye
158e883e47 fix: 修复文件下载跨域问题 2022-02-25 10:40:29 +08:00
RuoYi
e62e8e372c 组件ImageUpload支持多图同时选择上传 2022-02-25 09:08:56 +08:00
hewenqiang
3446b38cbb update 修正 StringUtils.format() 注释错误问题 2022-02-18 16:18:38 +08:00
疯狂的狮子li
54f5b59c8c update 优化代码生成 使用新 JsonUtils.parseMap 方法 2022-02-15 12:07:56 +08:00
疯狂的狮子li
657b6a9fae update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常 2022-02-15 12:07:20 +08:00
疯狂的狮子li
961073ec96 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 2022-02-15 10:45:04 +08:00
疯狂的狮子li
ee2f74dc5e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	.gitignore
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/views/tool/build/index.vue
2022-02-14 14:27:13 +08:00
RuoYi
21780d8106 优化代码 2022-02-13 21:06:18 +08:00
RuoYi
d9859de756 代码优化 2022-02-12 13:13:04 +08:00
若依
a91d7cdd72
!428 删除方法无返回值时,方法注释上的@return,StringBuilder append() 改为链式调用
Merge pull request !428 from 我的世界有我/master
2022-02-12 03:55:12 +00:00
若依
d00dc3b03a
!426 修正单词拼写错误
Merge pull request !426 from 稚屿/master
2022-02-12 03:54:13 +00:00
疯狂的狮子li
61e2a07ee2 update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖 2022-02-11 15:03:09 +08:00
caohong
dd5e514d92 StringBuilder append方法改为链式调用 2022-02-11 10:06:07 +08:00
RuoYi
50236ae4e5 修复Xss注解字段值为空时的异常问题 2022-02-10 17:17:51 +08:00
稚屿
c99eb98001 代码优化 2022-02-09 09:10:50 +08:00
RuoYi
8007b22b85 导出Excel时屏蔽公式,防止CSV注入风险 2022-01-27 12:04:40 +08:00
疯狂的狮子Li
03bda9422d update 修改 关于 BeanCopyUtils 工具的说明 避免问题 2022-01-25 20:17:45 +08:00
疯狂的狮子li
b87aeb9b95 update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换 2022-01-21 10:30:39 +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
疯狂的狮子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
26fc652d33 update 统一代码间隔符 2022-01-11 16:58:47 +08:00
疯狂的狮子li
6f222ab02b fix 修复 通配符匹配无效 2022-01-11 09:30:38 +08:00
RuoYi
eb11337f7d 添加遗漏的分页参数合理化属性 2022-01-07 13:09:58 +08:00
疯狂的狮子li
c526ab1870 add 增加 RedisUtils 工具 hasKey 检查key存在方法 2022-01-04 09:48:20 +08:00
疯狂的狮子li
293db76bd6 remove 移除过期代码 分页工具相关 2021-12-28 14:33:26 +08: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
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
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
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