Commit Graph

294 Commits (43a2d0030bc4284a284c8986fa22e943e4911c9d)

Author SHA1 Message Date
RuoYi 54d1c58338 Excel注解支持color字体颜色 2022-04-23 21:07:52 +08:00
疯狂的狮子li 30bc36f5bf update 使用 spring cglib 替换 停止维护的 cglib 2022-04-20 10:43:14 +08:00
疯狂的狮子Li fa3b642d63 update 优化登录失败相关部分代码结构 2022-04-17 21:51:55 +08:00
RuoYi 1ec806ae80 设置分页参数默认值 2022-04-17 10:35:15 +08:00
RuoYi 723583a3b8 修复Excel注解prompt/combo同时使用不生效问题 2022-04-03 18:28:58 +08:00
RuoYi 5d44d2b5a6 新增清理分页的线程变量方法 2022-03-31 11:58:23 +08:00
疯狂的狮子Li 3e7dd75f6d update 优化代码与注释 2022-03-30 23:21:21 +08:00
RuoYi e5c938c64a 优化IP地址获取到多个的问题 2022-03-27 15:35:20 +08:00
RuoYi ccf84377f8 优化导出excel单元格验证,包含变更为开头.防止正常内容被替换 2022-03-27 15:34:13 +08:00
疯狂的狮子Li bb479c436a add 增加 短信登录 与 小程序登录 示例 2022-03-23 01:02:07 +08:00
RuoYi 0b08933a8c 优化导出数据LocalDateTime类型无数据问题 2022-03-15 14:42:44 +08:00
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 2022-03-15 13:22:00 +08:00
疯狂的狮子li e2417b433a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-03-15 10:24:40 +08:00
YangHuang 66f5f11069 登录信息状态枚举值更正 2022-03-11 10:04:26 +08:00
YangHuang 34487865f3 记录登录信息状态值改为常量 2022-03-09 00:46:24 +08:00
RuoYi 82535c82d3 修复导入Excel时字典字段类型为Long转义为空问题 2022-03-05 08:41:19 +08:00
疯狂的狮子li 1ec6263399 update 简化用户与角色功能 2022-03-04 13:36:13 +08:00
疯狂的狮子li fe43c94810 update 简化查询角色功能 2022-03-04 13:23:11 +08:00
疯狂的狮子Li 6afbf8734e add 增加 ruoyi-common-idempotent 分布式幂等模块 2022-03-04 00:02:16 +08:00
疯狂的狮子Li 42dd74f196 remove 删除无用常量 2022-03-04 00:00:43 +08:00
疯狂的狮子li 58981b5b3d update 简化查询菜单功能 2022-03-03 11:28:53 +08:00
疯狂的狮子li 3f682fc80c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	docker/copy.sh
	pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/system/user/index.vue
2022-02-28 13:13:03 +08:00
疯狂的狮子Li 5531514325 update 增加 @Async 异步注解 自定义线程池配置 2022-02-27 22:59:47 +08:00
疯狂的狮子Li e167ba5539 update 移除自定义注解 改为框架统一配置 2022-02-27 22:58:56 +08:00
RuoYi a30622b460 升级spring-boot到最新版本2.6.4 2022-02-26 09:59:39 +08:00
duandazhi 105c9d99c8 poi ExcelUtil 增加对java8 日志类型的支持 2022-02-25 21:09:50 +08:00
RuoYi 04706403d3 组件fileUpload支持多文件同时选择上传 2022-02-25 11:44:05 +08:00
疯狂的狮子li 4ed3aa1a88 update 优化 R 默认返回 msg 2022-02-22 14:03:00 +08:00
疯狂的狮子li 7726fa9773 fix 修复 gateway webflux 国际化不生效问题 2022-02-21 19:36:27 +08:00
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能 2022-02-21 13:34:58 +08:00
疯狂的狮子Li 2ccf189139 update 优化 是否为管理员的判断 2022-02-19 16:34:30 +08:00
疯狂的狮子li f1c3e5d1ea update 优化代码生成 使用新 JsonUtils.parseMap 方法 2022-02-15 12:16:29 +08:00
疯狂的狮子li c994e2c97b update 使用 hutool Dict 优化 JsonUtils 防止类型解析异常 2022-02-15 12:16:18 +08:00
疯狂的狮子li 5be893f980 update 优化 TreeBuildUtils 工具 使用反射自动获取顶级父id 2022-02-15 10:48:19 +08:00
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能 2022-02-14 15:46:44 +08:00
疯狂的狮子li 4827f9217b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/src/components/FileUpload/index.vue
	ruoyi-ui/src/router/index.js
