疯狂的狮子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
|
2022-03-15 10:20:53 +08:00 |
|
RuoYi
|
6130bebbb3
|
开启TopNav没有子菜单情况隐藏侧边栏
|
2022-03-06 09:03:44 +08:00 |
|
SG
|
07dfef48be
|
修改提示
|
2022-03-05 12:28:44 +00:00 |
|
RuoYi
|
cb8f5de5af
|
修复表单清除元素位置未垂直居中问题(I4V27B)
|
2022-03-04 19:24:28 +08:00 |
|
fuzui
|
96edba7eec
|
fix: 服务监控中运行参数显示条件错误
|
2022-02-26 03:20:50 +08:00 |
|
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
2022-02-24 09:28:51 +08:00 |
|
RuoYi
|
54c6c4e547
|
服务监控新增运行参数信息显示
|
2022-02-20 16:06:33 +08:00 |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
2022-01-13 09:58:16 +08:00 |
|
RuoYi
|
0e771a6c1b
|
升级spring-boot到最新版本2.5.8
|
2021-12-27 12:38:59 +08:00 |
|
疯狂的狮子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
|
2021-12-13 12:37:36 +08:00 |
|
RuoYi
|
a2d3f987c0
|
优化代码
|
2021-11-30 11:15:17 +08:00 |
|
疯狂的狮子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
|
2021-11-25 19:39:53 +08:00 |
|
RuoYi
|
ef4bfde4a8
|
优化提示信息
|
2021-11-22 18:06:44 +08:00 |
|
RuoYi
|
d1eacc1d1c
|
新增tab对象简化页签操作
|
2021-11-19 14:53:40 +08:00 |
|
疯狂的狮子li
|
531e0ef918
|
remove 删除 quartz 过时页面
|
2021-11-17 19:42:38 +08:00 |
|
疯狂的狮子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
|
2021-11-17 19:14:03 +08:00 |
|
RuoYi
|
cedd2d1daf
|
优化导出数据操作
|
2021-11-17 11:57:17 +08:00 |
|
疯狂的狮子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
|
2021-10-25 18:24:55 +08:00 |
|
RuoYi
|
8a7dcf8a80
|
修正错别字
|
2021-10-25 10:26:00 +08:00 |
|
疯狂的狮子li
|
83ce927d16
|
add 前端增加 任务调度中心页面 与环境及nginx配置
|
2021-10-20 15:25:14 +08:00 |
|
疯狂的狮子li
|
741a5b275b
|
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/SysRegisterController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.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-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/views/monitor/server/index.vue
|
2021-10-11 09:37:06 +08:00 |
|
RuoYi
|
4fdb0f48ec
|
同步element2.15.6表格样式
|
2021-10-10 11:23:04 +08:00 |
|
疯狂的狮子li
|
99dcbe0207
|
update 封装通用下载方法简化下载使用
|
2021-09-27 17:24:37 +08:00 |
|
RuoYi
|
ded99502ae
|
新增通用方法简化下载使用
|
2021-09-27 10:38:29 +08:00 |
|
RuoYi
|
1a5881b1d0
|
修正服务监控磁盘变量
|
2021-09-23 19:09:22 +08:00 |
|
疯狂的狮子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
|
2021-09-23 18:53:17 +08:00 |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
2021-09-23 09:38:16 +08:00 |
|
疯狂的狮子Li
|
5306a45093
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
|
2021-09-20 17:53:25 +08:00 |
|
疯狂的狮子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
|
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
|
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 |
|
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
|
5ca4478540
|
update 更新 SysJob 导入导出 补全 SysUser 试图对象
|
2021-08-04 18:52:09 +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
|
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 |
|
RuoYi
|
49c8a007cc
|
修复定时任务日志执行状态显示
|
2021-07-26 09:50:33 +08:00 |
|