Merge branch 'master' of https://gitea.nxsir.cn/nanxun/IM_NEW

ConnectorService/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 
 COPY IM_API_NEW.sln ./
@@ -17,7 +17,7 @@ RUN dotnet publish ConnectorService/ConnectorService.csproj \
     -o /app/publish \
     --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
 WORKDIR /app
 
 ENV ASPNETCORE_ENVIRONMENT=Production

ContactService.WebApi/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 
 COPY IM_API_NEW.sln ./
@@ -23,7 +23,7 @@ RUN dotnet publish ContactService.WebApi/ContactService.WebApi.csproj \
     -o /app/publish \
     --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
 WORKDIR /app
 
 ENV ASPNETCORE_ENVIRONMENT=Production

FileService.Application/UploadFileTask/UploadFileTaskService.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using FileService.Application.Ports;
+using FileService.Application.StorageContracts;
 using FileService.Domain.Entities;
 using FileService.Domain.IReposities;
 using IM.Commons;
@@ -23,6 +24,7 @@ namespace FileService.Application.UploadFileTask
         private readonly IObjectStorageRouter router = router;
         private readonly IOptions<StorageOptions> options = options;
         private readonly IStorageRedisCache redis = redis;
+        private readonly IObjectStoragePort storage = router.Route(options.Value.DefaultProviderCode);
 
         public async Task<Result<TaskInitResponse>> InitTaskAsync(UploadTaskInitCommand command)
         {
@@ -60,5 +62,25 @@ namespace FileService.Application.UploadFileTask
             return Result.Success(res);
 
         }
+
+        public async Task<Result<PresignedUrl>> GenerateUrlAsync(string sessionId, int partNum, Guid userId, CancellationToken token = default)
+        {
+            var taskCache = await redis.GetAsync(sessionId);
+            if(taskCache is null)
+            {
+                return Result.Fail<PresignedUrl>(ResultCode.CHUNK_NOT_FOUND);
+            }
+
+            var presignUrl = await storage.GenerateUploadUrlAsync(new GenerateUploadUrlCommand(
+                ProviderCode: taskCache.ProviderCode,
+                Bucket: taskCache.Bucket,
+                ObjectKey: taskCache.ObjectKey,
+                UploadSessionId: taskCache.UploadSessionId,
+                PartNumber: partNum,
+                ExpiresIn: options.Value.Providers[options.Value.DefaultProviderCode].UploadUrlExpiresIn
+                ), token);
+
+            return Result.Success(presignUrl);
+        }
     }
 }

GroupService.WebApi/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 
 COPY IM_API_NEW.sln ./
@@ -23,7 +23,7 @@ RUN dotnet publish GroupService.WebApi/GroupService.WebApi.csproj \
     -o /app/publish \
     --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
 WORKDIR /app
 
 ENV ASPNETCORE_ENVIRONMENT=Production

MessageService.WebApi/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 
 COPY IM_API_NEW.sln ./
@@ -23,7 +23,7 @@ RUN dotnet publish MessageService.WebApi/MessageService.WebApi.csproj \
     -o /app/publish \
     --no-restore
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
+FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/mcr.microsoft.com/dotnet/aspnet:8.0 AS runtime
 WORKDIR /app
 
 ENV ASPNETCORE_ENVIRONMENT=Production