wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,084 Commits 2 Branches 0 Tags 6 MiB
Commit Graph

376 Commits

Author SHA1 Message Date
疯狂的狮子li b885e1eeff 发布 v2.1.0 2021-05-15 14:33:53 +08:00
疯狂的狮子li b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:23:43 +08:00
疯狂的狮子li e071b4315a 正式发布 v2.0.0 2021-05-14 21:07:20 +08:00
疯狂的狮子li d2c745d3fd add 代码生成器 增加校验注解 2021-05-14 15:12:40 +08:00
疯狂的狮子li 6067cb1797 add 增加增强Mapper 重写业务适配 2021-05-14 13:01:18 +08:00
疯狂的狮子li 685504e1d0 版本更新 v1.0.2 2021-05-13 09:20:02 +08:00
疯狂的狮子li 3b73bbe0ac 版本更新 v1.0.1 2021-05-11 17:36:52 +08:00
疯狂的狮子li c33c3de43a 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/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
 2021-05-11 17:14:53 +08:00
疯狂的狮子li 98624e66e5 正式发布 1.0.0 2021-05-10 15:34:17 +08:00
RuoYi 50034301ac 添加新群号：201396349 2021-05-06 20:40:25 +08:00
leizhuogogo 3f1427eef9 update ruoyi-ui/src/assets/styles/element-ui.scss. 2021-05-06 17:50:28 +08:00
疯狂的狮子li 4e723f4936 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
 2021-04-25 09:27:07 +08:00
疯狂的狮子li 5fcef39a2e add 集成 spring-boot-admin 全方位监控 2021-04-22 15:04:35 +08:00
RuoYi 62081aebb9 修复开启TopNav后，左侧打开外链问题 2021-04-21 16:34:44 +08:00
疯狂的狮子li 97873a7b2b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/store/modules/settings.js
 2021-04-19 17:43:32 +08:00
RuoYi 2575c17f47 主题颜色保存配置 2021-04-19 16:59:56 +08:00
RuoYi e60a69b670 兼容顶部栏一级菜单内部跳转 2021-04-18 18:33:13 +08:00
疯狂的狮子li f093da99ec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.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/views/monitor/druid/index.vue
 2021-04-14 13:22:31 +08:00
RuoYi cc50224d90 固定顶部导航栏&窗口大小改变实时更新栏数 2021-04-14 11:01:16 +08:00
RuoYi ff09e1cf55 数据监控默认地址修改 2021-04-13 18:15:11 +08:00
RuoYi fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
RuoYi c8df1f5e1f 布局设置支持保存&重置配置 2021-04-13 09:47:28 +08:00
RuoYi e71c00e6fa 富文本编辑器支持自定义上传地址 2021-04-13 09:38:32 +08:00
若依 f13b6d92d2 !205 富文本编辑器自定义上传地址 
Merge pull request !205 from hechieh/N/A
 2021-04-13 09:36:42 +08:00
RuoYi 9aac65ff32 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单） 2021-04-12 09:54:08 +08:00
RuoYi 5f2350569a 页签新增关闭右侧 2021-04-10 21:15:45 +08:00
hechieh ccf05b697d 富文本编辑器自定义上传地址 2021-04-10 17:08:49 +08:00
RuoYi 6810243ab7 修复树表数据显示不全&加载慢问题 2021-04-09 08:31:13 +08:00
疯狂的狮子li 8b37eca241 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/zipdownload.js
 2021-04-08 17:12:13 +08:00
RuoYi b56b8846d9 修改主题后mini类型按钮无效问题 2021-04-08 13:54:48 +08:00
RuoYi 8e1e4cd8fe 通用下载完成后删除节点 2021-04-08 13:46:22 +08:00
疯狂的狮子li b16fe5e263 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/tool/build/index.vue
 2021-03-31 16:49:45 +08:00
