疯狂的狮子li
|
2f18d0d709
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/main.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-09-18 16:01:52 +08:00 |
|
yjb
|
aaae404b2a
|
Cron表达式生成器关闭时销毁,避免再次打开时存在上一次修改的数据
|
2021-09-17 19:14:41 +08:00 |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict,简化数据字典使用
|
2021-09-17 15:36:54 +08:00 |
|
疯狂的狮子li
|
2af534eea4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-quartz/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Link.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
sql/ry_20210908.sql
|
2021-09-13 13:03:58 +08:00 |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
2021-09-13 09:36:38 +08:00 |
|
疯狂的狮子li
|
c1c6c1cf30
|
update 将所有 云存储字样 改为 对象存储 避免误解
|
2021-09-10 10:51:40 +08:00 |
|
RuoYi
|
15abd4d053
|
优化提示
|
2021-09-08 11:26:08 +08:00 |
|
稚屿
|
d2b61762b7
|
修复代码生成页面数据编辑保存之后总是跳转第一页的问题
|
2021-09-08 11:18:35 +08:00 |
|
RuoYi
|
a5e38f6f99
|
菜单管理支持配置路由参数
|
2021-09-08 09:28:23 +08:00 |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
2021-09-07 13:48:22 +08:00 |
|
疯狂的狮子li
|
ab4b75fe30
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/ThemePicker/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/tagsView.js
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-06 09:59:28 +08:00 |
|
RuoYi
|
9ae5edaa74
|
菜单&部门新增展开/折叠功能
|
2021-09-04 12:10:33 +08:00 |
|
RuoYi
|
e49f0cebf1
|
自定义弹层溢出滚动样式
|
2021-09-03 13:27:03 +08:00 |
|
疯狂的狮子li
|
f566c39026
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-03 10:55:58 +08:00 |
|
RuoYi
|
6361e4efdc
|
定时任务支持在线生成cron表达式
|
2021-09-03 09:54:07 +08:00 |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
2021-09-02 15:59:42 +08:00 |
|
疯狂的狮子li
|
76710e453e
|
update 分页合理化
|
2021-09-02 13:46:11 +08:00 |
|
RuoYi
|
a15bfdfb46
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:55:10 +08:00 |
|
疯狂的狮子li
|
1a695159e3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-09-02 10:49:56 +08:00 |
|
RuoYi
|
ee823b8326
|
防止表格最后页最后项删除变成暂无数据
|
2021-09-02 10:19:04 +08:00 |
|
疯狂的狮子li
|
adb31b71f8
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/notice/index.vue
ruoyi-ui/src/views/system/post/index.vue
|
2021-09-01 09:40:36 +08:00 |
|
马小法
|
8040ad8c03
|
修改数据字典回显
|
2021-08-30 16:53:16 +08:00 |
|
疯狂的狮子li
|
5df5e63afe
|
update 解决 logout 写死 无法扩展路径问题
|
2021-08-25 21:50:38 +08:00 |
|
疯狂的狮子li
|
f91ebd93d2
|
update 重构 将下载excel工具提取到全局
|
2021-08-23 18:28:33 +08:00 |
|
疯狂的狮子li
|
dea627f02c
|
update 更改用户注册页面标题名
|
2021-08-23 18:21:05 +08:00 |
|
疯狂的狮子li
|
36fae5c926
|
update 优化 OSS 模块与上传组件 异常处理
|
2021-08-18 19:14:26 +08:00 |
|
疯狂的狮子li
|
e981388aa7
|
fix 修复 新版本说明 标签错误
|
2021-08-18 16:53:56 +08:00 |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
2021-08-18 11:09:14 +08:00 |
|
疯狂的狮子li
|
cb13642e85
|
update 重写 OSS 模块相关实现 支持动态配置(页面配置)
|
2021-08-13 21:09:24 +08:00 |
|
疯狂的狮子li
|
6473d4d8be
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
bin/clean.bat
bin/run.bat
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/bin/run-web.bat
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/index.vue
|
2021-08-13 17:36:26 +08:00 |
|
疯狂的狮子li
|
8c09c30ca0
|
remove 删除OSS配置页面无用按钮
|
2021-08-13 14:32:24 +08:00 |
|
疯狂的狮子li
|
652a39b11c
|
update 修正 PR 相关问题
|
2021-08-13 14:04:57 +08:00 |
|
疯狂的狮子li
|
824635df7f
|
update 修正 PR 相关问题
|
2021-08-13 12:37:34 +08:00 |
|
RuoYi
|
5139265d32
|
默认首页使用keep-alive缓存
|
2021-08-13 10:10:29 +08:00 |
|
孤舟烟雨
|
c9f7314cd0
|
!77 update 对象存储配置 重构到数据库 动态配置
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
|
2021-08-13 02:03:46 +00:00 |
|
稚屿
|
8ee641c1bc
|
修复角色分配用户页面接收参数与传递参数类型不一致导致的错误
|
2021-08-13 01:08:00 +00:00 |
|
疯狂的狮子li
|
9bfa420a76
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/package.json
ruoyi-ui/src/views/system/menu/index.vue
|
2021-08-09 09:55:50 +08:00 |
|
RuoYi
|
fc60c003c3
|
升级element-ui到最新版本2.15.5
|
2021-08-06 14:31:39 +08:00 |
|
疯狂的狮子li
|
08db4a5f53
|
update 更改所有业务excel导出
|
2021-08-04 19:03:25 +08:00 |
|
疯狂的狮子li
|
5ca4478540
|
update 更新 SysJob 导入导出 补全 SysUser 试图对象
|
2021-08-04 18:52:09 +08:00 |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
2021-08-04 18:29:38 +08:00 |
|
疯狂的狮子li
|
01e8fe5ddb
|
fix 头像上传 未走OSS存储问题
|
2021-08-04 13:10:28 +08:00 |
|
疯狂的狮子li
|
0ec756cf58
|
fix oss列表 jpeg 不回显问题
|
2021-08-04 13:09:43 +08:00 |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
2021-08-04 11:46:55 +08:00 |
|
疯狂的狮子li
|
19d5f2dd78
|
update 下载工具更名为通用下载
|
2021-08-04 09:28:31 +08:00 |
|
疯狂的狮子li
|
da4e080656
|
update 修改 操作日志导出 适配easyexcel工具
|
2021-08-03 19:29:59 +08:00 |
|
疯狂的狮子li
|
28073ef2fe
|
update 适配新业务 接口返回值
|
2021-08-02 13:08:36 +08:00 |
|
疯狂的狮子li
|
cfdeada3fd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-admin/src/main/resources/i18n/messages.properties
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/java/service.java.vm
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/api/login.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/utils/zipdownload.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/system/user/index.vue
|
2021-08-02 11:21:09 +08:00 |
|
RuoYi
|
5397e345ca
|
新增是否开启用户注册功能
|
2021-07-30 21:23:35 +08:00 |
|
疯狂的狮子li
|
973471c63b
|
发布 v2.6.0
|
2021-07-28 10:45:01 +08:00 |
|