疯狂的狮子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
|
5 years ago |
|
疯狂的狮子li
|
ceeac476ec
|
update 优化 代码生成器 增加表单防重注解
|
5 years ago |
|
疯狂的狮子li
|
85bf5fbc9b
|
fix 修复主键列表显示 重复生成bug
|
5 years ago |
RuoYi
|
19924cd184
|
修复关闭confirm提示框控制台报错问题
|
5 years ago |
kdyzm
|
6b789e2eb0
|
优化新增、修改页面的按钮动作loading从页面loading到按钮loading
|
5 years ago |
|
疯狂的狮子li
|
329c95196e
|
update 更新测试案例
|
5 years ago |
|
kdyzm
|
9590de2c19
|
优化树生成的代码生成：增加loading、修改删除按钮的回调函数为箭头函数
|
5 years ago |
|
kdyzm
|
430addf520
|
【优化】为代码生成器生成的前端代码添加loading；删除方法回调函数变更为箭头表达式
|
5 years ago |
|
疯狂的狮子li
|
6192d42564
|
update 优化代码生成模板
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
5e64a93d11
|
若依 3.5.0
|
5 years ago |
|
RuoYi
|
7e79c4f249
|
生成vue模板导出按钮点击后添加遮罩
|
5 years ago |
|
RuoYi
|
56a943bf48
|
升级druid到最新版本v1.2.6
|
5 years ago |
朱杰
|
69dd3ab639
|
update 修改bo加入判断是否设置必填再加载必填注解
|
5 years ago |
|
朱杰
|
798ffd9065
|
fix 修复代码生成器中表字段取消必填无法更新问题
|
5 years ago |
刘立伟
|
d0a4d6b111
|
修正注释
|
5 years ago |
|
疯狂的狮子li
|
dab99405c5
|
update springboot 升级 2.3.10 依赖全面升级适配
|
5 years ago |
|
疯狂的狮子li
|
d2c745d3fd
|
add 代码生成器 增加校验注解
|
5 years ago |
|
疯狂的狮子li
|
6067cb1797
|
add 增加增强Mapper 重写业务适配
|
5 years ago |
|
疯狂的狮子li
|
0c7e52d9c3
|
update 代码生成器修改为MP分页(完成)
|
5 years ago |
|
疯狂的狮子li
|
81b50b9b3c
|
update 代码生成器修改为MP分页(未完成)
|
5 years ago |
|
疯狂的狮子li
|
7f73591742
|
fix 修复代码生成 数据权限问题
|
5 years ago |
|
疯狂的狮子li
|
f01bb5966a
|
update 使用 MP 分页工具 重构业务
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
99726be9ac
|
修正导入表权限标识
|
5 years ago |
|
疯狂的狮子li
|
98624e66e5
|
正式发布 1.0.0
|
5 years ago |
|
疯狂的狮子li
|
1bef814c51
|
update 补全实体类 注入注解
|
5 years ago |
|
疯狂的狮子li
|
a4f2aa1981
|
fix 代码生成器编辑问题
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
cb18eec802
|
修正模板字符编码
|
5 years ago |
|
疯狂的狮子li
|
bf5315d306
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
|
5 years ago |
Ricky
|
de73cf300b
|
优化树表代码生成模板
|
5 years ago |
|
Ricky
|
cbcee86d2c
|
优化树表代码生成模板
|
5 years ago |
|
疯狂的狮子li
|
927777291e
|
update 导出 Excel 工作表的名称修改
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
疯狂的狮子li
|
adeaa77864
|
update mp化
|
5 years ago |
|
RuoYi
|
fe2ccbdc1b
|
优化代码生成导出模板名称
|
5 years ago |
|
疯狂的狮子li
|
d69d1fbfe8
|
update 更新任务调度模块 与 代码生成模块 MP lombok 化
|
5 years ago |
lihy2021
|
6595c68df1
|
导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName}
|
5 years ago |
|
Ricky
|
5a2a0c09b6
|
优化主子表代码生成
|
5 years ago |
|
疯狂的狮子li
|
d48946ab90
|
fix bo缺包问题
|
5 years ago |
|
疯狂的狮子li
|
88841ac01f
|
update Date参数接收Bo实体格式转换
|
5 years ago |
|
疯狂的狮子li
|
c862484f00
|
update 默认增加editBo主键生成
|
5 years ago |
|
疯狂的狮子li
|
ccd48965a8
|
fix controller 接口路径问题
|
5 years ago |
|
疯狂的狮子li
|
b6472f3469
|
Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
5 years ago |
|
疯狂的狮子li
|
866c69e706
|
fix 代码生成器问题
|
5 years ago |
|
疯狂的狮子li
|
a50df84a72
|
fix 生成 remove 方法参数类型错误
|
5 years ago |
|
疯狂的狮子li
|
6760942218
|
fix Page 路径导入
|
5 years ago |
|
疯狂的狮子li
|
dfcd84c2bc
|
fix 数据权限语句null bug
|
5 years ago |
|
疯狂的狮子li
|
85e9534fae
|
add 增加数据权限注入
|
5 years ago |
|
疯狂的狮子li
|
4a1ff5a5ac
|
update 修改controller生成模板 规范代码结构
|
5 years ago |
|
疯狂的狮子li
|
222dfd1fe1
|
update 修改xml生成模板 附加domain类路径
|
5 years ago |
|
疯狂的狮子li
|
c1964b934f
|
update 简化queryById代码生成器
|
5 years ago |
|
疯狂的狮子li
|
77ffdf69a1
|
fix 修复 vo转换 分页bug
|
5 years ago |
|
疯狂的狮子li
|
e3bcc6b273
|
fix 查询类模板缺少导入包
|
5 years ago |
|
疯狂的狮子li
|
f156e0a094
|
update pr优化
|
5 years ago |
|
疯狂的狮子li
|
62464cfe45
|
fix Collection 验证失效问题
|
5 years ago |
|
疯狂的狮子li
|
7d47e1e81b
|
fix 表名转换问题
|
5 years ago |
wugh
|
3d6fbb93f5
|
!11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
|
5 years ago |
|
疯狂的狮子li
|
04e1dc351e
|
update 移除无用依赖
|
5 years ago |
|
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
5 years ago |
|
疯狂的狮子li
|
71325b540a
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application-prod.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
|
5 years ago |
|
RuoYi
|
c2e9200626
|
数据监控默认账户密码防止越权访问
|
5 years ago |
hh44h1144
|
c0f1569ad9
|
修复commons-collections引起的反序列化漏洞
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
5 years ago |
|
疯狂的狮子li
|
8ba1266b6a
|
修改 页面生成模板 适配后端时间格式
|
5 years ago |
|
疯狂的狮子li
|
9fdee373af
|
删除多余注解(@Data已包含)
|
5 years ago |
|
疯狂的狮子li
|
52325307f4
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
|
5 years ago |
|
RuoYi
|
bd19892aff
|
修复生成树表代码异常
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
14a859899c
|
代码生成模板支持主子表
|
5 years ago |
|
RuoYi
|
7a86c714fc
|
代码生成支持文件上传组件
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
edd090a098
|
代码生成支持文件上传组件
|
5 years ago |
|
RuoYi
|
074b3c735d
|
设置单图上传控件
|
5 years ago |
|
RuoYi
|
a118738d0f
|
单图上传组件添加移除
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
57a2eb4217
|
操作按钮组调整为朴素按钮样式
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
63992ac906
|
代码生成数据库文本类型生成表单文本域
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
a9c6ba12e6
|
代码生成日期控件区分范围
|
5 years ago |
|
疯狂的狮子li
|
805c79506b
|
代码生成 后端支持 between
|
5 years ago |
|
疯狂的狮子li
|
817da5bc04
|
修复export与list结果不统一问题
|
5 years ago |
wangxianl
|
a514330db3
|
修复export与list结果不统一的问题
|
5 years ago |
|
疯狂的狮子li
|
2b0cf24be4
|
修改 controller 生成器 解决where条件重复bug
|
5 years ago |
|
疯狂的狮子li
|
b029a7265a
|
将controller条件查询器改完隐式泛型
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
5 years ago |
wangzhijun
|
fe39a7bc7b
|
模板controller导入；模板vue列表页当有查询条件时报错
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
ef92ad4d8c
|
支持get请求映射params参数
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
5 years ago |
|
RuoYi
|
823e95667e
|
代码生成支持上传控件
|
5 years ago |
|
疯狂的狮子li
|
93093d9f55
|
更改 MybatisPlus Lambda查询 改为官方推荐写法
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
c9f25cb34e
|
调整sql默认时间
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