RuoYi 30f330f4a0 修复firefox下表单构建拖拽会新打卡一个选项卡 2021-03-30 17:45:35 +08:00
疯狂的狮子li 06e9feadee Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
 2021-03-26 14:07:53 +08:00
RuoYi 090e258bf9 显隐列初始默认隐藏列 2021-03-24 15:46:37 +08:00
若依 505fa06dc3 !192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 
Merge pull request !192 from 谢凯/N/A
 2021-03-24 15:32:24 +08:00
谢凯 881dc3fcf0 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-22 17:52:34 +08:00
allworldg b65c8d4512 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 2021-03-21 21:20:23 +08:00
疯狂的狮子li 63a582404b update swagger 模板修改为 swagger-bootstrap-ui 2021-03-15 17:51:00 +08:00
疯狂的狮子li 5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
	ruoyi-ui/src/components/Editor/index.vue
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/monitor/logininfor/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
 2021-03-09 09:32:49 +08:00
RuoYi 61432480c8 删除多余的代码 2021-03-07 11:06:47 +08:00
若依 78deee063d !180 富文本编辑组件支持只读 
Merge pull request !180 from JOSWAY/master
 2021-03-07 10:44:04 +08:00
若依 616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 
Merge pull request !185 from asher/N/A
 2021-03-07 10:39:30 +08:00
asher f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. 2021-03-04 17:00:07 +08:00
asher 45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. 2021-03-04 16:58:18 +08:00
疯狂的狮子li 0638f3c1fe Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	README.md
	ruoyi-ui/src/views/index.vue
 2021-02-28 14:39:53 +08:00
RuoYi 64e807f27b 添加新群号：186866453 2021-02-24 13:45:24 +08:00
Josway 339b932a3d 富文本编辑组件支持只读 2021-02-22 17:49:17 +08:00
疯狂的狮子li ac99fddfe6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
 2021-02-22 10:04:43 +08:00
RuoYi 0b5c7f4c96 若依 3.4.0 2021-02-22 09:40:28 +08:00
疯狂的狮子li 2c40a892f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-07 09:18:17 +08:00
RuoYi 3a51c53823 角色非自定义权限范围清空选择值 2021-02-06 10:34:12 +08:00
RuoYi df504c5c14 修复四级菜单无法显示问题 2021-02-06 09:29:50 +08:00
疯狂的狮子li 6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/views/system/role/index.vue
 2021-02-03 13:38:43 +08:00
RuoYi baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 2021-02-02 16:25:37 +08:00
疯狂的狮子li 2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
 2021-01-25 09:54:49 +08:00
RuoYi 2903de1561 升级element-ui到最新版本2.15.0 2021-01-24 12:06:19 +08:00
疯狂的狮子li 684eadbcc6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
	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/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/domain.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210108.sql
 2021-01-11 09:58:41 +08:00
RuoYi 14a859899c 代码生成模板支持主子表 2021-01-08 10:47:36 +08:00
RuoYi 7d0eb3b8c7 用户显隐列添加不同key防止被复用 2021-01-07 13:28:16 +08:00
RuoYi 654aa6b30c 表格右侧工具栏组件支持显隐列 2021-01-06 17:30:39 +08:00
疯狂的狮子li b368745380 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-01-06 09:35:00 +08:00
RuoYi edd090a098 代码生成支持文件上传组件 2021-01-05 20:59:14 +08:00
RuoYi 3cd886785b 图片组件添加预览功能 2021-01-05 20:33:41 +08:00
RuoYi ae5a0f9774 新增文件上传组件 2021-01-05 20:11:09 +08:00
RuoYi a118738d0f 单图上传组件添加移除 2021-01-05 16:13:22 +08:00
RuoYi 56fa3912ae 修复IE11浏览器报错问题 2021-01-05 09:44:08 +08:00
疯狂的狮子li d73994f05d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/monitor/job/index.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/system/config/index.vue
	ruoyi-ui/src/views/system/dept/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/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
	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-01-05 09:22:36 +08:00
