Merge branch 'release/V1.0.0/test' of http://192.168.4.240:3000/LINK/LINK-SERVER into release/V2.0.0/test

src/main/java/com/lqkj/link/module/zone/controller/ResourceController.java

@@ -276,7 +276,7 @@ public class ResourceController {
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
         Integer userId = userInfoService.detailByUserCode(userCode).getUserId();
-        return MessageBean.ok(baseService.ossAddModel(file, "resource/model/" + userId + "/"), "oss上传");
+        return MessageBean.ok(baseService.ossAddModel(file, "resource/model/" + request.getLocalAddr() + "/" +  request.getLocalPort() + request.getContextPath() + "/" +  userId + "/"), "oss上传");
     }
 
 
@@ -289,6 +289,6 @@ public class ResourceController {
     public MessageBean<String> ossCheckCapacity(HttpServletRequest request){
         String authHeader = request.getHeader("Authorization");
         String userCode = jwtService.decryptUsernameWithHeader(authHeader);
-        return MessageBean.ok(resourceService.ossCheckCapacity(userCode), "检查容量");
+        return MessageBean.ok(resourceService.ossCheckCapacity(userCode, request), "检查容量");
     }
 }

src/main/java/com/lqkj/link/module/zone/service/ResourceService.java

@@ -9,6 +9,7 @@ import com.lqkj.link.module.zone.repository.ModelInfoRepository;
 import com.lqkj.link.util.AliOSSUtils;
 import com.lqkj.link.util.FileUtils;
 import com.lqkj.link.util.Unzipper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.compress.archivers.ArchiveException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -196,9 +197,9 @@ public class ResourceService {
      * @param userCode
      * @return
      */
-    public String ossCheckCapacity(String userCode) {
+    public String ossCheckCapacity(String userCode, HttpServletRequest request) {
         UserInfo userInfo = userInfoRepository.findByUserCode(userCode);
-        Long aLong = aliOSSUtils.ossCheckCapacity("resource/model/" + userInfo.getUserId() + "/");
+        Long aLong = aliOSSUtils.ossCheckCapacity("resource/model/" + request.getLocalAddr() + "/" +  request.getLocalPort() + request.getContextPath() + "/" +  userInfo.getUserId() + "/");
         return "个人库 已使用" + FileUtils.convertBytes(aLong) + "/20G";
     }
 }

src/main/java/com/lqkj/link/util/AliOSSUtils.java

@@ -44,7 +44,7 @@ public class AliOSSUtils {
         String fileName = "file/" + LocalDate.now() + "/" + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
         //上传文件到 OSS
         try {
-            Thread.sleep(200);
+            Thread.sleep(100);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -68,6 +68,11 @@ public class AliOSSUtils {
             String originalFilename = file.getOriginalFilename();
             String fileName = "file/" + LocalDate.now() + "/" + UUID.randomUUID() + originalFilename.substring(originalFilename.lastIndexOf("."));
             //上传文件到 OSS
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
             OSS ossClient = new OSSClientBuilder().build(aliProperties.getEndpoint(), aliProperties.getAccessKeyId(), aliProperties.getAccessKeySecret());
             threadPoolUtil.getTaskExecutor().execute(() -> {
                 ossClient.putObject(aliProperties.getBucketName(), fileName, inputStream);