220 Commits

Author	SHA1	Message	Date
疯狂的狮子li	ff5edc44ed	update 注释主子表选项 不推荐使用	2021-06-21 12:52:21 +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
疯狂的狮子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
疯狂的狮子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	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
疯狂的狮子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	98624e66e5	正式发布 1.0.0	2021-05-10 15:34:17 +08:00
RuoYi	50034301ac	添加新群号：201396349	2021-05-06 20:40:25 +08:00
疯狂的狮子li	5fcef39a2e	add 集成 spring-boot-admin 全方位监控	2021-04-22 15:04:35 +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	ff09e1cf55	数据监控默认地址修改	2021-04-13 18:15:11 +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