疯狂的狮子li
|
785c7495c1
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-ui/src/App.vue
# ruoyi-ui/src/assets/styles/ruoyi.scss
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
|
3 years ago |
|
疯狂的狮子li
|
0358dc233a
|
update springboot 2.7.4 => 2.7.5
update springboot-admin 2.7.5 => 2.7.6
update springdoc 1.6.11 => 1.6.12
update poi 5.2.2 => 5.2.3
update hutool 5.8.7=>5.8.8
update aws-s3 1.12.300 => 1.12.324
update aliyun-sms 2.0.18 => 2.0.22
update tencent-sms 3.1.591 => 3.1.611
|
3 years ago |
RuoYi
|
e21396870f
|
修正菜单状态注释信息
|
3 years ago |
|
若依
|
b67f6a0fec
|
!604 修复小屏幕上修改头像界面布局错位的问题
Merge pull request !604 from 也曾为你、像超人/master
|
3 years ago |
|
若依
|
42d8104505
|
!603 update ruoyi-ui/src/views/system/user/index.vue.
Merge pull request !603 from kknd97/N/A
|
3 years ago |
|
若依
|
f40a0eab23
|
!601 swagger-ui静态资源缓存
Merge pull request !601 from abbfun/N/A
|
3 years ago |
刘元博
|
b6153d1aef
|
修正选择按钮宽度
|
3 years ago |
|
若依
|
a2c585daa4
|
!605 升级fastjson到最新版2.0.15
Merge pull request !605 from Rain/N/A
|
3 years ago |
Rain
|
5a60bf0b0a
|
升级fastjson到最新版2.0.15
Signed-off-by: Rain <938448486@qq.com>
|
3 years ago |
|
疯狂的狮子Li
|
d2e58ba46b
|
fix 修复 升级 nginx 1.21.6 => 1.22.1 修复漏洞 https://www.oschina.net/news/214309
|
3 years ago |
|
刘元博
|
9dcddc7876
|
修复小屏幕上修改头像界面布局错位的问题
|
3 years ago |
kknd97
|
b970185536
|
update ruoyi-ui/src/views/system/user/index.vue.
handleUpdate(row)方法中：this.form = response.data;语句
会导致【this.form.postIds = response.postIds;】和【this.form.roleIds = response.roleIds;】失效。
导致用户编辑对话框中，角色和部门多选框无法正常修改。
建议使用以下语句修改：
this.$set(this.form, "postIds", response.postIds);
this.$set(this.form, "roleIds", response.roleIds);
Signed-off-by: kknd97 <liujingwei@ln.chinamobile.com>
|
3 years ago |
|
疯狂的狮子li
|
98bb1f00ee
|
fix 修复 修改用户信息 校验用户名未排除当前用户问题
|
3 years ago |
abbfun
|
78f4d1c85b
|
swagger-ui静态资源缓存
Signed-off-by: abbfun <819589789@qq.com>
|
3 years ago |
|
RuoYi
|
bf83fe568b
|
修复主题颜色在Drawer组件不会加载问题(I5VCF0)
|
3 years ago |
|
疯狂的狮子Li
|
02f4fdb2e5
|
!241 【轻量级 PR】修正Excel导出字典值转换方法由于内部调用缓存不生效问题
Merge pull request !241 from MichelleChung/dev
|
3 years ago |
zlyx
|
cb61a84acb
|
fix 修正 SysConfig, SysOss 方法内部调用导致缓存不生效 bug ;
|
3 years ago |
|
zlyx
|
dc56e211e6
|
fix 修正Excel导出字典值转换方法由于内部调用缓存不生效 bug ;
|
3 years ago |
|
疯狂的狮子li
|
e4d33b7d13
|
fix 修复 补全增量sql脚本缺失的符号
|
3 years ago |
|
疯狂的狮子Li
|
f7de561ac5
|
update 优化 获取用户信息getInfo接口 使用缓存数据获取
|
3 years ago |
|
疯狂的狮子Li
|
fde624998f
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-ui/src/components/FileUpload/index.vue
|
3 years ago |
|
RuoYi
|
6505432bf4
|
修复文件上传组件格式验证问题(I5V32H)
|
3 years ago |
|
疯狂的狮子Li
|
7d953c1a8b
|
update 同步ruoyi
|
3 years ago |
|
疯狂的狮子Li
|
95010d4a4c
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# pom.xml
# ruoyi-admin/pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
# ruoyi-framework/pom.xml
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
# ruoyi-generator/pom.xml
# ruoyi-job/pom.xml
# ruoyi-system/pom.xml
# ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
# ruoyi-ui/package.json
# ruoyi-ui/src/views/index.vue
|
3 years ago |
|
RuoYi
|
a32a931d24
|
升级core-js到最新版本3.25.3
|
3 years ago |
|
RuoYi
|
4d72fb4289
|
R isError and isSuccess static
|
3 years ago |
|
若依
|
186c04d90a
|
!595 解决导出时包含空子列表数据异常的问题
Merge pull request !595 from 也曾为你、像超人/N/A
|
3 years ago |
|
疯狂的狮子li
|
84de5a5d42
|
update redisson 3.17.6 => 3.17.7 修复设置NameMapper导致队列功能异常问题
|
3 years ago |
|
疯狂的狮子Li
|
6fe80cff6b
|
fix 修复开启账号同端互斥登录 被顶掉后登出报null异常问题
|
3 years ago |
|
也曾为你、像超人
|
c542b7ac32
|
解决导出时包含空子列表数据异常的问题
Signed-off-by: 也曾为你、像超人 <1553592282@qq.com>
|
3 years ago |
|
RuoYi
|
3607e008a3
|
优化限流打印日志KEY(I5SQ09)
|
3 years ago |
|
RuoYi
|
5b8edbf381
|
修复代码生成勾选属性无效问题
|
3 years ago |
|
RuoYi
|
03f7bc0f3f
|
导入更新用户数据前校验数据权限
|
3 years ago |
|
疯狂的狮子li
|
0c54416040
|
fix 修复 snakeyaml 1.31 依旧存在漏洞 升级 1.32
|
3 years ago |
|
疯狂的狮子li
|
0d188d6a39
|
fix 修复 snakeyaml 漏洞 强制升级依赖版本(临时处理等boot升级)
|
3 years ago |
|
RuoYi
|
e95a1245c5
|
若依 3.8.4
|
3 years ago |
|
疯狂的狮子li
|
a3b761f4e0
|
update 优化 vue3说明文件 编码问题
|
3 years ago |
|
疯狂的狮子li
|
6e0c5817d5
|
update springboot 2.7.3 => 2.7.4
update springboot-admin 2.7.4 => 2.7.5
|
3 years ago |
|
疯狂的狮子Li
|
e410fc8c41
|
!238 【轻量级 PR】优化 Sa-Token 拦截器排除配置
Merge pull request !238 from MichelleChung/dev
|
3 years ago |
|
zlyx
|
9e7141f97c
|
update 优化 Sa-Token 拦截器注册 SaTokenConfig#addInterceptors 排除拦截路径配置, 优化说明 ;
|
3 years ago |
|
RuoYi
|
d7441edae7
|
升级core-js到最新版本3.25.2
|
3 years ago |
|
RuoYi
|
5053361a7f
|
升级fastjson到最新版2.0.14
|
3 years ago |
|
疯狂的狮子li
|
91c99d305c
|
update hutool 5.8.6 => 5.8.7
update tlog 1.4.3 => 1.5.0 安全性升级
|
3 years ago |
|
疯狂的狮子li
|
2c39f26de3
|
update 优化 替换 satoken 过期配置
|
3 years ago |
抓蛙师
|
a680a84d91
|
!236 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变）
* 完善前端适配多字段排序功能案例OSS页面（完善排序图标显示效果和重置效果，支持正序，倒序，取消排序）
* 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变）
|
3 years ago |
|
疯狂的狮子li
|
390edc5e3e
|
update 优化 oss管理 支持时间排序
|
3 years ago |
|
疯狂的狮子li
|
663024ac7f
|
update 优化 pr235 解决小问题与优化写法
|
3 years ago |
|
疯狂的狮子Li
|
0e75aa6250
|
!235 update 多排序参数支持
Merge pull request !235 from 抓蛙师/auto-7465549-dev-e641f38b
|
3 years ago |
|
抓蛙师
|
693a33f660
|
完善功能：前端可以配置多排序参数支持依次排序 如：{isAsc:"asc",orderByColumn:"id"}
{isAsc:"asc",orderByColumn:"id,createTime"}
{isAsc:"asc,desc",orderByColumn:"id,createTime"}
共三种配置方式
|
3 years ago |
|
MichelleChung
|
8af85e8066
|
!234 【轻量级 PR】使用 `@SaIgnore` 替换 `@Anonymous `
Merge pull request !234 from MichelleChung/dev
|
3 years ago |
