106 Commits (44bc7dd9a5360de59cbfdfeca55787afdb27b14b)

Author	SHA1	Message	Date
疯狂的狮子li	29c46a15f9	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: README.md pom.xml ruoyi-admin/pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java ruoyi-admin/src/main/resources/application.yml ruoyi-common/pom.xml ruoyi-framework/pom.xml ruoyi-generator/pom.xml ruoyi-job/pom.xml ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java ruoyi-system/pom.xml 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/mapper/SysPostMapper.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.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/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.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/SysPostMapper.xml ruoyi-ui/package.json ruoyi-ui/src/directive/index.js ruoyi-ui/src/plugins/download.js ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/monitor/online/index.vue ruoyi-ui/src/views/system/user/authRole.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/gen/basicInfoForm.vue ruoyi-ui/src/views/tool/gen/genInfoForm.vue	3 years ago
RuoYi	4644176e26	升级clipboard到最新版本2.0.8	3 years ago
RuoYi	6bfae2652f	若依 3.8.0	3 years ago
疯狂的狮子li	f43a5cb244	update 更改前端工程文件版本号	3 years ago
疯狂的狮子li	af25588b88	Merge remote-tracking branch 'ruoyi-vue/master' into dev ... # Conflicts: # pom.xml # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java # ruoyi-generator/pom.xml # 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/vm/js/api.js.vm # ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm # ruoyi-generator/src/main/resources/vm/vue/index.vue.vm # ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm # ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java # ruoyi-ui/package.json # ruoyi-ui/src/api/monitor/server.js # ruoyi-ui/src/components/RuoYi/Doc/index.vue # ruoyi-ui/src/components/RuoYi/Git/index.vue # ruoyi-ui/src/components/SizeSelect/index.vue # ruoyi-ui/src/layout/components/Sidebar/Logo.vue # ruoyi-ui/src/layout/components/TagsView/index.vue # ruoyi-ui/src/layout/index.vue # ruoyi-ui/src/main.js # ruoyi-ui/src/plugins/download.js # ruoyi-ui/src/router/index.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/store/modules/user.js # ruoyi-ui/src/views/login.vue # ruoyi-ui/src/views/monitor/job/log.vue # ruoyi-ui/src/views/system/dict/data.vue # ruoyi-ui/src/views/system/role/index.vue # ruoyi-ui/src/views/system/user/authRole.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	3 years ago
RuoYi	026a427103	优化前端代码	3 years ago
RuoYi	4f194aa101	升级js-cookie到最新版本3.0.1	3 years ago
疯狂的狮子li	ce279ca360	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm ruoyi-ui/package.json ruoyi-ui/src/utils/request.js	3 years ago
RuoYi	fcf606acde	升级jsencrypt到最新版本3.2.1	3 years ago
疯狂的狮子li	64add90edd	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java 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-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-generator/src/main/resources/vm/java/controller.java.vm ruoyi-generator/src/main/resources/vm/vue/index.vue.vm ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java ruoyi-ui/package.json ruoyi-ui/src/api/monitor/logininfor.js ruoyi-ui/src/api/monitor/operlog.js ruoyi-ui/src/api/system/config.js ruoyi-ui/src/api/system/dict/data.js ruoyi-ui/src/api/system/dict/type.js ruoyi-ui/src/api/system/post.js ruoyi-ui/src/api/system/role.js ruoyi-ui/src/api/system/user.js ruoyi-ui/src/main.js ruoyi-ui/src/utils/request.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/job/log.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/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue	3 years ago
RuoYi	cb9c0e79eb	升级core-js到最新版本3.19.1	3 years ago
RuoYi	4e817a1109	升级axios到最新版本0.24.0	3 years ago
疯狂的狮子li	d6e080d546	发布 v3.3.0	3 years ago
疯狂的狮子li	741a5b275b	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/views/monitor/server/index.vue	3 years ago
RuoYi	f1fed76273	升级element-ui到最新版本2.15.6	3 years ago
疯狂的狮子li	3f142dd0fa	发布 v3.2.0	3 years ago
疯狂的狮子li	ca5823fcdf	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-ui/package.json	3 years ago
RuoYi	25f50d74c5	升级sass-loader到最新版本10.1.1	3 years ago
RuoYi	266f4d6806	升级dart-sass到版本1.32.13	3 years ago
疯狂的狮子li	5a8d3ddef0	update 回退 dart-sass 新版报大量警告	3 years ago
疯狂的狮子li	75b22e9a23	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java 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/main.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/monitor/job/log.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/post/index.vue ruoyi-ui/src/views/system/role/index.vue ruoyi-ui/src/views/system/user/index.vue ruoyi-ui/src/views/tool/build/index.vue ruoyi-ui/src/views/tool/gen/index.vue	3 years ago
RuoYi	02b95f95a8	升级file-saver到最新版本2.0.5	3 years ago
RuoYi	2a6d2d733e	升级dart-sass到最新版本1.42.1	3 years ago
RuoYi	db193a46e8	若依 3.7.0	3 years ago
疯狂的狮子li	ddf8d6ad6b	发布 v3.1.0	3 years ago
疯狂的狮子li	a937e3f268	发布 v3.0.0	3 years ago
疯狂的狮子li	9bfa420a76	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/system/SysConfigController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java ruoyi-ui/package.json ruoyi-ui/src/views/system/menu/index.vue	3 years ago
RuoYi	fc60c003c3	升级element-ui到最新版本2.15.5	3 years ago
疯狂的狮子li	973471c63b	发布 v2.6.0	3 years ago
疯狂的狮子li	06944747fd	Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ... Conflicts: pom.xml ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java ruoyi-admin/src/main/resources/application.yml ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-ui/package.json ruoyi-ui/src/router/index.js ruoyi-ui/src/views/monitor/job/index.vue ruoyi-ui/src/views/system/dict/index.vue ruoyi-ui/src/views/system/menu/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/tool/gen/index.vue	3 years ago
RuoYi	9b1883988b	升级element-ui到最新版本2.15.3	3 years ago
疯狂的狮子li	eea8f33cf9	发布 v2.5.2 bug修复版 ... (cherry picked from commit b12bdd1f15)	3 years ago
疯狂的狮子li	55546dfc80	发布 v2.5.1 针对 v2.5.0 版本新特性bug修复	3 years ago
疯狂的狮子li	e085ec9418	发布 v2.5.0	3 years ago
RuoYi	170cfb356c	若依 3.6.0	3 years ago
疯狂的狮子li	8195e948a1	发布 v2.4.0	3 years ago
疯狂的狮子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	3 years ago
RuoYi	7601a72faf	升级element-ui到最新版本2.15.2	3 years ago
疯狂的狮子li	bf3a88ff1a	发版 v2.3.2	3 years ago
RuoYi	557672ba9f	系统布局配置支持动态标题开关	3 years ago
疯狂的狮子li	450c6759eb	发布 2.3.1	4 years ago
疯狂的狮子li	d815317d7c	发布 v2.3.0	4 years ago
疯狂的狮子li	57e071fe6b	发布 2.2.1	4 years ago
疯狂的狮子li	a570589dcc	发布 v2.2.0	4 years ago
RuoYi	5e64a93d11	若依 3.5.0	4 years ago
疯狂的狮子li	dc7eeaa45d	发布 2.1.2	4 years ago
疯狂的狮子li	72de8f57a7	发布 v2.1.1	4 years ago
疯狂的狮子li	b885e1eeff	发布 v2.1.0	4 years ago
疯狂的狮子li	e071b4315a	正式发布 v2.0.0	4 years ago
疯狂的狮子li	685504e1d0	版本更新 v1.0.2	4 years ago