'合并'

src/main/java/com/futu/course/user/controller/UserController.java

@@ -32,10 +32,10 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserController {
     @Autowired
     private UserServiceImpl userService;
-//    @PostMapping("unload")
-//    public String unload(MultipartFile multipartFile,Long uid) throws ServerException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
-//        return userService.unload(multipartFile, uid);
-//    }
+    @PostMapping("unload")
+    public String unload(MultipartFile multipartFile,Long uid) throws ServerException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        return userService.unload(multipartFile, uid);
+    }
 
     @NonLoginRequired
     @PostMapping("wx_login")

src/main/java/com/futu/course/user/service/impl/UserServiceImpl.java

@@ -2,9 +2,11 @@ package com.futu.course.user.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.futu.course.minio.service.impl.FileServiceImpl;
 import com.futu.course.user.domain.User;
 import com.futu.course.user.service.UserService;
 import com.futu.course.user.mapper.UserMapper;
+import io.minio.errors.*;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
@@ -34,6 +36,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
@@ -42,6 +46,8 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -67,6 +73,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User>
     @Autowired
     private RedisTemplate redisTemplate;
 
+
+    @Autowired
+    private FileServiceImpl fileService;
+    public String unload(MultipartFile multipartFile, @RequestParam("uid") Long uid) throws ServerException, InvalidBucketNameException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+        User byId = this.getById(uid);
+        String s = fileService.uploadImage(multipartFile);
+        byId.setAvatar(s);
+        boolean b = this.updateById(byId);
+        return b?"修改成功":"修改失败";
+    }
+
     // 填写上你的AppID，如何获取AppID自行百度，这步骤很简单
     private final static String APP_ID = "wxdbcbc020c8e4b0d9";
     // 填写上你的AppSecret，如何获取AppSecret自行百度，这步骤很简单