ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,346 Commits
6 Branches
0 Tags
110 MiB
Commit Graph

347 Commits (38b980aeebd41b688b668dcd4d8cde8438149a8a)

Author SHA1 Message Date
疯狂的狮子li d68074bc59 Merge remote-tracking branch 'ruoyi-cloud/master' into dev 
# Conflicts:
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java
 2022-09-13 15:05:39 +08:00
RuoYi 62eec4df51 删除多余的style重复赋值 2022-09-09 10:26:55 +08:00
runphp 732071ef58
feat: add isError and isSuccess method 
Signed-off-by: runphp <runphp@qq.com>
 2022-09-07 08:52:23 +00:00
疯狂的狮子li 2cc7ea4bd8 update 同步 ruoyi 新功能 2022-08-25 13:30:57 +08:00
RuoYi 52d50e4e47 优化页面内嵌iframe切换tab不刷新数据 2022-08-23 21:19:45 +08:00
RuoYi 767f7c8621 优化多角色数据权限匹配规则 2022-08-22 15:02:29 +08:00
taest a8daa1f044
密码变量命名风格统一 
Signed-off-by: taest <876239615@qq.com>
 2022-08-19 08:17:45 +00:00
疯狂的狮子li 373a975c3b update 重写 spring-cache 实现 更人性化的操作 支持注解指定ttl等一些参数 2022-08-15 10:59:34 +08:00
RuoYi a92ca233aa 优化导出对象的子列表判断条件 2022-08-10 18:45:55 +08:00
颜奕强 467557fef3
update ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java. 
* update:  数字类型应该转为double输出。若使用string输出，会导致生成的单元格变成文本类型。
 2022-08-08 12:29:03 +00:00
