Commit Graph

216 Commits (29fb70c8389894cd3ef7130ea7a92abd13deefd2)

Author SHA1 Message Date
疯狂的狮子li 29fb70c838 Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	pom.xml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
#	ruoyi-ui/src/views/system/user/index.vue
#	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
2022-10-24 09:46:53 +08:00
RuoYi c759728269 优化修改头像在小屏幕上页面布局错位的问题 2022-10-21 12:02:25 +08:00
RuoYi 58e07ba142 修复用户编辑时角色和部门存在无法修改情况 2022-10-21 12:01:42 +08:00
疯狂的狮子Li 3cdd052740 update 同步ruoyi 2022-10-12 11:03:28 +08:00
疯狂的狮子li f256bdb912 update 优化 分页对象 PageQuery 支持多排序 适配 文件管理 页面支持多排序 2022-10-08 14:12:14 +08:00
RuoYi c2708f2ba4 若依 3.6.1 2022-09-30 11:48:39 +08:00
疯狂的狮子li 21c5bca317 🐣发布 1.3.0 正式版 2022-09-29 13:21:22 +08:00
RuoYi 3b4f1d7937 优化代码生成同步后字典值NULL问题 2022-09-28 21:15:45 +08:00
RuoYi f250c6ee93 优化日志操作中重置按钮时重复查询的问题 2022-09-19 14:47:28 +08:00
疯狂的狮子li ca18a1f767 fix 修复 没有权限的用户编辑部门缺少数据 2022-09-13 14:15:12 +08:00
疯狂的狮子li ab6b8942e5 update 优化 补全缺失的接口 更改更新日志链接 2022-08-30 20:46:01 +08:00
疯狂的狮子li 2cc7ea4bd8 update 同步 ruoyi 新功能 2022-08-25 13:30:57 +08:00
RuoYi 767f7c8621 优化多角色数据权限匹配规则 2022-08-22 15:02:29 +08:00
RuoYi 12d335b9ac 添加菜单管理遗漏的prop属性 2022-08-22 14:45:51 +08:00
Dincat d504a7df2f 修复个人中心卡死或鼠标点击和键盘输入无效 2022-08-11 14:12:10 +08:00
疯狂的狮子li e2a5167368 🦁 发布 1.2.0 新增 SpringDoc 无注解文档生成 与 新增 easy-es 集成 2022-08-09 09:53:06 +08:00
疯狂的狮子li 7bacfd9c4c update 同步ruoyi 2022-08-08 10:35:08 +08:00
RuoYi c8a108b93a 登录日志新增解锁账户功能 2022-08-08 09:26:29 +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
疯狂的狮子li c0294cdab5 update 更改框架页面命名 2022-07-27 09:43:15 +08:00
疯狂的狮子li 4bad9c3eed update 更改 关于接口文档的说明 2022-07-23 14:22:22 +08:00
RuoYi 9f90b4eba7 优化字典数据使用store存取 2022-07-20 19:39:15 +08:00
疯狂的狮子li 8225235467 🦁 发布 1.1.0 新增 ELK 与三大 MQ 支持 2022-07-18 09:41:42 +08:00
RuoYi 87009e72bf 若依 3.6.0 2022-07-16 10:34:02 +08:00
RuoYi e753cea03e 修改验证码开关变量名 2022-07-15 10:02:59 +08:00
RuoYi 4b1351ef21 修改验证码开关变量名 2022-07-12 18:19:35 +08:00
RuoYi 81d3c90bbc 添加新群号:148794840 2022-07-09 16:47:52 +08:00
疯狂的狮子li aa5ea44dde Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
#	ruoyi-ui/vue.config.js
#	ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
2022-07-06 15:55:48 +08:00
疯狂的狮子li 31af8d93ba fix 修复 演示页面导出路径错误 2022-06-29 13:47:25 +08:00
RuoYi 95aa343805 优化字典数据回显样式下拉框显示值 2022-06-26 13:15:17 +08:00
疯狂的狮子li 362ea7a95e 发布 1.0.0 正式版 2022-06-20 10:03:53 +08:00
疯狂的狮子li 8607b39228 update 同步 ruoyi 2022-06-15 18:33:17 +08:00
疯狂的狮子li e46d286270 add 新增 ruoyi-demo 演示模块 用于编写一些测试及演示案例 2022-06-06 17:32:05 +08:00
疯狂的狮子li 713e039c44 发布 0.12.0 升级 seata 1.5.X 整合 seata 服务端 2022-05-31 19:24:30 +08:00
RuoYi 6cda8cb28f 表单构建按钮不显示正则校验 2022-05-29 09:49:54 +08:00
疯狂的狮子li b6452dcf1f 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/SysDept.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-ui/src/views/system/user/index.vue
	sql/ry_config_20220510.sql
2022-05-16 09:43:10 +08:00
huyikai 86b9e675b5 体验优化-用户管理左侧树型组件增加选中高亮保持。 2022-05-12 10:55:34 +08:00
疯狂的狮子li 0666275a17 发布 0.11.0 增加 短信模块 邮件模块 重写oss模块功能 2022-05-10 14:54:53 +08:00
疯狂的狮子li 3430b090e6 update 基于S3协议重新实现 OSS模块 支持自定义域名 2022-05-10 14:48:01 +08:00
RuoYi 103bf66f77 修复字典数据显示不全问题 2022-05-10 10:17:17 +08:00
疯狂的狮子li cc963acdbe update 更新 首页技术栈介绍 2022-04-21 10:41:46 +08:00
疯狂的狮子Li 98756eae3f 发布 0.10.0 版本 全面升级 SpringCloud Alibaba 2021.0.1.0 最新版 2022-04-13 12:45:30 +08:00
疯狂的狮子Li db46e5a8b0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	pom.xml
	ruoyi-api/pom.xml
	ruoyi-api/ruoyi-api-resource/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/utils/PageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.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/web/controller/BaseController.java
	ruoyi-common/ruoyi-common-log/pom.xml
	ruoyi-common/ruoyi-common-mybatis/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-gen/pom.xml
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-job/pom.xml
	ruoyi-modules/ruoyi-resource/pom.xml
	ruoyi-modules/ruoyi-system/pom.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-visual/pom.xml
	ruoyi-visual/ruoyi-monitor/pom.xml
2022-04-11 12:15:49 +08:00
RuoYi d14f27e5eb 若依 3.5.0 2022-04-11 09:02:50 +08:00
RuoYi f7b761275c 添加页签openPage支持传递参数 2022-04-08 15:43:52 +08:00
疯狂的狮子Li 73eb9cc7d7 update 修改角色适配 采用 get set 转换数据类型 2022-03-30 11:48:31 +08:00
疯狂的狮子Li 487f18a930 fix 修复 用户绑定角色 与 角色绑定用户 异常 编写错误 2022-03-23 22:17:05 +08:00
疯狂的狮子li 794c902773 update 优化 SysRole 部分字段类型 防止数据库类型映射异常 2022-03-16 12:59:09 +08:00
RuoYi 242101ae6e 添加新群号:213618602 2022-03-16 09:18:21 +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