Commit e8e6024a2bd387b1b05c0dc6013284cccacf9295
1 parent
79f9f7b9
修复头像的 bug
Showing
5 changed files
with
13 additions
and
12 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/SysUserProfileController.java
| @@ -89,14 +89,14 @@ public class SysUserProfileController { | @@ -89,14 +89,14 @@ public class SysUserProfileController { | ||
| 89 | return success(true); | 89 | return success(true); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | - @PutMapping("/upload-avatar") | 92 | + @PutMapping("/update-avatar") |
| 93 | @ApiOperation("上传用户个人头像") | 93 | @ApiOperation("上传用户个人头像") |
| 94 | - public CommonResult<Boolean> updateUserAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException { | 94 | + public CommonResult<String> updateUserAvatar(@RequestParam("avatarFile") MultipartFile file) throws IOException { |
| 95 | if (file.isEmpty()) { | 95 | if (file.isEmpty()) { |
| 96 | throw ServiceExceptionUtil.exception(FILE_IS_EMPTY); | 96 | throw ServiceExceptionUtil.exception(FILE_IS_EMPTY); |
| 97 | } | 97 | } |
| 98 | - userService.updateUserAvatar(getLoginUserId(), file.getInputStream()); | ||
| 99 | - return success(true); | 98 | + String avatar = userService.updateUserAvatar(getLoginUserId(), file.getInputStream()); |
| 99 | + return success(avatar); | ||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | } | 102 | } |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserService.java
| @@ -63,7 +63,7 @@ public interface SysUserService { | @@ -63,7 +63,7 @@ public interface SysUserService { | ||
| 63 | * @param id 用户 id | 63 | * @param id 用户 id |
| 64 | * @param avatarFile 头像文件 | 64 | * @param avatarFile 头像文件 |
| 65 | */ | 65 | */ |
| 66 | - void updateUserAvatar(Long id, InputStream avatarFile); | 66 | + String updateUserAvatar(Long id, InputStream avatarFile); |
| 67 | 67 | ||
| 68 | /** | 68 | /** |
| 69 | * 修改密码 | 69 | * 修改密码 |
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java
| @@ -105,7 +105,7 @@ public class SysUserServiceImpl implements SysUserService { | @@ -105,7 +105,7 @@ public class SysUserServiceImpl implements SysUserService { | ||
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | @Override | 107 | @Override |
| 108 | - public void updateUserAvatar(Long id, InputStream avatarFile) { | 108 | + public String updateUserAvatar(Long id, InputStream avatarFile) { |
| 109 | this.checkUserExists(id); | 109 | this.checkUserExists(id); |
| 110 | // 存储文件 | 110 | // 存储文件 |
| 111 | String avatar = fileService.createFile(IdUtil.fastUUID(), IoUtil.readBytes(avatarFile)); | 111 | String avatar = fileService.createFile(IdUtil.fastUUID(), IoUtil.readBytes(avatarFile)); |
| @@ -114,6 +114,7 @@ public class SysUserServiceImpl implements SysUserService { | @@ -114,6 +114,7 @@ public class SysUserServiceImpl implements SysUserService { | ||
| 114 | sysUserDO.setId(id); | 114 | sysUserDO.setId(id); |
| 115 | sysUserDO.setAvatar(avatar); | 115 | sysUserDO.setAvatar(avatar); |
| 116 | userMapper.updateById(sysUserDO); | 116 | userMapper.updateById(sysUserDO); |
| 117 | + return avatar; | ||
| 117 | } | 118 | } |
| 118 | 119 | ||
| 119 | @Override | 120 | @Override |
yudao-admin-ui/src/api/system/user.js
| @@ -113,7 +113,7 @@ export function updateUserPwd(oldPassword, newPassword) { | @@ -113,7 +113,7 @@ export function updateUserPwd(oldPassword, newPassword) { | ||
| 113 | // 用户头像上传 | 113 | // 用户头像上传 |
| 114 | export function uploadAvatar(data) { | 114 | export function uploadAvatar(data) { |
| 115 | return request({ | 115 | return request({ |
| 116 | - url: '/system/user/profile/avatar', | 116 | + url: '/system/user/profile/update-avatar', |
| 117 | method: 'put', | 117 | method: 'put', |
| 118 | data: data | 118 | data: data |
| 119 | }) | 119 | }) |
yudao-admin-ui/src/views/system/user/profile/userAvatar.vue
| @@ -123,11 +123,11 @@ export default { | @@ -123,11 +123,11 @@ export default { | ||
| 123 | uploadImg() { | 123 | uploadImg() { |
| 124 | this.$refs.cropper.getCropBlob(data => { | 124 | this.$refs.cropper.getCropBlob(data => { |
| 125 | let formData = new FormData(); | 125 | let formData = new FormData(); |
| 126 | - formData.append("avatarfile", data); | ||
| 127 | - uploadAvatar(formData).then(response => { | 126 | + formData.append("avatarFile", data); |
| 127 | + uploadAvatar(formData).then(resp => { | ||
| 128 | this.open = false; | 128 | this.open = false; |
| 129 | - this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; | ||
| 130 | - store.commit('SET_AVATAR', this.options.img); | 129 | + // this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl; |
| 130 | + store.commit('SET_AVATAR', resp.data); | ||
| 131 | this.msgSuccess("修改成功"); | 131 | this.msgSuccess("修改成功"); |
| 132 | this.visible = false; | 132 | this.visible = false; |
| 133 | }); | 133 | }); |
| @@ -164,4 +164,4 @@ export default { | @@ -164,4 +164,4 @@ export default { | ||
| 164 | line-height: 110px; | 164 | line-height: 110px; |
| 165 | border-radius: 50%; | 165 | border-radius: 50%; |
| 166 | } | 166 | } |
| 167 | -</style> | ||
| 168 | \ No newline at end of file | 167 | \ No newline at end of file |
| 168 | +</style> |