疯狂的狮子li 7d402c010d fix 修复 用户登录与短信登录 国际化格式不一致 2022-08-08 18:22:43 +08:00
疯狂的狮子li 0c5cf65965 update 适配ruoyi错误登录与解锁功能 2022-08-08 10:55:47 +08:00
疯狂的狮子li 7bacfd9c4c update 同步ruoyi 2022-08-08 10:35:08 +08:00
RuoYi 5408af9d1f Excel支持导出对象的子列表方法 2022-08-07 18:49:09 +08:00
huyupeng c5eb7458c8 fix: 处理XSS攻击问题(#I5IRC8) 2022-08-01 14:52:18 +08:00
RuoYi 0ef63207f4 新增密码错误次数限制 2022-07-30 13:56:46 +08:00
疯狂的狮子li 1eec8f570f fix 修复 脱敏没有实现类导致返回数据异常问题 2022-07-29 14:25:14 +08:00
疯狂的狮子li 8c4091af01 Merge remote-tracking branch 'ruoyi-cloud/master' into dev 
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-api/pom.xml
#	ruoyi-api/ruoyi-api-system/pom.xml
#	ruoyi-auth/pom.xml
#	ruoyi-common/pom.xml
#	ruoyi-common/ruoyi-common-core/pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
#	ruoyi-common/ruoyi-common-excel/pom.xml
#	ruoyi-common/ruoyi-common-job/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-mybatis/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-example/ruoyi-stream-mq/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
 2022-07-27 18:52:46 +08:00
RuoYi d4930f6a88 自定义数据权限不排除重复 2022-07-26 20:06:14 +08:00
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 2022-07-22 18:46:07 +08:00
疯狂的狮子li 03e1d25afb update 升级 springboot 2.7.2 重构使用最新自动配置方式 2022-07-22 12:27:12 +08:00
RuoYi fb35360f81 支持自定义隐藏Excel属性列 2022-07-21 13:52:33 +08:00
RuoYi 9ebd484f46 Excel注解支持backgroundColor属性设置背景色 2022-07-20 09:40:42 +08:00
疯狂的狮子Li a28f0a28e1 update 优化 StreamUtils 分组返回有序 Map 性能不变 2022-07-16 22:51:10 +08:00
疯狂的狮子Li a19a59697f update 更改魔法值 2022-07-15 20:52:23 +08:00
RuoYi ef28473992 升级Spring Cloud相关组件到最新版 2022-07-15 14:32:58 +08:00
RuoYi f12baad00c 优化代码 2022-07-12 18:19:10 +08:00
疯狂的狮子li 0b7b8fd986 fix 修复 hutool 工具返回不可操纵类型 导致报错问题 2022-07-05 19:00:22 +08:00
疯狂的狮子li b877ec0e62 update 优化 使用 StreamUtils 简化业务流操纵 2022-07-05 11:17:51 +08:00
疯狂的狮子li f1d102916a add 增加 StreamUtils 流工具 简化 stream 流操纵 2022-07-05 11:04:34 +08:00
疯狂的狮子Li 0d58ecb09c
删除重复注释 2022-07-03 04:22:19 +00:00
疯狂的狮子li c4f7c32605 fix 修复 获取 SensitiveService 空问题 增加空兼容 2022-06-29 12:43:24 +08:00
疯狂的狮子li 23d7fb11a0 update 规范化 自动装配 注解使用 2022-06-17 11:36:12 +08:00
疯狂的狮子li 86d4101fa6 fix 修复 补全缺失导包 2022-06-17 11:27:39 +08:00
疯狂的狮子li 8607b39228 update 同步 ruoyi 2022-06-15 18:33:17 +08:00
疯狂的狮子li 646423a394 reset 回滚 InnerExclude 注解相关提交 错误的理解了功能 2022-06-15 17:02:13 +08:00
疯狂的狮子li 28f1d15e2e add 增加 dubbo 内网鉴权放行 InnerExclude 注解 用于放行 dubbo 服务之间的内网调用 2022-06-15 16:25:57 +08:00
RuoYi 2051819d2d 删除多余的工具类 2022-06-13 21:07:11 +08:00
RuoYi 570d468814 optimized code 2022-06-13 20:57:03 +08:00
若依 6d404a1f3b
!198 去除多余的逗号 
Merge pull request !198 from runphp/N/A
 2022-06-13 12:48:18 +00:00
runphp d28f81dc68
去除多余的逗号 2022-06-11 01:13:30 +00:00
疯狂的狮子li d3ded4162e update 使用全局国际化过滤器 GlobalI18nFilter 优化 Gateway 国际化处理 2022-06-02 16:43:14 +08:00
我以为 d6e6b99316
修正OpenFeign部分情况下传递header认证信息为空问题 #https://gitee.com/y_project/RuoYi-Cloud/issues/I5AGRR 2022-06-02 03:00:16 +00:00
疯狂的狮子Li b59095b897 update 用户头像上传限制只能为图片格式 2022-05-28 23:47:27 +08:00
疯狂的狮子Li 2f7f7c65da update 同步ruoyi最新修改 2022-05-28 22:22:15 +08:00
RuoYi cdcc466300 升级fastjson到最新版2.0.4 2022-05-26 10:04:13 +08:00
疯狂的狮子li e42b2963e3 fix 修复脱敏实现逻辑问题 2022-05-25 10:38:10 +08:00
疯狂的狮子Li 5d17811487 update 优化 redis 与 jackson 使用自动装配定制器简化配置 2022-05-23 02:02:36 +08:00
RuoYi 1d1b9501b7 用户头像上传限制只能为图片格式 2022-05-22 19:16:52 +08:00
RuoYi 24376681b8 优化switch case条件 2022-05-22 19:14:27 +08:00
疯狂的狮子Li 406e337d30 update 优化 编译警告 2022-05-22 12:44:43 +08:00
RuoYi 5dbed46552 优化excel创建表格样式 2022-05-09 17:48:20 +08:00
疯狂的狮子li 42f1c95b32 update 优化 redis 序列化 使用系统自带json工具 全局统一 2022-04-29 11:36:07 +08:00
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