Commit Graph

163 Commits (7dff3c88a86de10e8758c975096ab441fd5ab098)

Author SHA1 Message Date
疯狂的狮子li d1832352de 发布 0.9.0 2022-03-04 09:00:59 +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 710864a4f2 fix 修复一些小问题 2022-02-25 18:42:27 +08:00
RuoYi 04706403d3 组件fileUpload支持多文件同时选择上传 2022-02-25 11:44:05 +08:00
疯狂的狮子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
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 dc6f7cd691 add 完成 国际化 功能 2022-02-21 13:34:58 +08:00
疯狂的狮子li 73831db0ce fix 修复 角色菜单权限列表 返回体结构漏改 2022-02-17 19:02:16 +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 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
RuoYi bd30f3d53a 若依 3.4.0 2022-01-24 10:09:41 +08:00
疯狂的狮子li b43a720a6d 发布 0.4.0 升级 2022-01-21 18:24:55 +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 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 418b74b39d 用户管理部门查询选择节点后分页参数初始 2021-12-29 15:39:34 +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 7713948f5c 修复菜单图标缺少的prop属性 2021-12-18 18:21:23 +08:00
RuoYi c1b223e3a7 用户导入提示溢出则显示滚动条 2021-12-16 09:58:48 +08:00
RuoYi 3c7018b38a 若依 3.3.0 2021-12-13 09:02:33 +08:00
RuoYi 4db3e90872 代码生成预览支持复制内容 2021-12-09 10:03:43 +08:00
RuoYi f64a5dd5ca 修正用户分配角色属性错误 2021-12-06 21:56:00 +08:00
RuoYi 82779f3c70 优化提示信息 2021-12-02 10:44:15 +08:00
RuoYi b1bc3ceb27 注册成功提示类型success 2021-11-26 18:10:34 +08:00
RuoYi 2c1bdc9670 添加新群号:236543183 2021-11-25 10:06:29 +08:00
RuoYi 451d218f4b 优化提示信息 2021-11-22 18:13:39 +08:00
RuoYi adcb6194c8 新增tab对象简化页签操作 2021-11-19 17:58:55 +08:00
RuoYi 173c0e384f 优化导出数据操作 2021-11-17 12:12:58 +08:00
RuoYi 662dec2fe2 修正错别字 2021-10-25 10:29:27 +08:00
RuoYi af1b557bc8 若依 3.2.0 2021-10-12 09:01:05 +08:00
RuoYi 7fcb1b2e0a 新增通用方法简化下载使用 2021-09-27 12:10:39 +08:00
RuoYi f7ae7e29d1 修正代码生成编辑页面单词拼写错误 2021-09-24 14:56:08 +08:00
RuoYi cae41a8da2 新增通用方法简化模态/缓存使用 2021-09-23 09:35:59 +08:00