update file

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

@@ -3,6 +3,7 @@ package cn.reghao.tnb.file.app.rpc;
 import cn.reghao.file.api.dto.VideoMeta;
 import cn.reghao.file.api.dto.ObjectMeta;
 import cn.reghao.file.api.iface.OssService;
+import cn.reghao.oss.api.constant.IdType;
 import cn.reghao.oss.api.constant.ObjectAction;
 import cn.reghao.oss.api.dto.ObjectInfo;
 import cn.reghao.oss.api.dto.media.VideoInfo;
@@ -37,7 +38,7 @@ public class StoreServiceWrapperRouter implements OssService {
     @Override
     public void deleteByObjectId(String objectId) {
         try {
-            ossClientManager.getOssClient().deleteObject(objectId);
+            ossClientManager.getOssClient().deleteObject(IdType.ObjectId.name(), objectId);
         } catch (Exception e) {
             log.error("{}", e.getMessage());
         }
@@ -45,6 +46,14 @@ public class StoreServiceWrapperRouter implements OssService {
 
     @Override
     public void deleteByObjectUrl(String objectUrl) {
+        try {
+            String objectUrl0 = objectUrl.replace("//", "");
+            int idx = objectUrl0.indexOf("/");
+            String objectName = objectUrl0.substring(idx+1);
+            ossClientManager.getOssClient().deleteObject(IdType.ObjectName.name(), objectName);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     @Override

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

@@ -3,6 +3,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.dto.AccountInfo;
 import cn.reghao.tnb.auth.api.iface.AccountQuery;
 import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.file.app.model.dto.AvatarUpdate;
@@ -25,11 +26,15 @@ public class AvatarService {
     }
 
     public Result updateAvatar(AvatarUpdate avatarUpdate) {
+        long loginUser = UserContext.getUserId();
+        AccountInfo accountInfo = accountQuery.getAccountInfo(loginUser);
+        String avatarUrl0 = accountInfo.getAvatarUrl();
+        ossService.deleteByObjectUrl(avatarUrl0);
+
         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 Result.success(avatarUrl);
         }

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

@@ -1,6 +1,5 @@
 package cn.reghao.tnb.file.app.service;
 
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.io.FileSplitter;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.web.result.WebResult;
@@ -22,7 +21,6 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -327,16 +325,19 @@ public class OpenApiClient {
         }
         String videoId = webResult.getData();
 
-        String title = DateTimeConverter.format(LocalDateTime.now());
+        int categoryPid = 11;
+        int categoryId = 19;
+        int scope = 3;
+        String title = videoFile.getName();
         Map<String, Object> map1 = new HashMap<>();
         map1.put("videoId", videoId);
         map1.put("coverFileId", coverFileId);
         map1.put("title", title);
         map1.put("description", videoFile.getName());
-        map1.put("categoryPid", 1);
-        map1.put("categoryId", 2);
+        map1.put("categoryPid", categoryPid);
+        map1.put("categoryId", categoryId);
         map1.put("tags", List.of("tnb"));
-        map1.put("scope", 2);
+        map1.put("scope", scope);
 
         String path1 = "/api/open/content/vod/publish/post";
         String body1 = postRequest(path1, map1);