Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5

iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysProfileController.java

@@ -113,7 +113,8 @@ public class SysProfileController extends BaseController {
     @ApiOperation(value = "头像上传", notes = "头像上传")
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public AvatarVo avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+    public AvatarVo avatar(@RequestPart("avatarfile") MultipartFile avatarfile,
+                           @RequestParam("requestId") String requestId) {
         if (!avatarfile.isEmpty()) {
             String extension = FileUtil.extName(avatarfile.getOriginalFilename());
             if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {

iot-module/iot-system/src/main/java/cc/iotkit/system/service/impl/SysUserServiceImpl.java

@@ -273,7 +273,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public boolean updateUserAvatar(Long userId, Long avatar) {
-        return false;
+        SysUser oldUser = sysUserData.findById(userId);
+        oldUser.setAvatar(avatar);
+        sysUserData.save(oldUser);
+        return Boolean.TRUE;
     }
 
     @Override