疯狂的狮子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
|
4 years ago |
|
疯狂的狮子li
|
eaa3baab3c
|
update 代码生成编辑页面 拼写错误修正
|
4 years ago |
RuoYi
|
1a5881b1d0
|
修正服务监控磁盘变量
|
4 years ago |
|
疯狂的狮子li
|
071c4c1412
|
update 同步ruoyi适配改动
|
4 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
|
4 years ago |
|
RuoYi
|
258335cc65
|
新增通用方法简化模态/缓存使用
|
4 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
|
4 years ago |
|
RuoYi
|
a292cccb63
|
代码生成点击预览重置激活tab
|
4 years ago |
|
疯狂的狮子li
|
d54ab2733c
|
update 简化数据字典使用
|
4 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
|
4 years ago |
yjb
|
aaae404b2a
|
Cron表达式生成器关闭时销毁，避免再次打开时存在上一次修改的数据
|
4 years ago |
|
RuoYi
|
12ab8b03d9
|
使用vue-data-dict，简化数据字典使用
|
4 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
|
4 years ago |
|
若依
|
917bc03a43
|
!316 禁用DictTag中el-tag渐变动画
Merge pull request !316 from 马小法/master
|
4 years ago |
马小法
|
b84e7013d2
|
禁用el-tag组件的渐变动画
|
4 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
|
4 years ago |
|
RuoYi
|
db193a46e8
|
若依 3.7.0
|
4 years ago |
|
RuoYi
|
04c340627d
|
修复多图组件验证失败被删除问题
|
4 years ago |
|
疯狂的狮子li
|
c1c6c1cf30
|
update 将所有 云存储字样 改为 对象存储 避免误解
|
4 years ago |
|
RuoYi
|
15abd4d053
|
优化提示
|
4 years ago |
稚屿
|
d2b61762b7
|
修复代码生成页面数据编辑保存之后总是跳转第一页的问题
|
4 years ago |
|
RuoYi
|
a5e38f6f99
|
菜单管理支持配置路由参数
|
4 years ago |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
4 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
|
4 years ago |
|
linzh
|
b35f708c07
|
修正单词拼写错误
|
4 years ago |
|
RuoYi
|
0e6150720c
|
页签新增关闭左侧
|
4 years ago |
|
RuoYi
|
44adf03d2c
|
页签右键按钮添加图标
|
4 years ago |
|
RuoYi
|
9ae5edaa74
|
菜单&部门新增展开/折叠功能
|
4 years ago |
|
RuoYi
|
14c6c796e8
|
新增暗色菜单风格主题
|
4 years ago |
|
RuoYi
|
5d72f9d224
|
修复保存配置主题颜色失效问题
|
4 years ago |
|
RuoYi
|
e49f0cebf1
|
自定义弹层溢出滚动样式
|
4 years ago |
|
疯狂的狮子li
|
f566c39026
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/views/monitor/job/index.vue
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
ruoyi-ui/src/views/tool/gen/index.vue
|
4 years ago |
|
RuoYi
|
6361e4efdc
|
定时任务支持在线生成cron表达式
|
4 years ago |
|
疯狂的狮子li
|
80784433b8
|
remove 移除分页合理化参数 使用 MP 全局配置分页溢出
|
4 years ago |
|
疯狂的狮子li
|
76710e453e
|
update 分页合理化
|
4 years ago |
|
RuoYi
|
a15bfdfb46
|
防止表格最后页最后项删除变成暂无数据
|
4 years ago |
|
疯狂的狮子li
|
1a695159e3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PageDomain.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-ui/src/api/login.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
ruoyi-ui/src/views/tool/gen/index.vue
|
4 years ago |
|
RuoYi
|
ee823b8326
|
防止表格最后页最后项删除变成暂无数据
|
4 years ago |
|
疯狂的狮子li
|
adb31b71f8
|
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/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/dept/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
|
4 years ago |
|
马小法
|
8040ad8c03
|
修改数据字典回显
|
4 years ago |
|
疯狂的狮子li
|
bdfd2f0787
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java
ruoyi-ui/src/api/login.js
|
4 years ago |
|
RuoYi
|
4e8c6fb7c0
|
修复字典组件值为整形不显示问题
|
4 years ago |
|
RuoYi
|
134835c870
|
验证码默认20s超时
|
4 years ago |
|
疯狂的狮子li
|
5df5e63afe
|
update 解决 logout 写死 无法扩展路径问题
|
4 years ago |
wjtc8
|
89911e7caf
|
修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题
|
4 years ago |
|
疯狂的狮子li
|
72f3971ca2
|
update 重构 将下载excel工具提取到全局
|
4 years ago |
|
疯狂的狮子li
|
f91ebd93d2
|
update 重构 将下载excel工具提取到全局
|
4 years ago |
|
疯狂的狮子li
|
dea627f02c
|
update 更改用户注册页面标题名
|
4 years ago |
|
疯狂的狮子li
|
0c9a778736
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/directive/index.js
|
4 years ago |
|
RuoYi
|
d1ef19f08a
|
自定义可拖动弹窗高度指令
|
4 years ago |
