疯狂的狮子li
|
44bbe8b307
|
update 同步更新 ruoyi 适配新功能
|
2021-06-17 19:22:49 +08:00 |
疯狂的狮子li
|
a8c1d02ee1
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/.env.development
ruoyi-ui/.env.production
ruoyi-ui/.env.staging
ruoyi-ui/package.json
ruoyi-ui/src/App.vue
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/permission.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/vue.config.js
|
2021-06-17 18:15:34 +08:00 |
疯狂的狮子li
|
7dd18c75b0
|
update 更新 jackson 相关文档
|
2021-06-17 12:43:00 +08:00 |
RuoYi
|
090ad5323a
|
日志列表支持排序操作
|
2021-06-17 12:30:43 +08:00 |
RuoYi
|
7601a72faf
|
升级element-ui到最新版本2.15.2
|
2021-06-15 10:26:19 +08:00 |
疯狂的狮子li
|
5311937b69
|
update 增加 jackson 配置 默认序列化时间格式
|
2021-06-12 23:41:56 +08:00 |
疯狂的狮子li
|
bf3a88ff1a
|
发版 v2.3.2
|
2021-06-11 09:23:34 +08:00 |
RuoYi
|
ea66e20282
|
修复用户搜索分页变量错误
|
2021-06-10 22:36:22 +08:00 |
RuoYi
|
a209b39552
|
分页组件新增pagerCount属性
|
2021-06-10 22:29:13 +08:00 |
RuoYi
|
557672ba9f
|
系统布局配置支持动态标题开关
|
2021-06-10 18:05:27 +08:00 |
疯狂的狮子li
|
c5c8afe147
|
update 还原错误提交
|
2021-06-10 15:44:14 +08:00 |
疯狂的狮子li
|
9d05d2bac5
|
remove 移除无用配置文件
|
2021-06-10 15:42:46 +08:00 |
疯狂的狮子li
|
2103731f10
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/layout/components/Navbar.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
ruoyi-ui/src/views/tool/swagger/index.vue
|
2021-06-10 09:44:56 +08:00 |
RuoYi
|
c16ee7fc2c
|
升级swagger到最新版本v3.0.0
|
2021-06-08 16:34:36 +08:00 |
疯狂的狮子li
|
450c6759eb
|
发布 2.3.1
|
2021-06-04 16:11:17 +08:00 |
RuoYi
|
b7446f8d0f
|
富文本工具栏配置视频
|
2021-06-03 13:26:09 +08:00 |
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
2021-06-03 13:24:29 +08:00 |
疯狂的狮子li
|
01c34b837d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/menu/index.vue
|
2021-06-03 09:46:33 +08:00 |
RuoYi
|
85470a1549
|
修复表单构建选择下拉选择控制台报错问题
|
2021-06-02 20:43:34 +08:00 |
kdyzm
|
6b789e2eb0
|
优化新增、修改页面的按钮动作loading从页面loading到按钮loading
|
2021-06-02 18:13:34 +08:00 |
疯狂的狮子li
|
329c95196e
|
update 更新测试案例
|
2021-06-02 17:15:20 +08:00 |
疯狂的狮子li
|
d9dd76f2ae
|
发布 v2.3.0
|
2021-06-01 10:54:59 +08:00 |
疯狂的狮子li
|
d815317d7c
|
发布 v2.3.0
|
2021-06-01 10:21:56 +08:00 |
xx2yy
|
01fef0b9e1
|
同步菜单新增、修改界面“功能权限”maxlength为100(保持与数据库字段长度一致),避免因超过50后不能录入问题
|
2021-05-31 10:31:50 +08:00 |
疯狂的狮子li
|
a02aeb468e
|
add 增加demo模块 树表演示案例(包含数据权限)
|
2021-05-30 02:25:14 +08:00 |
疯狂的狮子li
|
a3a682eeb1
|
add 增加demo模块 单表演示案例(包含数据权限)
|
2021-05-30 02:24:10 +08:00 |
疯狂的狮子li
|
06513446a0
|
update 还原数据权限修改
|
2021-05-29 19:44:33 +08:00 |
疯狂的狮子li
|
57e071fe6b
|
发布 2.2.1
|
2021-05-29 18:57:56 +08:00 |
疯狂的狮子li
|
d0b2166525
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/index.vue
|
2021-05-28 10:07:15 +08:00 |
RuoYi
|
af9cfb40a4
|
优化参数&字典缓存操作
|
2021-05-27 17:38:44 +08:00 |
疯狂的狮子li
|
a570589dcc
|
发布 v2.2.0
|
2021-05-25 14:11:32 +08:00 |
朱杰
|
5dc873209e
|
add 增加验证码开关
|
2021-05-25 14:02:34 +08:00 |
疯狂的狮子li
|
5795958a18
|
update 同步升级 ruoyi-vue 3.5.0
|
2021-05-25 10:14:18 +08:00 |
疯狂的狮子li
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
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/dict/data.vue
ruoyi-ui/src/views/system/dict/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
|
2021-05-25 10:00:36 +08:00 |
RuoYi
|
5e64a93d11
|
若依 3.5.0
|
2021-05-25 09:37:55 +08:00 |
RuoYi
|
883cff5de9
|
新增IE浏览器版本过低提示页面
|
2021-05-24 14:15:41 +08:00 |
疯狂的狮子li
|
dc7eeaa45d
|
发布 2.1.2
|
2021-05-21 17:57:13 +08:00 |
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
2021-05-20 13:23:12 +08:00 |
疯狂的狮子li
|
72de8f57a7
|
发布 v2.1.1
|
2021-05-18 11:37:24 +08:00 |
RuoYi
|
b431703262
|
导出按钮点击之后添加遮罩
|
2021-05-17 15:37:58 +08:00 |
疯狂的狮子li
|
b366f8b053
|
update 修正更新说明错误
|
2021-05-15 14:55:21 +08:00 |
疯狂的狮子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 |
RuoYi
|
7e78a9167f
|
修改用户头像预览宽高
|
2020-12-06 16:22:45 +08:00 |
RuoYi
|
563e11d9c1
|
get请求params添加null值判断
|
2020-12-06 11:05:02 +08:00 |
疯狂的狮子li
|
e80349c343
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/utils/request.js
|
2020-12-04 11:46:29 +08:00 |
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
2020-12-04 10:52:20 +08:00 |
疯狂的狮子li
|
5ebd0a971f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-03 11:20:50 +08:00 |
RuoYi
|
23868c4fad
|
防止安全扫描YUI出现的风险提示
|
2020-12-03 10:26:22 +08:00 |
疯狂的狮子li
|
b36b413a69
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
|
2020-12-01 09:23:55 +08:00 |
RuoYi
|
3b2669d148
|
修改缓存监控内存单位
|
2020-11-30 19:27:03 +08:00 |
疯狂的狮子li
|
ce438f182a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/layout/components/AppMain.vue
ruoyi-ui/src/layout/components/TagsView/index.vue
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
sql/ry_20201128.sql
|
2020-11-30 12:41:39 +08:00 |