fix: docker适应性修复

AicsKnowledgeBase_file/AicsKnowledgeBase_file.csproj

@@ -5,6 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+        <UserSecretsId>e5e584e4-bc5e-4ce3-b4ad-d9c46fe19967</UserSecretsId>
     </PropertyGroup>
 
     <ItemGroup>

AicsKnowledgeBase_file/Dockerfile

@@ -1,7 +1,6 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
-EXPOSE 80
+EXPOSE 8081/udp
-EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
@@ -16,5 +15,6 @@ RUN dotnet publish "AicsKnowledgeBase_file.csproj" -c Release -o /app/publish /p
 
 FROM base AS final
 WORKDIR /app
+VOLUME ["/app/ssl", "/app/files"]
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "AicsKnowledgeBase_file.dll"]

AicsKnowledgeBase_file/Handlers/UpdateFileMessageConsumerHandler.cs

@@ -25,7 +25,8 @@ public class UpdateFileMessageConsumerHandler : BackgroundService {
         _consumerConfig = new ConsumerConfig {
             BootstrapServers = _options.BootstrapServers,
             GroupId = _options.ConsumerGroupId,
-            AutoOffsetReset = AutoOffsetReset.Earliest
+            AutoOffsetReset = AutoOffsetReset.Earliest,
+            AllowAutoCreateTopics = true
         };
     }
 

AicsKnowledgeBase_file/Models/SslOptions.cs

@@ -0,0 +1,21 @@
+using System.Security.Cryptography.X509Certificates;
+
+namespace AicsKnowledgeBase_file.Models; 
+
+public class SslOptions {
+    public const string SectionName = "Ssl";
+    public string CertFilePath { get; set; } = null!;
+    public bool UseKeyFile { get; set; } = false;
+    public string? KeyFilePath { get; set; } = null;
+    public string? Password { get; set; } = null;
+    
+    public X509Certificate2 BuildServerCertificate() {
+        if (UseKeyFile && KeyFilePath != null) {
+            return X509Certificate2.CreateFromPemFile(CertFilePath, KeyFilePath);
+        }
+        if (Password != null) {
+            return new X509Certificate2(CertFilePath, Password);
+        }
+        throw new InvalidDataException("KeyFilePath and Password are both null.");
+    }
+}

AicsKnowledgeBase_file/Program.cs

@@ -1,16 +1,15 @@
 using System.Text.Json;
 using AicsKnowledgeBase_file.Handlers;
 using AicsKnowledgeBase_file.Models;
-using CommonResources;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 var builder = WebApplication.CreateBuilder(args);
-
+builder.WebHost.UseUrls("https://*:8081");
-builder.WebHost.ConfigureKestrel((context, options) => {
+builder.WebHost.UseKestrel((context, options) => {
-    options.ListenAnyIP(8090, listenOptions => {
+    options.ConfigureEndpointDefaults(listenOptions => {
         listenOptions.Protocols = HttpProtocols.Http1AndHttp2AndHttp3;
-        // listenOptions.Protocols = HttpProtocols.Http1AndHttp2;
+        listenOptions.UseHttps(builder.Configuration.GetSection(SslOptions.SectionName).Get<SslOptions>()!
-        listenOptions.UseHttps(Resources.GetServerCertificate());
+            .BuildServerCertificate());
     });
 });
 
@@ -34,6 +33,7 @@ if (app.Environment.IsDevelopment()) {
     app.UseSwagger();
     app.UseSwaggerUI();
 }
+
 app.MapGet("/hello", () => "hello");
 
 app.UseHttpsRedirection();

AicsKnowledgeBase_file/Properties/launchSettings.json

@@ -22,9 +22,7 @@
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
-      "launchBrowser": true,
+      "applicationUrl": "https://127.0.0.1:8081",
-      "launchUrl": "swagger",
-      "applicationUrl": "https://127.0.0.1:8090",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

AicsKnowledgeBase_file/appsettings.Development.json

@@ -5,7 +5,11 @@
     }
   },
   "Kafka": {
-    "BootstrapServers": "localhost:9094",
+    "BootstrapServers": "localhost:9094"
-    "ConsumerGroupId": "file-server"
+  },
+  "Ssl": {
+    "UseKeyFile": false,
+    "CertFilePath": "../CommonResources/ssl/ssl-rsa.pfx",
+    "Password": "auto"
   }
 }

AicsKnowledgeBase_file/appsettings.json

@@ -1,8 +1,15 @@
 {
   "Logging": {
     "LogLevel": {
-      "Default": "Information"
+      "Default": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "Kafka": {
+    "BootstrapServers": "kafka:9092",
+    "ConsumerGroupId": "file-server"
+  },
+  "Ssl": {
+    "UseKeyFile": true
+  }
 }

FileServerTests/UnitTest1.cs

@@ -12,9 +12,10 @@ public class UnitTest1 {
             DefaultVersionPolicy = HttpVersionPolicy.RequestVersionExact,
         };
 
-        Console.WriteLine("--- 127.0.0.1:8090 ---");
+        // Console.WriteLine("--- 127.0.0.1:8090 ---");
 
-        var resp = await client.GetAsync("https://127.0.0.1:8090/hello");
+        // var resp = await client.GetAsync("https://127.0.0.1:8090/hello");
+        var resp = await client.GetAsync("https://api.hammer-hfut.tk:233/aics/file/hello");
         var headers = new StringBuilder();
         foreach (var (headerName, headerValues) in resp.Headers) {
             headers.AppendLine($"{headerName}: {string.Join(", ", headerValues)}");

buildDockerImage.ps1

@@ -0,0 +1,2 @@
+docker build -f .\AicsKnowledgeBase_file\Dockerfile -t auto/aics_file:latest .
+pause