疯狂的狮子li
|
970561b956
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/assets/styles/element-variables.scss
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
RuoYi
|
9c3b53b701
|
用户管理左侧树型组件增加选中高亮保持
|
4 years ago |
|
疯狂的狮子Li
|
940b996e2d
|
!175 [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名
* [重大改动] 基于S3协议重新实现 OSS模块 支持自定义域名
|
4 years ago |
|
RuoYi
|
0055f479cb
|
修复字典数据显示不全问题(I55MR3)
|
4 years ago |
|
疯狂的狮子Li
|
a6f30412ad
|
update 修改角色适配 采用 get set 转换数据类型
|
4 years ago |
|
疯狂的狮子li
|
49ac180329
|
update 优化 SysRole 部分字段类型 防止数据库类型映射异常
|
4 years ago |
|
疯狂的狮子li
|
cd312f1348
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.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/assets/styles/sidebar.scss
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/store/modules/app.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/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/importTable.vue
|
4 years ago |
|
疯狂的狮子li
|
333a38978e
|
update 重命名 菜单字段 query -> query_param 解决系统关键字问题
|
4 years ago |
|
RuoYi
|
6130bebbb3
|
开启TopNav没有子菜单情况隐藏侧边栏
|
4 years ago |
|
RuoYi
|
cb8f5de5af
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
4 years ago |
|
疯狂的狮子li
|
b9afd55856
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.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-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/components/ImageUpload/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
疯狂的狮子li
|
6751b97db9
|
fix 修复一些小问题
|
4 years ago |
|
RuoYi
|
927b05713a
|
组件fileUpload支持多文件同时选择上传
|
4 years ago |
|
疯狂的狮子li
|
568e2a9337
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
|
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
4 years ago |
“lumingsyc”
|
9aaa9ce8aa
|
优化部门管理页面email字段的表单验证多余的单引号
|
4 years ago |
|
RuoYi
|
4d8bd8805b
|
优化个人中心页面email字段的表单验证多余的单引号
|
4 years ago |
|
疯狂的狮子li
|
d99dd4b875
|
update 调整oss预览开关 使用前端直接调用更改配置参数
|
4 years ago |
|
疯狂的狮子li
|
5413b37d71
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
# ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
9f7acd4cf9
|
优化部门修改缩放后出现的错位问题
|
4 years ago |
|
疯狂的狮子li
|
1c7d840ff6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
RuoYi
|
d51e7cbb51
|
用户管理部门查询选择节点后分页参数初始
|
4 years ago |
|
疯狂的狮子li
|
a3504dac6e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/vue.config.js
|
4 years ago |
18297093310
|
47b67331d4
|
修改重置表单bug
|
4 years ago |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
RuoYi
|
06aef0587a
|
用户导入提示溢出则显示滚动条
|
4 years ago |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
4 years ago |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
4 years ago |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
4 years ago |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
4 years ago |
|
RuoYi
|
d1eacc1d1c
|
新增tab对象简化页签操作
|
4 years ago |
|
疯狂的狮子li
|
64add90edd
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.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/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/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.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/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
4 years ago |
|
疯狂的狮子Li
|
42a3117e2a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/role/index.vue
ry.bat
|
4 years ago |
|
RuoYi
|
8a7dcf8a80
|
修正错别字
|
4 years ago |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
4 years ago |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
4 years ago |
|
疯狂的狮子li
|
071c4c1412
|
update 同步ruoyi适配改动
|
4 years ago |
|
疯狂的狮子li
|
03b31652a2
|
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/layout/components/Settings/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
4 years ago |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
4 years ago |
|
疯狂的狮子li
|
d54ab2733c
|
update 简化数据字典使用
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
c1c6c1cf30
|
update 将所有 云存储字样 改为 对象存储 避免误解
|
4 years ago |
|
RuoYi
|
a5e38f6f99
|
菜单管理支持配置路由参数
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
RuoYi
|
9ae5edaa74
|
菜单&部门新增展开/折叠功能
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
