疯狂的狮子li
|
76710e453e
|
update 分页合理化
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
RuoYi
|
ee823b8326
|
防止表格最后页最后项删除变成暂无数据
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
马小法
|
8040ad8c03
|
修改数据字典回显
|
4 years ago |
|
疯狂的狮子li
|
bdfd2f0787
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-ui/src/api/login.js
|
4 years ago |
|
RuoYi
|
4e8c6fb7c0
|
修复字典组件值为整形不显示问题
|
4 years ago |
|
RuoYi
|
134835c870
|
验证码默认20s超时
|
4 years ago |
|
疯狂的狮子li
|
5df5e63afe
|
update 解决 logout 写死 无法扩展路径问题
|
4 years ago |
wjtc8
|
89911e7caf
|
修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题
|
4 years ago |
|
疯狂的狮子li
|
72f3971ca2
|
update 重构 将下载excel工具提取到全局
|
4 years ago |
|
疯狂的狮子li
|
f91ebd93d2
|
update 重构 将下载excel工具提取到全局
|
4 years ago |
|
疯狂的狮子li
|
dea627f02c
|
update 更改用户注册页面标题名
|
4 years ago |
|
疯狂的狮子li
|
0c9a778736
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/directive/index.js
|
4 years ago |
|
RuoYi
|
d1ef19f08a
|
自定义可拖动弹窗高度指令
|
4 years ago |
|
RuoYi
|
e6e10308ff
|
自定义可拖动弹窗宽度指令
|
4 years ago |
|
疯狂的狮子li
|
c380b77617
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.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/constant/Constants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-ui/src/layout/index.vue
|
4 years ago |
|
疯狂的狮子li
|
36fae5c926
|
update 优化 OSS 模块与上传组件 异常处理
|
4 years ago |
aasdd
|
8133c60ab3
|
update ruoyi-ui/src/layout/index.vue.
删掉此处代码，使右边栏动画生效。现在是没有动画的
|
4 years ago |
|
疯狂的狮子li
|
e981388aa7
|
fix 修复 新版本说明 标签错误
|
4 years ago |
|
疯狂的狮子li
|
9dd0ed4329
|
fix 修复 富文本图片路径错误问题
|
4 years ago |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
4 years ago |
|
疯狂的狮子li
|
c271ffc066
|
update 同步 ruoyi 自定义限流 新功能
|
4 years ago |
|
疯狂的狮子li
|
896939ce4e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
|
4 years ago |
|
RuoYi
|
5c155f5f11
|
支持自定义注解实现接口限流
|
4 years ago |
|
疯狂的狮子li
|
5bfb2dae13
|
update 优化OSS异常判断
|
4 years ago |
|
疯狂的狮子li
|
d3abd6c96e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
ruoyi-ui/src/components/Breadcrumb/index.vue
|
4 years ago |
wangzhaoqiang
|
57b159eb98
|
添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接
|
4 years ago |
|
wangzhaoqiang
|
7b6ccd9b22
|
解决登录后浏览器后台Breadcrumb组件报错
|
4 years ago |
|
疯狂的狮子li
|
cb13642e85
|
update 重写 OSS 模块相关实现 支持动态配置(页面配置)
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
RuoYi
|
5d6f134609
|
多图上传组件移除多余的api地址
|
4 years ago |
|
疯狂的狮子li
|
8c09c30ca0
|
remove 删除OSS配置页面无用按钮
|
4 years ago |
|
疯狂的狮子li
|
652a39b11c
|
update 修正 PR 相关问题
|
4 years ago |
|
疯狂的狮子li
|
824635df7f
|
update 修正 PR 相关问题
|
4 years ago |
|
RuoYi
|
5139265d32
|
默认首页使用keep-alive缓存
|
4 years ago |
孤舟烟雨
|
c9f7314cd0
|
!77 update 对象存储配置 重构到数据库 动态配置
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
|
4 years ago |
稚屿
|
8ee641c1bc
|
修复角色分配用户页面接收参数与传递参数类型不一致导致的错误
|
4 years ago |
|
RuoYi
|
1f07641d9b
|
update bin
|
4 years ago |
|
疯狂的狮子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
|
4 years ago |
|
RuoYi
|
fc60c003c3
|
升级element-ui到最新版本2.15.5
|
4 years ago |
|
疯狂的狮子li
|
79bf332c53
|
remove 移除通用上传下载接口与配置
|
4 years ago |
|
疯狂的狮子li
|
08db4a5f53
|
update 更改所有业务excel导出
|
4 years ago |
|
疯狂的狮子li
|
5ca4478540
|
update 更新 SysJob 导入导出 补全 SysUser 试图对象
|
4 years ago |
|
疯狂的狮子li
|
9cf4794146
|
update 更新 SysUser 导入导出
|
4 years ago |
|
疯狂的狮子li
|
01e8fe5ddb
|
fix 头像上传 未走OSS存储问题
|
4 years ago |
|
疯狂的狮子li
|
0ec756cf58
|
fix oss列表 jpeg 不回显问题
|
4 years ago |
|
疯狂的狮子li
|
0539c2f927
|
update 重写系统部分业务导出
|
4 years ago |
|
疯狂的狮子li
|
19d5f2dd78
|
update 下载工具更名为通用下载
|
4 years ago |
|
疯狂的狮子li
|
13dde63463
|
update 修改 下载工具类 删除无用代码
|
4 years ago |
