疯狂的狮子li
|
673b225da2
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-ui/vue.config.js
|
4 years ago |
RuoYi
|
c28aa299bd
|
新增使用Gzip解压缩静态文件地址
|
4 years ago |
|
RuoYi
|
b2189ae965
|
集成compression-webpack-plugin插件实现打包Gzip压缩
|
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 |
|
RuoYi
|
a028b566ed
|
集成compression-webpack-plugin插件实现打包Gzip压缩
|
4 years ago |
|
RuoYi
|
e5647793ce
|
路由支持单独配置菜单或角色权限
|
4 years ago |
|
RuoYi
|
903b5aebca
|
新增图片预览组件
|
4 years ago |
|
疯狂的狮子li
|
d40b9324ca
|
add oss下载增加 loading 层
|
4 years ago |
|
RuoYi
|
8978012f9d
|
修复打包后字体图标偶现的乱码问题
|
4 years ago |
18297093310
|
47b67331d4
|
修改重置表单bug
|
4 years ago |
|
RuoYi
|
6e14601c7c
|
修复版本差异导致的懒加载报错问题
|
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 |
fuzui
|
43d76e5990
|
fix: cron组件中周回显bug
|
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
|
2a235917dc
|
优化下载解析blob异常提示
|
4 years ago |
|
RuoYi
|
44ce6774dc
|
代码生成预览支持复制内容
|
4 years ago |
|
RuoYi
|
b911d7f78f
|
自定义文字复制剪贴指令
|
4 years ago |
|
RuoYi
|
4644176e26
|
升级clipboard到最新版本2.0.8
|
4 years ago |
|
RuoYi
|
850b98337b
|
修正用户分配角色属性错误
|
4 years ago |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
4 years ago |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
4 years ago |
|
疯狂的狮子li
|
f43a5cb244
|
update 更改前端工程文件版本号
|
4 years ago |
|
fuzui
|
f28a91969a
|
fix: crontab组件中规范数据范围、冗余代码去除以及部分通配符说明
|
4 years ago |
|
fuzui
|
ca285f5e53
|
fix: crontab组件周显示及计算bug
|
4 years ago |
|
fuzui
|
34f2552cad
|
fix: crontab组件互斥bug
|
4 years ago |
|
疯狂的狮子li
|
dbba894544
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
81755a280d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/views/register.vue
|
4 years ago |
|
RuoYi
|
89e7cb19b9
|
注册成功提示类型success
|
4 years ago |
|
疯狂的狮子li
|
c00e397405
|
update 抽象 Excel 导入支持自定义监听器
|
4 years ago |
khejing
|
e5fd1f76db
|
camelCase中应该是下划线，而不是横杠
|
4 years ago |
zhujie
|
c21ff85b57
|
update 增加excel导入样例
|
4 years ago |
|
疯狂的狮子li
|
d2b7f8ef0f
|
remove 删除无用 js 文件
|
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
|
31106c91fb
|
修复使用 this.$options.data 报错问题
|
4 years ago |
|
RuoYi
|
026a427103
|
优化前端代码
|
4 years ago |
|
RuoYi
|
4f194aa101
|
升级js-cookie到最新版本3.0.1
|
4 years ago |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
4 years ago |
|
RuoYi
|
421593c0ba
|
添加新群号：101539465
|
4 years ago |
|
RuoYi
|
91ad85aec1
|
添加新群号：264312783
|
4 years ago |
|
RuoYi
|
d1eacc1d1c
|
新增tab对象简化页签操作
|
4 years ago |
|
疯狂的狮子li
|
ce279ca360
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-ui/package.json
ruoyi-ui/src/utils/request.js
|
4 years ago |
|
RuoYi
|
fcf606acde
|
升级jsencrypt到最新版本3.2.1
|
4 years ago |
|
疯狂的狮子li
|
531e0ef918
|
remove 删除 quartz 过时页面
|
4 years ago |
|
疯狂的狮子li
|
2781655b0a
|
update 适配 ruoyi 关于优化导出数据操作
|
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
|
ead6da4760
|
update 更新页面与文档项目介绍
|
4 years ago |
|
RuoYi
|
cb9c0e79eb
|
升级core-js到最新版本3.19.1
|
4 years ago |
