From 8a19f6168970784bcd91cc68a9bfc7dd94b3d0fa Mon Sep 17 00:00:00 2001 From: zyxucp <286513187@qq.com> Date: Tue, 10 Jun 2025 14:29:33 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8D=87=E7=BA=A7=E8=87=B3dotnet9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- Dockerfile-py | 4 ++-- src/AntSK.Domain/AntSK.Domain.csproj | 10 +++++----- src/AntSK.Domain/Domain/Service/KernelService.cs | 16 ++++++++-------- src/AntSK.LLM/AntSK.LLM.csproj | 8 ++++---- src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj | 2 +- src/AntSK.OCR/AntSK.OCR.csproj | 12 ++++++------ src/AntSK.Test/AntSK.Test.csproj | 2 +- src/AntSK/AntSK.csproj | 12 ++++++------ src/AntSK/README.md | 1 - src/Directory.Build.props | 1 + .../AntSK.BackgroundTask.csproj | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 src/AntSK/README.md diff --git a/Dockerfile b/Dockerfile index adf9ae8..8c00c8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src # Copy csproj and restore as distinct layers @@ -13,7 +13,7 @@ RUN dotnet build "AntSK.csproj" -c Release -o /app/build RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish # Runtime stage -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base WORKDIR /service EXPOSE 5000 diff --git a/Dockerfile-py b/Dockerfile-py index 4c01762..e174bb6 100644 --- a/Dockerfile-py +++ b/Dockerfile-py @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build WORKDIR /src COPY ["src/AntSK/AntSK.csproj", "AntSK/"] RUN dotnet restore "AntSK/AntSK.csproj" @@ -7,7 +7,7 @@ WORKDIR "/src/AntSK" RUN dotnet build "AntSK.csproj" -c Release -o /app/build RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish -FROM registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk-base:v1.0.0 AS final +FROM registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk-base:9.0.0 AS final WORKDIR /app COPY --from=build /app/publish . diff --git a/src/AntSK.Domain/AntSK.Domain.csproj b/src/AntSK.Domain/AntSK.Domain.csproj index 0a46dfa..f1e4711 100644 --- a/src/AntSK.Domain/AntSK.Domain.csproj +++ b/src/AntSK.Domain/AntSK.Domain.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable AntSK.Domain.xml @@ -13,13 +13,13 @@ - - - + + + - + diff --git a/src/AntSK.Domain/Domain/Service/KernelService.cs b/src/AntSK.Domain/Domain/Service/KernelService.cs index 0a31083..d3aedd3 100644 --- a/src/AntSK.Domain/Domain/Service/KernelService.cs +++ b/src/AntSK.Domain/Domain/Service/KernelService.cs @@ -102,21 +102,21 @@ namespace AntSK.Domain.Domain.Service var settings = chatModel.ModelKey.Split("|"); - Sdcb.SparkDesk.ModelVersion modelVersion = Sdcb.SparkDesk.ModelVersion.V3_5; + Sdcb.SparkDesk.ModelVersion modelVersion = Sdcb.SparkDesk.ModelVersion.Lite; switch (chatModel.ModelName) { - case "V3_5": - modelVersion = Sdcb.SparkDesk.ModelVersion.V3_5; + case "Max": + modelVersion = Sdcb.SparkDesk.ModelVersion.Max; break; - case "V3": - modelVersion = Sdcb.SparkDesk.ModelVersion.V3; + case "Pro": + modelVersion = Sdcb.SparkDesk.ModelVersion.Pro; break; case "V2": - modelVersion = Sdcb.SparkDesk.ModelVersion.V2; + modelVersion = Sdcb.SparkDesk.ModelVersion.V2_0; break; - case "V1_5": - modelVersion = Sdcb.SparkDesk.ModelVersion.V1_5; + case "Lite": + modelVersion = Sdcb.SparkDesk.ModelVersion.Lite; break; } diff --git a/src/AntSK.LLM/AntSK.LLM.csproj b/src/AntSK.LLM/AntSK.LLM.csproj index 7e84dcd..302172a 100644 --- a/src/AntSK.LLM/AntSK.LLM.csproj +++ b/src/AntSK.LLM/AntSK.LLM.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj b/src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj index 1e8930f..dd6e973 100644 --- a/src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj +++ b/src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable diff --git a/src/AntSK.OCR/AntSK.OCR.csproj b/src/AntSK.OCR/AntSK.OCR.csproj index 88a3d6d..d8b3709 100644 --- a/src/AntSK.OCR/AntSK.OCR.csproj +++ b/src/AntSK.OCR/AntSK.OCR.csproj @@ -1,19 +1,19 @@  - net8.0 + net9.0 enable enable - + - + - - - + + + diff --git a/src/AntSK.Test/AntSK.Test.csproj b/src/AntSK.Test/AntSK.Test.csproj index bfecdf3..18974e1 100644 --- a/src/AntSK.Test/AntSK.Test.csproj +++ b/src/AntSK.Test/AntSK.Test.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable diff --git a/src/AntSK/AntSK.csproj b/src/AntSK/AntSK.csproj index 9be4f04..89da377 100644 --- a/src/AntSK/AntSK.csproj +++ b/src/AntSK/AntSK.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable AntSK.xml @@ -19,11 +19,11 @@ - - - - - + + + + + diff --git a/src/AntSK/README.md b/src/AntSK/README.md deleted file mode 100644 index 0b3e560..0000000 --- a/src/AntSK/README.md +++ /dev/null @@ -1 +0,0 @@ -# AntSK \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ce49b30..313fa3b 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -5,5 +5,6 @@ 13.0.3 112.1.0 1.17.2 + 9.0.0 diff --git a/src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj b/src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj index 928f220..7524311 100644 --- a/src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj +++ b/src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj @@ -2,7 +2,7 @@ AntSK.BackgroundTask False - netstandard2.1 + net9.0 Preview