320 Commits (6afbf8734e1771fd3a3a65bcc3ac73bfc7276af6)

Author SHA1 Message Date
疯狂的狮子li bc72868fc5 update 优化多文件 多图片上传 3 years ago
疯狂的狮子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
3 years ago
疯狂的狮子li 9bd29a6777 update 支持配置文件指定应用路径 3 years ago
疯狂的狮子li 710864a4f2 fix 修复一些小问题 3 years ago
RuoYi 04706403d3 组件fileUpload支持多文件同时选择上传 3 years ago
RuoYi c43565ef43 组件ImageUpload支持多图同时选择上传 3 years ago
疯狂的狮子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
3 years ago
RuoYi 089ebaf9c5 代码生成子表支持日期/字典配置 3 years ago
RuoYi 6f3c3f1b7e 页面若未匹配到字典标签则返回原字典值 3 years ago
East b5d2628b71 修复个人中心页面,修改个人信息的时候,表单验证里email字段的验证message多一个单引号的问题 3 years ago
疯狂的狮子li 1fc833d876 发布 0.8.0 完成 国际化 功能, sentinel控制台 对接 nacos 3 years ago
疯狂的狮子li 93c4a503c9 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-ui/src/utils/request.js
3 years ago
疯狂的狮子li dc6f7cd691 add 完成 国际化 功能 3 years ago
East 1358b21c3a 优化分页组件发送两次请求的实现 3 years ago
RuoYi 2e1ef93aa6 修改登录超时刷新页面跳转登录页面还提示重新登录问题 3 years ago
疯狂的狮子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
3 years ago
疯狂的狮子li 73831db0ce fix 修复 角色菜单权限列表 返回体结构漏改 3 years ago
RuoYi 642cfbda0a 修复分页组件请求两次问题 3 years ago
疯狂的狮子li d20921838e 发布 0.7.0 完成 代码生成 与 docker 部署 集成 sentinel 控制台 3 years ago
疯狂的狮子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
3 years ago
RuoYi 297193b6ce 代码生成编辑修改打开新页签 3 years ago
RuoYi dbca691746 优化代码 3 years ago
疯狂的狮子li d6a93184c4 发布 0.6.0 完成 分布式存储 支持 Minio、七牛、阿里、腾讯 3 years ago
疯狂的狮子li 909539d934 fix 修复 资源文件 下载问题 3 years ago
疯狂的狮子li 69e699946f add 增加ruoyi-resource资源模块 移除ruoyi-file模块 调整项目结构 3 years ago
疯狂的狮子Li 44674f0896 fix 修复验证码返回值问题 3 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 3 years ago
疯狂的狮子li af983c4f2f 发布 0.5.0 完成 satoken 与 mybatis-plus 整合 3 years ago
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 3 years ago
疯狂的狮子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
3 years ago
RuoYi bd30f3d53a 若依 3.4.0 3 years ago
RuoYi 4557ca0ace fix css class name 3 years ago
疯狂的狮子li b43a720a6d 发布 0.4.0 升级 3 years ago
疯狂的狮子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
3 years ago
RuoYi fa75346763 修复选项卡点击右键刷新丢失参数问题 3 years ago
疯狂的狮子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
3 years ago
RuoYi 6b4d03cb8d update copyright 2022 3 years ago
疯狂的狮子li 1de6f31b52 update 适配升级 springcloud 2021 springboot2.6 3 years ago
yueye ac4005c9dd add 新增 ruoyi-doc 模块 集成 Knife4j 3 years ago
疯狂的狮子li a95aa08d13 发布 0.3.0 新特性 集成 xxl-job 重构配置体系 3 years ago
RuoYi 5ebc354cfc 优化部门修改缩放后出现的错位问题 3 years ago
疯狂的狮子li a460a23149 发布 0.2.0 新特性 feign 切换为 dubbo 3 years ago
疯狂的狮子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
3 years ago
RuoYi 14ff957bde 前端支持设置是否需要防止数据重复提交 3 years ago
RuoYi 34439a6532 空值不进行回显数据字典 3 years ago
RuoYi db07f4a354 预览组件支持多图显示 3 years ago
RuoYi 820ea549e3 代码生成新增Java类型Boolean 3 years ago
疯狂的狮子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
3 years ago
RuoYi a3f8d03611 修复登录失效后多次请求提示多次弹窗问题 3 years ago
RuoYi 418b74b39d 用户管理部门查询选择节点后分页参数初始 3 years ago