159 Commits

Author	SHA1	Message	Date
疯狂的狮子li	a129fafb69	update 更新多数据源与缓存 注意事项	2021-06-22 13:57:36 +08:00
疯狂的狮子li	85ae3a9420	update 对相关代码改动 进行调整	2021-06-18 15:31:38 +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
CharlieJohn	8bda10c23c	!54 fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误 ... * fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误	2021-06-17 09:30:52 +08:00
疯狂的狮子li	bb2ade75a8	update 升级 hutool 5.7.1 适配工具类	2021-06-16 15:38:44 +08:00
疯狂的狮子li	2cdc12055d	fix 修复 JsonUtils 参数为空报错	2021-06-16 13:15:18 +08:00
RuoYi	462862ba65	升级commons.io到最新版本v2.10.0	2021-06-16 09:52:38 +08:00
疯狂的狮子li	d98faaffee	update 移除 fastjson 增加 jackson 工具类 重写相关业务	2021-06-13 15:39:35 +08:00
疯狂的狮子li	5311937b69	update 增加 jackson 配置 默认序列化时间格式	2021-06-12 23:41:56 +08:00
疯狂的狮子li	a044519b21	update 移除 基础类 字段生成判断	2021-06-12 23:40:34 +08:00
疯狂的狮子li	b3541e9758	update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题	2021-06-12 20:13:35 +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	5e64a93d11	若依 3.5.0	2021-05-25 09:37:55 +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
朱杰	798ffd9065	fix 修复代码生成器中表字段取消必填无法更新问题	2021-05-22 23:29:15 +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	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
RuoYi	99726be9ac	修正导入表权限标识	2021-05-11 14:26:20 +08:00
疯狂的狮子li	98624e66e5	正式发布 1.0.0	2021-05-10 15:34:17 +08:00
疯狂的狮子li	1bef814c51	update 补全实体类 注入注解	2021-04-22 21:07:18 +08:00
疯狂的狮子li	a4f2aa1981	fix 代码生成器编辑问题	2021-04-19 19:01:26 +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	cb18eec802	修正模板字符编码	2021-04-18 15:45:49 +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
疯狂的狮子li	d69d1fbfe8	update 更新任务调度模块 与 代码生成模块 MP lombok 化	2021-04-12 17:49:56 +08:00