文件表建加原文件名称字段name,相关代码修改

This commit is contained in:
谢华宁
2022-05-29 22:40:03 +08:00
parent 0fd5de2d73
commit 20411fa6b5
16 changed files with 37 additions and 31 deletions

View File

@ -97,12 +97,11 @@ public class UserProfileController {
@PutMapping("/update-avatar")
@ApiOperation("上传用户个人头像")
public CommonResult<String> updateUserAvatar(@RequestParam("avatarFile") MultipartFile file,
@RequestParam(value = "originalName", required = false) String originalName) throws Exception {
public CommonResult<String> updateUserAvatar(@RequestParam("avatarFile") MultipartFile file) throws Exception {
if (file.isEmpty()) {
throw ServiceExceptionUtil.exception(FILE_IS_EMPTY);
}
String avatar = userService.updateUserAvatar(getLoginUserId(), originalName, file.getInputStream());
String avatar = userService.updateUserAvatar(getLoginUserId(), file.getInputStream());
return success(avatar);
}

View File

@ -62,10 +62,9 @@ public interface AdminUserService {
* 更新用户头像
*
* @param id 用户 id
* @param originalName 原文件名称
* @param avatarFile 头像文件
*/
String updateUserAvatar(Long id, String originalName, InputStream avatarFile) throws Exception;
String updateUserAvatar(Long id, InputStream avatarFile) throws Exception;
/**
* 修改密码

View File

@ -153,10 +153,10 @@ public class AdminUserServiceImpl implements AdminUserService {
}
@Override
public String updateUserAvatar(Long id, String originalName, InputStream avatarFile) throws Exception {
public String updateUserAvatar(Long id, InputStream avatarFile) throws Exception {
checkUserExists(id);
// 存储文件
String avatar = fileApi.createFile(originalName,IoUtil.readBytes(avatarFile));
String avatar = fileApi.createFile(IoUtil.readBytes(avatarFile));
// 更新路径
AdminUserDO sysUserDO = new AdminUserDO();
sysUserDO.setId(id);

View File

@ -225,11 +225,10 @@ public class AdminUserServiceImplTest extends BaseDbUnitTest {
ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes);
// mock 方法
String avatar = randomString();
String originalName = "单测文件名";
when(fileApi.createFile(originalName, eq( avatarFileBytes))).thenReturn(avatar);
when(fileApi.createFile(eq( avatarFileBytes))).thenReturn(avatar);
// 调用
userService.updateUserAvatar(userId, originalName, avatarFile);
userService.updateUserAvatar(userId, avatarFile);
// 断言
AdminUserDO user = userMapper.selectById(userId);
assertEquals(avatar, user.getAvatar());