Commit Graph

464 Commits

Author SHA1 Message Date
疯狂的狮子li
0d827e55ff Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
2022-02-24 15:24:01 +08:00
RuoYi
089ebaf9c5 代码生成子表支持日期/字典配置 2022-02-24 09:29:53 +08:00
RuoYi
6f3c3f1b7e 页面若未匹配到字典标签则返回原字典值 2022-02-23 16:52:31 +08:00
East
b5d2628b71 修复个人中心页面,修改个人信息的时候,表单验证里email字段的验证message多一个单引号的问题 2022-02-23 09:27:15 +08:00
疯狂的狮子li
1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos 2022-02-21 13:56:46 +08:00
疯狂的狮子li
93c4a503c9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-ui/src/utils/request.js
2022-02-21 13:37:15 +08:00
疯狂的狮子li
dc6f7cd691 add 完成 国际化 功能 2022-02-21 13:34:58 +08:00
East
1358b21c3a 优化分页组件发送两次请求的实现 2022-02-21 13:12:03 +08:00
RuoYi
2e1ef93aa6 修改登录超时刷新页面跳转登录页面还提示重新登录问题 2022-02-19 17:12:50 +08:00
疯狂的狮子li
e810021b57 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.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/SysRoleServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
2022-02-18 09:59:12 +08:00
疯狂的狮子li
73831db0ce fix 修复 角色菜单权限列表 返回体结构漏改 2022-02-17 19:02:16 +08:00
RuoYi
642cfbda0a 修复分页组件请求两次问题 2022-02-17 18:56:21 +08:00
疯狂的狮子li
d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台 2022-02-16 16:50:07 +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
RuoYi
297193b6ce 代码生成编辑修改打开新页签 2022-02-12 14:28:30 +08:00
RuoYi
dbca691746 优化代码 2022-02-12 14:23:11 +08:00
疯狂的狮子li
d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯 2022-02-09 19:53:52 +08:00
疯狂的狮子li
909539d934 fix 修复 资源文件 下载问题 2022-02-09 19:51:17 +08:00
疯狂的狮子li
69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 2022-02-09 18:59:04 +08:00
疯狂的狮子Li
44674f0896 fix 修复验证码返回值问题 2022-02-08 10:04:29 +08:00
疯狂的狮子li
bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 2022-01-29 11:21:25 +08:00
疯狂的狮子li
af983c4f2f 发布 0.5.0 完成 satoken 与 mybatis-plus 整合 2022-01-28 19:39:02 +08:00
疯狂的狮子Li
db70abf9f0 !15 合并 新功能/satoken 分支 2022-01-28 11:35:54 +00:00
疯狂的狮子li
c790e65937 Merge remote-tracking branch 'ruoyi-cloud/master'
# 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-datascope/pom.xml
#	ruoyi-common/ruoyi-common-datasource/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-swagger/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-file/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
2022-01-24 13:07:55 +08:00
RuoYi
bd30f3d53a 若依 3.4.0 2022-01-24 10:09:41 +08:00
RuoYi
4557ca0ace fix css class name 2022-01-23 10:51:01 +08:00
疯狂的狮子li
b43a720a6d 发布 0.4.0 升级 2022-01-21 18:24:55 +08:00
疯狂的狮子li
075bfb040d Merge remote-tracking branch 'ruoyi-cloud/master'
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
2022-01-21 18:23:09 +08:00
RuoYi
fa75346763 修复选项卡点击右键刷新丢失参数问题 2022-01-18 11:44:30 +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
6b4d03cb8d update copyright 2022 2022-01-14 10:53:41 +08:00
疯狂的狮子li
1de6f31b52 update 适配升级 springcloud 2021 springboot2.6 2022-01-13 13:04:43 +08:00
yueye
ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j 2022-01-12 16:32:19 +08:00
疯狂的狮子li
a95aa08d13 发布 0.3.0 新特性 集成 xxl-job 重构配置体系 2022-01-10 11:51:08 +08:00
RuoYi
5ebc354cfc 优化部门修改缩放后出现的错位问题 2022-01-08 09:24:27 +08:00
疯狂的狮子li
a460a23149 发布 0.2.0 新特性 feign 切换为 dubbo 2022-01-05 14:36:23 +08:00
疯狂的狮子li
189c00d794 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
2022-01-04 09:40:39 +08:00
RuoYi
14ff957bde 前端支持设置是否需要防止数据重复提交 2022-01-02 10:37:58 +08:00
RuoYi
34439a6532 空值不进行回显数据字典 2022-01-02 10:30:35 +08:00
RuoYi
db07f4a354 预览组件支持多图显示 2022-01-01 09:47:14 +08:00
RuoYi
820ea549e3 代码生成新增Java类型Boolean 2022-01-01 09:39:41 +08:00
疯狂的狮子li
570bf9617b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java
2021-12-31 16:32:50 +08:00
RuoYi
a3f8d03611 修复登录失效后多次请求提示多次弹窗问题 2021-12-31 10:04:46 +08:00
RuoYi
418b74b39d 用户管理部门查询选择节点后分页参数初始 2021-12-29 15:39:34 +08:00
RuoYi
919190dedc 定时任务cron表达式小时设置24 2021-12-29 15:39:19 +08:00
caohong
b006fad9b6 修改单词拼写错误:praseStrEmpty -> parseStrEmpty 2021-12-29 14:29:33 +08:00
疯狂的狮子li
8a25343bfe update 更改版本号为开发版本 2021-12-28 15:12:06 +08:00
RuoYi
74a02ca3dc 升级spring-boot到最新版本2.5.8 2021-12-27 12:41:42 +08:00
RuoYi
1797831afc 新增使用Gzip解压缩静态文件地址 2021-12-20 14:26:05 +08:00
RuoYi
24be94be5e 集成compression-webpack-plugin插件实现打包Gzip压缩 2021-12-20 09:44:13 +08:00