RuoYi 2116ee1822 Update copyright 2021-01-04 17:49:52 +08:00
RuoYi 57a2eb4217 操作按钮组调整为朴素按钮样式 2021-01-04 17:48:46 +08:00
疯狂的狮子li c24b912b50 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/store/modules/permission.js
 2020-12-25 09:59:24 +08:00
RuoYi a9c6ba12e6 代码生成日期控件区分范围 2020-12-25 09:35:20 +08:00
RuoYi ba068eae65 修正侧边栏静态路由丢失问题 2020-12-24 19:32:18 +08:00
疯狂的狮子li 476df3117b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/utils/permission.js
	ruoyi-ui/src/utils/request.js
 2020-12-24 10:04:54 +08:00
若依 1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参 
Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU
 2020-12-22 16:19:51 +08:00
DokiYoloo 3c4b01ab83 权限工具类增加admin判断 2020-12-21 19:43:57 +08:00
wugh 886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 2020-12-21 11:58:15 +08:00
疯狂的狮子li 78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-ui/src/store/modules/permission.js
 2020-12-21 11:55:32 +08:00
RuoYi 52264b6e2a 优化多级菜单之间切换无法缓存的问题 2020-12-21 10:50:48 +08:00
疯狂的狮子li 6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/package.json
	ruoyi-ui/src/components/Breadcrumb/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/store/getters.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/system/user/profile/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
 2020-12-18 09:45:54 +08:00
RuoYi c86dc20743 移除path-to-regexp正则匹配插件 2020-12-17 12:05:29 +08:00
RuoYi ecc7a8be46 优化多级菜单之间切换无法缓存的问题 2020-12-16 20:57:48 +08:00
疯狂的狮子li 1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/permission.js
	ruoyi-ui/src/views/login.vue
 2020-12-15 10:25:00 +08:00
RuoYi 4f33da2a3f 登录后push添加catch防止出现检查错误 2020-12-15 10:04:09 +08:00
疯狂的狮子li 7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2020-12-14 09:27:27 +08:00
RuoYi 8988d0b4ab 若依 3.3.0 2020-12-14 09:02:10 +08:00
RuoYi ceefa20aa2 调整代码生成页列宽 2020-12-13 16:05:49 +08:00
RuoYi ecfe7006e2 代码生成预览支持高亮显示 2020-12-11 17:04:54 +08:00
疯狂的狮子li f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
	ruoyi-ui/package.json
	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/HeaderSearch/index.vue
	ruoyi-ui/src/components/Screenfull/index.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/main.js
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/user.js
	ruoyi-ui/src/views/login.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/userInfo.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi-ui/vue.config.js
 2020-12-11 14:27:54 +08:00
RuoYi 9e387dc447 去除用户手机邮箱部门必填验证 2020-12-11 13:26:14 +08:00
RuoYi d6eac2dc8d 前端更新插件版本 2020-12-11 09:27:12 +08:00
RuoYi b368ad764f 升级core-js到最新版本3.8.1 2020-12-10 12:08:18 +08:00
RuoYi ffd5f0ce5d 升级vue-router到最新版本3.4.9 2020-12-10 11:14:44 +08:00
RuoYi a50beae599 代码生成预览提供滚动机制 2020-12-10 11:13:39 +08:00
RuoYi 4d46f4c1b5 删除用户和角色解绑关联 2020-12-09 10:32:53 +08:00
〝走走停停 d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 2020-12-08 17:49:51 +08:00
RuoYi fbc071a573 关闭页签清理缓存数据 2020-12-08 16:43:26 +08:00
RuoYi 6cfff90b4a 缓存仪表图设置默认大小 2020-12-08 16:13:21 +08:00
RuoYi f90899d72a 支持主题风格配置 2020-12-07 14:13:02 +08:00
疯狂的狮子li 69f30760f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/utils/request.js
	ruoyi-ui/src/views/system/user/profile/userAvatar.vue
 2020-12-07 12:59:35 +08:00