161 Commits

Author SHA1 Message Date
疯狂的狮子li
a044519b21 update 移除 基础类 字段生成判断 2021-06-12 23:40:34 +08:00
疯狂的狮子li
24da85fea3 update MybatisPlus整合Redis二级缓存 2021-06-10 21:18:58 +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
疯狂的狮子li
ceeac476ec update 优化 代码生成器 增加表单防重注解 2021-06-10 00:04:19 +08:00
疯狂的狮子li
85bf5fbc9b fix 修复主键列表显示 重复生成bug 2021-06-03 17:33:48 +08:00
RuoYi
19924cd184 修复关闭confirm提示框控制台报错问题 2021-06-03 13:24:29 +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
kdyzm
9590de2c19 优化树生成的代码生成:增加loading、修改删除按钮的回调函数为箭头函数 2021-06-02 17:08:00 +08:00
kdyzm
430addf520 【优化】为代码生成器生成的前端代码添加loading;删除方法回调函数变更为箭头表达式 2021-06-02 16:40:58 +08:00
疯狂的狮子li
6192d42564 update 优化代码生成模板 2021-05-30 02:18:34 +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
7e79c4f249 生成vue模板导出按钮点击后添加遮罩 2021-05-24 11:34:03 +08:00
RuoYi
56a943bf48 升级druid到最新版本v1.2.6 2021-05-24 11:24:54 +08:00
朱杰
69dd3ab639 update 修改bo加入判断是否设置必填再加载必填注解 2021-05-22 23:30:11 +08:00
刘立伟
d0a4d6b111 修正注释 2021-05-18 10:21:48 +08:00
疯狂的狮子li
dab99405c5 update springboot 升级 2.3.10 依赖全面升级适配 2021-05-14 16:58:09 +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
0c7e52d9c3 update 代码生成器修改为MP分页(完成) 2021-05-14 10:44:04 +08:00
疯狂的狮子li
81b50b9b3c update 代码生成器修改为MP分页(未完成) 2021-05-13 23:52:36 +08:00
疯狂的狮子li
7f73591742 fix 修复代码生成 数据权限问题 2021-05-13 22:43:14 +08:00
疯狂的狮子li
f01bb5966a update 使用 MP 分页工具 重构业务 2021-05-13 21:25:51 +08:00
疯狂的狮子li
bf5315d306 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 2021-04-16 11:34:39 +08:00
Ricky
de73cf300b 优化树表代码生成模板 2021-04-15 10:39:09 +08:00
Ricky
cbcee86d2c 优化树表代码生成模板 2021-04-15 10:37:22 +08:00
疯狂的狮子li
927777291e update 导出 Excel 工作表的名称修改 2021-04-14 14:36:27 +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
疯狂的狮子li
adeaa77864 update mp化 2021-04-14 12:01:26 +08:00
RuoYi
fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
lihy2021
6595c68df1 导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName} 2021-04-12 14:52:14 +08:00
Ricky
5a2a0c09b6 优化主子表代码生成 2021-04-12 13:26:54 +08:00
疯狂的狮子li
d48946ab90 fix bo缺包问题 2021-04-12 10:34:50 +08:00
疯狂的狮子li
88841ac01f update Date参数接收Bo实体格式转换 2021-04-09 11:47:51 +08:00
疯狂的狮子li
c862484f00 update 默认增加editBo主键生成 2021-04-08 16:29:35 +08:00
疯狂的狮子li
ccd48965a8 fix controller 接口路径问题 2021-04-04 20:01:36 +08:00
疯狂的狮子li
b6472f3469 Merge branch 'master' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus 2021-04-04 11:27:42 +08:00
疯狂的狮子li
866c69e706 fix 代码生成器问题 2021-04-04 11:27:08 +08:00
疯狂的狮子li
a50df84a72 fix 生成 remove 方法参数类型错误 2021-04-03 17:00:47 +08:00
疯狂的狮子li
6760942218 fix Page 路径导入 2021-04-02 23:05:44 +08:00
疯狂的狮子li
dfcd84c2bc fix 数据权限语句null bug 2021-04-02 15:44:02 +08:00
疯狂的狮子li
85e9534fae add 增加数据权限注入 2021-04-02 14:15:10 +08:00
疯狂的狮子li
4a1ff5a5ac update 修改controller生成模板 规范代码结构 2021-04-01 17:57:54 +08:00
疯狂的狮子li
222dfd1fe1 update 修改xml生成模板 附加domain类路径 2021-04-01 17:57:24 +08:00
疯狂的狮子li
c1964b934f update 简化queryById代码生成器 2021-03-31 16:51:24 +08:00
疯狂的狮子li
77ffdf69a1 fix 修复 vo转换 分页bug 2021-03-25 17:01:17 +08:00
疯狂的狮子li
e3bcc6b273 fix 查询类模板缺少导入包 2021-03-25 17:00:40 +08:00
疯狂的狮子li
f156e0a094 update pr优化 2021-03-22 13:32:20 +08:00
wugh
3d6fbb93f5 !11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
2021-03-22 09:32:49 +08:00
疯狂的狮子li
8ba1266b6a 修改 页面生成模板 适配后端时间格式 2021-01-28 09:22:25 +08:00