RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
2021-01-08 10:47:36 +08:00 |
RuoYi
|
7a86c714fc
|
代码生成支持文件上传组件
|
2021-01-06 11:00:09 +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
|
074b3c735d
|
设置单图上传控件
|
2021-01-05 16:17:41 +08:00 |
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
2021-01-05 16:13:22 +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
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
2021-01-04 17:48:46 +08:00 |
疯狂的狮子li
|
e9d368ed0c
|
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-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
2020-12-30 16:20:09 +08:00 |
RuoYi
|
63992ac906
|
代码生成数据库文本类型生成表单文本域
|
2020-12-29 11:14:48 +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 |
疯狂的狮子li
|
805c79506b
|
代码生成 后端支持 between
|
2020-12-18 17:46:05 +08:00 |
疯狂的狮子li
|
817da5bc04
|
修复export与list结果不统一问题
|
2020-12-18 16:50:58 +08:00 |
wangxianl
|
a514330db3
|
修复export与list结果不统一的问题
|
2020-12-18 15:47:07 +08:00 |
疯狂的狮子li
|
2b0cf24be4
|
修改 controller 生成器 解决where条件重复bug
|
2020-12-18 09:47:35 +08:00 |
疯狂的狮子li
|
b029a7265a
|
将controller条件查询器改完隐式泛型
|
2020-12-18 00:02:40 +08:00 |
wangzhijun
|
fe39a7bc7b
|
模板controller导入;模板vue列表页当有查询条件时报错
|
2020-12-09 16:16:53 +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
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.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/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-11-18 10:41:13 +08:00 |
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
2020-11-16 16:20:17 +08:00 |
疯狂的狮子li
|
93093d9f55
|
更改 MybatisPlus Lambda查询 改为官方推荐写法
|
2020-11-05 13:56:49 +08:00 |
疯狂的狮子li
|
30d15afd33
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/views/login.vue
sql/ry_20201021.sql
|
2020-10-23 17:41:02 +08:00 |
RuoYi
|
c9f25cb34e
|
调整sql默认时间
|
2020-10-21 11:30:37 +08:00 |
疯狂的狮子li
|
8ca53c7666
|
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/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/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/index.vue
|
2020-10-12 09:54:59 +08:00 |
RuoYi
|
b0965653bf
|
删除不必要的代码
|
2020-10-10 17:54:30 +08:00 |
疯狂的狮子li
|
cb92e41b76
|
修复生成树结构报错
|
2020-10-07 12:27:29 +08:00 |
疯狂的狮子li
|
aefa2095f0
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
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/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.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/SysRoleMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/router/index.js
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
sql/ry_20200920.sql
|
2020-09-22 13:22:30 +08:00 |
RuoYi
|
abeb8d7fd8
|
菜单新增是否缓存keep-alive
|
2020-09-20 10:34:03 +08:00 |
疯狂的狮子li
|
298fabfdec
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.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/resources/mapper/generator/GenTableColumnMapper.xml
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
2020-09-18 17:38:23 +08:00 |
RuoYi
|
0ecf27f8d6
|
去除多余的空格
|
2020-09-18 17:09:27 +08:00 |
RuoYi
|
9e38c7de2e
|
代码生成支持同步数据库
|
2020-09-18 10:24:21 +08:00 |
疯狂的狮子li
|
b111cbeedd
|
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/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-ui/src/views/tool/gen/editTable.vue
|
2020-09-16 09:23:02 +08:00 |
RuoYi
|
a948affb2d
|
代码生成支持富文本控件
|
2020-09-15 15:53:27 +08:00 |
疯狂的狮子li
|
1ef17bb582
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.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
|
2020-08-31 09:12:13 +08:00 |
RuoYi
|
dd6640086e
|
代码生成树模板去掉多余双引号
|
2020-08-27 17:34:06 +08:00 |
疯狂的狮子li
|
fdbe943053
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
|
2020-08-26 15:30:25 +08:00 |
RuoYi
|
a4e2339f90
|
生成页面时不忽略remark属性
|
2020-08-26 14:24:37 +08:00 |
疯狂的狮子li
|
1b82822d15
|
根据勾选列表是否显示 隐藏主键列
|
2020-08-19 17:32:34 +08:00 |
疯狂的狮子li
|
1cc8bc172b
|
修改代码生成 删除主键type注解配置 使用全局配置
|
2020-08-19 17:03:21 +08:00 |
疯狂的狮子li
|
5aeac1a8ae
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.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/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/utils/ruoyi.js
|
2020-08-19 17:01:43 +08:00 |
RuoYi
|
549c7ee97a
|
代码生成添加select必填选项
|
2020-08-18 18:15:12 +08:00 |
sunshine
|
04e294b3e5
|
代码生成:select的表单验证失效
|
2020-08-17 12:08:34 +08:00 |
疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
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
|
2020-08-12 10:16:29 +08:00 |
RuoYi
|
74f52677be
|
表格右侧工具栏组件
|
2020-08-10 10:12:39 +08:00 |
疯狂的狮子li
|
4044ed23ea
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-ui/src/components/Editor/index.vue
|
2020-08-10 09:38:28 +08:00 |
平凡
|
5b04f388e9
|
重写表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-09 11:07:10 +08:00 |
wanglei
|
c4ee9ea7c8
|
修复注释错误
|
2020-08-07 14:26:30 +08:00 |
疯狂的狮子li
|
c966d9bada
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.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/html/EscapeUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.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/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.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/vue/index.vue.vm
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
ruoyi-ui/babel.config.js
ruoyi-ui/package.json
ruoyi-ui/src/api/tool/gen.js
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/ruoyi.js
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/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
sql/ry_20200724.sql
|
2020-08-02 18:31:47 +08:00 |
RuoYi
|
4dcf737db0
|
表格工具栏右侧添加刷新&显隐查询栏
|
2020-08-01 15:45:38 +08:00 |
若依
|
5be8d46d05
|
!51 优化生成vue文件的vm模板文件
Merge pull request !51 from FungLeo/master
|
2020-07-31 16:49:51 +08:00 |
RuoYi
|
cbf4795fd5
|
表单类型为Integer/Long设置整形默认值
|
2020-07-30 21:47:50 +08:00 |
RuoYi
|
5d74ed32bd
|
表单类型为Integer/Long设置整形默认值
|
2020-07-30 16:03:44 +08:00 |
fungleo
|
ca657b0482
|
优化 index-tree.vue.vm 文件,undefined 修改为 null
|
2020-07-26 17:33:42 +08:00 |
fungleo
|
c1d1ace36d
|
优化index.vue.vm模板,!=1修改为严格不等;undefined修改为null
|
2020-07-26 17:29:40 +08:00 |
RuoYi
|
6e7d7aba93
|
代码生成支持自定义路径
|
2020-07-24 15:37:57 +08:00 |
RuoYi
|
388e36ed4d
|
优化参数
|
2020-07-23 21:45:22 +08:00 |
HR.Hu
|
ee4b4de7b1
|
修复 代码生成器默认mapper路径与默认mapperScan路径不一致的bug
|
2020-07-23 21:01:18 +08:00 |
RuoYi
|
5c6adb25fc
|
代码生成支持复选框
|
2020-07-23 17:02:55 +08:00 |
Sxile
|
be778ba370
|
修复参数注释
|
2020-07-23 14:54:11 +08:00 |
疯狂的狮子li
|
8a9a53225a
|
Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
2020-07-23 09:55:40 +08:00 |
疯狂的狮子li
|
e19e2fd9cc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.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/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/sql/sql.vm
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
ruoyi-ui/src/views/tool/gen/importTable.vue
|
2020-07-23 09:54:57 +08:00 |
疯狂的狮子li
|
8e1b8a3a3f
|
全注入 可能会出现小白乱用的情况 改成@Autowired构造注入
|
2020-07-22 18:46:34 +08:00 |
RuoYi
|
1e40e60dbf
|
支持CORS跨域请求
|
2020-07-22 15:25:42 +08:00 |
RuoYi
|
6a84ae42a5
|
代码生成支持选择上级菜单
|
2020-07-21 15:52:11 +08:00 |
RuoYi
|
b2d79b62d1
|
代码生成支持选择上级菜单
|
2020-07-21 11:21:20 +08:00 |
疯狂的狮子li
|
1e79d6f56f
|
同步升级3.0
|
2020-07-20 10:41:32 +08:00 |
RuoYi
|
cee572f237
|
若依 3.0
|
2020-07-19 10:25:40 +08:00 |