疯狂的狮子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 |
RuoYi
|
5d6f134609
|
多图上传组件移除多余的api地址
|
2021-08-13 15:15:35 +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 |
RuoYi
|
1f07641d9b
|
update bin
|
2021-08-11 10:11:13 +08: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
|
79bf332c53
|
remove 移除通用上传下载接口与配置
|
2021-08-04 19:11: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
|
13dde63463
|
update 修改 下载工具类 删除无用代码
|
2021-08-04 09:27:16 +08:00 |
疯狂的狮子li
|
da4e080656
|
update 修改 操作日志导出 适配easyexcel工具
|
2021-08-03 19:29:59 +08:00 |
疯狂的狮子li
|
89cca8af07
|
update 重构 统一使用 zip 工具下载
|
2021-08-03 19:29:15 +08:00 |
疯狂的狮子li
|
28073ef2fe
|
update 适配新业务 接口返回值
|
2021-08-02 13:08:36 +08:00 |
疯狂的狮子li
|
f8ab5663ef
|
update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
|
2021-08-02 12:15:14 +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 |
RuoYi
|
f6bc28000e
|
防止错误token导致的解析异常
|
2021-07-29 17:32:55 +08:00 |
RuoYi
|
e6becb9337
|
BLOB下载时清除URL对象引用
|
2021-07-28 13:13:28 +08:00 |
疯狂的狮子li
|
973471c63b
|
发布 v2.6.0
|
2021-07-28 10:45:01 +08:00 |
RuoYi
|
8da55fb72a
|
添加新群号:101456076
|
2021-07-28 09:51:19 +08:00 |
疯狂的狮子li
|
06944747fd
|
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/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/system/dict/index.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
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2021-07-27 12:42:41 +08:00 |
RuoYi
|
6a5c86541a
|
跳转路由高亮相对应的菜单栏
|
2021-07-27 11:54:20 +08:00 |
疯狂的狮子li
|
48817519a9
|
update 修改页面文档与源码地址
|
2021-07-26 13:08:54 +08:00 |
RuoYi
|
9b1883988b
|
升级element-ui到最新版本2.15.3
|
2021-07-26 09:50:58 +08:00 |
RuoYi
|
49c8a007cc
|
修复定时任务日志执行状态显示
|
2021-07-26 09:50:33 +08:00 |
RuoYi
|
64f6d28441
|
角色&菜单新增字段属性提示信息
|
2021-07-25 20:08:55 +08:00 |
RuoYi
|
97ae0eb7c7
|
密码框新增显示切换密码图标
|
2021-07-25 19:13:56 +08:00 |
RuoYi
|
6c1cccd031
|
导入用户样式调整
|
2021-07-25 19:08:00 +08:00 |
RuoYi
|
856d1ceba8
|
顶部菜单样式调整
|
2021-07-25 19:06:57 +08:00 |
RuoYi
|
0a516e3001
|
更多操作按钮添加权限控制
|
2021-07-25 10:20:52 +08:00 |
RuoYi
|
bb87f35797
|
富文本新增上传文件大小限制
|
2021-07-25 08:57:01 +08:00 |
疯狂的狮子li
|
fbe9ad2392
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-ui/src/router/index.js
|
2021-07-24 19:03:36 +08:00 |
RuoYi
|
c43f9bc3c2
|
顶部菜单排除隐藏的默认路由
|
2021-07-24 18:20:55 +08:00 |
疯狂的狮子li
|
c92ae6a9d2
|
update 更新除图片外显示URL文本
|
2021-07-23 19:50:08 +08:00 |
疯狂的狮子li
|
dd9340090b
|
add OSS模块 增加预览图片开关
|
2021-07-23 19:14:37 +08:00 |
疯狂的狮子li
|
bb67924233
|
update OSS下载文件名改为后端传输
|
2021-07-23 10:48:28 +08:00 |
疯狂的狮子li
|
1f2cf719da
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-ui/src/views/monitor/job/index.vue
|
2021-07-21 14:00:07 +08:00 |
疯狂的狮子li
|
85376e8d6e
|
add 演示Demo增加自定义分页接口案例
|
2021-07-21 12:07:12 +08:00 |
疯狂的狮子li
|
ed197ce7ac
|
update 完成OSS模块页面功能
|
2021-07-20 17:26:20 +08:00 |
严俊东
|
cdace51197
|
code=401时request方法没有返回Promise.reject 修复
|
2021-07-20 04:49:22 +00:00 |