Update Deploy

Author: yunomix2834

FileService/.idea/.idea.FileService/.idea/workspace.xml

@@ -37,7 +37,7 @@
     "MinioConfig": {
       "Endpoint": "minio",
       // giữ cho giao tiếp nội bộ
-      "PublicEndpoint": "codecampus.site",
+      "PublicEndpoint": "https://codecampus.site/s3",
       // cho browser truy cập
       "Port": 9000,
       "AccessKey": "${MINIO_ROOT_USER}",

FileService/FileService.Api/appsettings.Staging.json

@@ -146,16 +146,31 @@ public async Task UploadStreamAsync(string objectName, Stream fileStream, string
         }
         public Task<string> GetPublicFileUrlAsync(string objectName)
         {
-            if (string.IsNullOrWhiteSpace(objectName) || objectName.Any(c => "!@#$%^&*()".Contains(c)))
-            {
+            if (string.IsNullOrWhiteSpace(objectName))
                 throw new ArgumentException("Invalid object name", nameof(objectName));
-            }
 
-            var endpoint = !string.IsNullOrWhiteSpace(_config.PublicEndpoint) ? _config.PublicEndpoint : _config.Endpoint;// Ưu tiên PublicEndpoint
+            var key = Uri.EscapeDataString(objectName);
+
+            // Nếu có PublicEndpoint thì dùng nó làm base (có thể gồm scheme + path), KHÔNG thêm :port
+            var pub = _config.PublicEndpoint?.Trim().TrimEnd('/');
+            if (!string.IsNullOrEmpty(pub))
+            {
+                // Nếu thiếu scheme thì tự thêm theo cấu hình Secure
+                if (!pub.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+                    !pub.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+                {
+                    pub = $"{(_config.Secure ? "https" : "http")}://{pub}";
+                }
+                var url = $"{pub}/{_config.BucketName}/{key}";
+                Console.WriteLine($"Generated public URL: {url}");
+                return Task.FromResult(url);
+            }
 
-            var url = $"{(_config.Secure ? "https" : "http")}://{endpoint}:{_config.Port}/{_config.BucketName}/{objectName}";
-            Console.WriteLine($"Generated URL: {url}");
-            return Task.FromResult(url);
+            // Fallback: dùng endpoint nội bộ (có :port)
+            var scheme = _config.Secure ? "https" : "http";
+            var direct = $"{scheme}://{_config.Endpoint}:{_config.Port}/{_config.BucketName}/{key}";
+            Console.WriteLine($"Generated direct URL: {direct}");
+            return Task.FromResult(direct);
         }
 
         public async Task<string> GeneratePresignedUrlAsync(string objectName, int expirySeconds)

FileService/FileService.Service/Implementation/MinioService.cs

@@ -188,8 +188,7 @@ services:
       - MongoDbSettings__DatabaseName=${FILE_DATABASE}
       - AppSettings__ApiSettings__UserServiceBaseUrl=http://profile-service:8081
       - AppSettings__MinioConfig__Endpoint=minio
-      - AppSettings__MinioConfig__PublicEndpoint=codecampus.site
-      - AppSettings__MinioConfig__Port=9000
+      - AppSettings__MinioConfig__PublicEndpoint=https://codecampus.site/s3
       - AppSettings__MinioConfig__AccessKey=${MINIO_ROOT_USER}
       - AppSettings__MinioConfig__SecretKey=${MINIO_ROOT_PASSWORD}
       - AppSettings__MinioConfig__BucketName=codecampus2025