调整用户 avatar 更新接口

file/file-service/src/main/java/cn/reghao/tnb/file/app/controller/AvatarController.java

@@ -1,5 +1,7 @@
 package cn.reghao.tnb.file.app.controller;
 
+import cn.reghao.jutil.jdk.web.result.Result;
+import cn.reghao.jutil.jdk.web.result.ResultStatus;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;
 import cn.reghao.tnb.file.app.service.AvatarService;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,7 +34,13 @@ public class AvatarController {
     @Operation(summary = "更新账号头像", description = "N")
     @PostMapping(value = "/update", produces = MediaType.APPLICATION_JSON_VALUE)
     public String updateUserAvatar(@RequestBody @Validated AvatarUpdate avatarUpdate) throws Exception {
-        String avatarUrl = avatarService.updateAvatar(avatarUpdate);
-        return WebResult.success(Map.of("url", avatarUrl));
+        Result result = avatarService.updateAvatar(avatarUpdate);
+        if (result.getCode() == ResultStatus.FAIL.getCode()) {
+            return WebResult.result(result);
+        }
+
+        String avatarUrl = result.getData();
+        Map<String, String> map = Map.of("avatarUrl", avatarUrl);
+        return WebResult.success(map);
     }
 }

file/file-service/src/main/java/cn/reghao/tnb/file/app/service/AvatarService.java

@@ -2,6 +2,7 @@ package cn.reghao.tnb.file.app.service;
 
 import cn.reghao.file.api.dto.ObjectMeta;
 import cn.reghao.file.api.iface.OssService;
+import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;
@@ -23,16 +24,16 @@ public class AvatarService {
         this.ossService = ossService;
     }
 
-    public String updateAvatar(AvatarUpdate avatarUpdate) throws Exception {
+    public Result updateAvatar(AvatarUpdate avatarUpdate) throws Exception {
         String uploadId = avatarUpdate.getUploadId();
         ObjectMeta objectMeta = ossService.getObjectMeta(uploadId);
         if (objectMeta != null) {
             String avatarUrl = objectMeta.getUrl();
             long loginUser = UserContext.getUserId();
             accountQuery.updateAvatar(loginUser, avatarUrl);
-            return avatarUrl;
+            return Result.success(avatarUrl);
         }
 
-        return null;
+        return Result.fail("Object not exist");
     }
 }