545 Commits (2173ed504d2f3dc0f727c2b10230ee14ed0c9436)

Author SHA1 Message Date
疯狂的狮子Li 2173ed504d update 更新关于全局路径设置与文档链接 3 years ago
疯狂的狮子li 83ce927d16 add 前端增加 任务调度中心页面 与环境及nginx配置 3 years ago
疯狂的狮子li 60404a6564 update 调整不规范导包 3 years ago
疯狂的狮子li bb43b2853d update 前端增加默认国际化参数 3 years ago
疯狂的狮子li 64ec206ecb update 更改上传数据回填 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 4fdb0f48ec 同步element2.15.6表格样式 3 years ago
RuoYi f1fed76273 升级element-ui到最新版本2.15.6 3 years ago
疯狂的狮子li 3f142dd0fa 发布 v3.2.0 3 years ago
疯狂的狮子li 22b4f87232 Merge remote-tracking branch 'origin/dev' into dev 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
疯狂的狮子Li 49fc74be5d fix 修复更新问题 导出文件名乱码 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 99dcbe0207 update 封装通用下载方法简化下载使用 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 ded99502ae 新增通用方法简化下载使用 3 years ago
RuoYi 02b95f95a8 升级file-saver到最新版本2.0.5 3 years ago
RuoYi 2a6d2d733e 升级dart-sass到最新版本1.42.1 3 years ago
疯狂的狮子li 125547f08f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
	ruoyi-ui/src/views/monitor/server/index.vue
3 years ago
疯狂的狮子li eaa3baab3c update 代码生成编辑页面 拼写错误修正 3 years ago
RuoYi 1a5881b1d0 修正服务监控磁盘变量 3 years ago
疯狂的狮子li 071c4c1412 update 同步ruoyi适配改动 3 years ago
疯狂的狮子li 03b31652a2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/layout/components/Settings/index.vue
	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/online/index.vue
	ruoyi-ui/src/views/monitor/operlog/index.vue
	ruoyi-ui/src/views/monitor/server/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/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
	ruoyi-ui/src/views/tool/gen/importTable.vue
3 years ago
RuoYi 258335cc65 新增通用方法简化模态/缓存使用 3 years ago
疯狂的狮子Li 5306a45093 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
3 years ago
RuoYi a292cccb63 代码生成点击预览重置激活tab 3 years ago
疯狂的狮子li d54ab2733c update 简化数据字典使用 3 years ago
疯狂的狮子li 2f18d0d709 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
3 years ago
yjb aaae404b2a Cron表达式生成器关闭时销毁,避免再次打开时存在上一次修改的数据 3 years ago
RuoYi 12ab8b03d9 使用vue-data-dict,简化数据字典使用 3 years ago
疯狂的狮子li 2b53e9d86a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
3 years ago
若依 917bc03a43 !316 禁用DictTag中el-tag渐变动画
Merge pull request !316 from 马小法/master
3 years ago
马小法 b84e7013d2 禁用el-tag组件的渐变动画 3 years ago
疯狂的狮子li 2af534eea4 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/core/domain/entity/SysMenu.java
	ruoyi-framework/pom.xml
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Link.vue
	ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210908.sql
3 years ago
RuoYi db193a46e8 若依 3.7.0 3 years ago
RuoYi 04c340627d 修复多图组件验证失败被删除问题 3 years ago
疯狂的狮子li c1c6c1cf30 update 将所有 云存储字样 改为 对象存储 避免误解 3 years ago
RuoYi 15abd4d053 优化提示 3 years ago
稚屿 d2b61762b7 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 3 years ago
RuoYi a5e38f6f99 菜单管理支持配置路由参数 3 years ago
疯狂的狮子li ddf8d6ad6b 发布 v3.1.0 3 years ago
疯狂的狮子li ab4b75fe30 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/assets/styles/variables.scss
	ruoyi-ui/src/components/ThemePicker/index.vue
	ruoyi-ui/src/layout/components/Sidebar/Logo.vue
	ruoyi-ui/src/layout/components/Sidebar/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/store/modules/settings.js
	ruoyi-ui/src/store/modules/tagsView.js
	ruoyi-ui/src/views/tool/gen/index.vue
3 years ago
linzh b35f708c07 修正单词拼写错误 3 years ago
RuoYi 0e6150720c 页签新增关闭左侧 3 years ago
RuoYi 44adf03d2c 页签右键按钮添加图标 3 years ago
RuoYi 9ae5edaa74 菜单&部门新增展开/折叠功能 3 years ago
RuoYi 14c6c796e8 新增暗色菜单风格主题 3 years ago
RuoYi 5d72f9d224 修复保存配置主题颜色失效问题 3 years ago