2022-02-14 14:55:55 +08:00
疯狂的狮子li 24a8719d4c update 优化xss注解处理逻辑 2022-02-14 14:47:33 +08:00
RuoYi 0e13296752 代码生成同步保留必填/类型选项 2022-02-13 21:09:16 +08:00
runphp b0b16e1fc5
fix Value 'baos' is always 'null' 2022-02-13 01:22:42 +00:00
RuoYi dbca691746 优化代码 2022-02-12 14:23:11 +08:00
疯狂的狮子li 1b7cde73f3 update 返回体 统一 2022-02-11 17:53:15 +08:00
疯狂的狮子li 2b4de7c5ea fix 修复 R 参数位置错误 2022-02-11 16:49:05 +08:00
疯狂的狮子li bf019b405e add 增加 数据脱敏 功能 2022-02-11 15:04:49 +08:00
RuoYi 27d46fc0a4 修复Xss注解字段值为空时的异常问题 2022-02-10 17:09:20 +08:00
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 2022-02-09 18:59:04 +08:00
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 2022-01-29 11:21:25 +08:00
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 2022-01-28 11:35:54 +00:00
RuoYi 255101f6f7 导出Excel时屏蔽公式,防止CSV注入风险 2022-01-27 12:20:41 +08:00
疯狂的狮子li 0e9ec77392 add 整合 mybatis-plus 重写所有业务 2022-01-26 20:33:39 +08:00
疯狂的狮子li 65fd3dcef6 update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 2022-01-26 15:29:31 +08:00
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
2022-01-21 18:19:22 +08:00
疯狂的狮子li c28d9c208e Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
#	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
#	sql/ry_config_20220114.sql
2022-01-17 15:58:59 +08:00
RuoYi d0a19e5b6f 定时任务屏蔽违规的字符 2022-01-14 10:53:03 +08:00
疯狂的狮子li f35dbc9241 update 代码细节优化 分离 ServletUtils 独立 WebFluxUtils 解耦 2022-01-11 10:40:15 +08:00
yueye 63aaa66fce fix 修复 通配符匹配无效 2022-01-11 09:29:12 +08:00
疯狂的狮子li 3efd7c7bd4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
2022-01-07 15:36:16 +08:00
RuoYi ca5d3e3556 添加遗漏的分页参数合理化属性 2022-01-07 13:17:06 +08:00
RuoYi c44cf9b9f6 定时任务目标字符串验证包名白名单 2022-01-06 14:58:56 +08:00
RuoYi cde32b45c0 定时任务目标字符串过滤特殊字符 2022-01-05 15:04:51 +08:00
疯狂的狮子li db9fd081e6 全项目代码格式化 2021-12-31 16:31:17 +08:00
yueye 6726e7716e 修改 使用hutool验证码替换原验证码 2021-12-31 11:29:41 +08:00
疯狂的狮子li 1ece3f0415 update 使用 jackson 全局处理时间 2021-12-30 17:57:31 +08:00
疯狂的狮子li 4e2d2858c7 update 使用 jackson 全局处理时间 2021-12-30 17:44:50 +08:00
疯狂的狮子li bafb58cd8e update 使用 jackson 全局处理时间 2021-12-30 17:06:21 +08:00
疯狂的狮子li 82509d3ffc update 使用 jackson 替换 fastjson 2021-12-30 13:36:33 +08:00
疯狂的狮子li b59a0c44b5 update 使用 hutool-jwt 替换 jjwt 2021-12-28 16:55:01 +08:00
yueye f39b02a0dd 添加jackson配置及序列化工具类 2021-12-28 11:15:01 +08:00
疯狂的狮子li cb931f4c61 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
2021-12-22 13:33:48 +08:00
RuoYi 054fd7546f SQL工具类新增检查关键字方法 2021-12-21 13:41:40 +08:00
RuoYi b64507d64a 请求分页方法设置成通用方便灵活调用 2021-12-18 18:20:25 +08:00
RuoYi f91f931c0b 自定义xss校验注解实现 2021-12-15 11:00:47 +08:00
疯狂的狮子li 9dd3fca1c8 update 补全 lombok 注解 2021-12-01 10:14:25 +08:00
疯狂的狮子li 0036a2a60c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-11-17 19:43:12 +08:00
RuoYi 173c0e384f 优化导出数据操作 2021-11-17 12:12:58 +08:00
RuoYi 68db4092ed 任务屏蔽违规字符 2021-11-01 15:45:22 +08:00
RuoYi acf8d9719f 修复字符串无法被反转义问题 2021-11-01 15:45:10 +08:00
疯狂的狮子li dbbb26a583 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
2021-10-19 17:35:16 +08:00
RuoYi 9c5c6c6be7 优化获取缓存信息方式 2021-10-18 10:59:56 +08:00
RuoYi d8da1b796c 优化权限认证注解 2021-10-16 18:28:38 +08:00
RuoYi 76f2273d0b Excel导入支持@Excels注解 2021-10-10 16:02:54 +08:00
RuoYi c20c2c221f 导入模板标题默认空参数 2021-10-09 11:53:36 +08:00
疯狂的狮子li 96d80b9581 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-09-27 17:34:31 +08:00
RuoYi 7fcb1b2e0a 新增通用方法简化下载使用 2021-09-27 12:10:39 +08:00
RuoYi f4a2f909a7 Excel注解支持导入导出标题信息 2021-09-26 09:03:28 +08:00
RuoYi 328630fe5d 修复xss过滤后格式出现的异常 2021-09-25 17:16:42 +08:00
RuoYi a4099cf645 Excel注解支持自定义数据处理器 2021-09-22 09:06:51 +08:00
RuoYi 0a104689ed Excel注解支持自定义数据处理器 2021-09-22 09:03:21 +08:00
疯狂的狮子li f7125ed563 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud 2021-09-08 09:44:34 +08:00
RuoYi bb30ae7086 防止表格最后页最后项删除变成暂无数据 2021-09-02 10:46:16 +08:00
疯狂的狮子li 032015d075 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
2021-08-20 14:56:54 +08:00
RuoYi 22c22c4246 定时任务屏蔽ldap远程调用 2021-08-19 15:34:13 +08:00
RuoYi 1e4ed04a65 优化异常信息 2021-08-16 22:26:29 +08:00
疯狂的狮子li c10d4faf9d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
2021-08-02 13:18:22 +08:00
RuoYi 329aa68644 新增是否开启用户注册功能 2021-07-30 20:03:59 +08:00
RuoYi 8057dcc4fc 定时任务屏蔽http(s)远程调用 2021-07-30 11:06:11 +08:00
RuoYi 7a35c474d6 统一网关错误码响应 2021-07-29 14:51:27 +08:00
RuoYi 954d208ac6 支持配置XSS跨站脚本过滤 2021-07-28 09:58:59 +08:00
RuoYi 114c9f3af6 菜单路由配置支持内链访问 2021-07-11 19:30:24 +08:00
疯狂的狮子li 8059655012 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
2021-07-08 11:17:18 +08:00
RuoYi 6146d63f2c 修复日志列表取消字段排序时的报错问题 2021-06-25 17:40:05 +08:00