From b082d9b1c39d647dcaef35e988b3e4270afd02f1 Mon Sep 17 00:00:00 2001 From: zpc Date: Sat, 17 Aug 2024 01:40:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-server/.dockerignore | 30 +++++++++++++++ admin-server/MiaoYu.Api.Admin/Dockerfile | 38 +++++++++++++++++++ .../MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj | 11 +++--- .../appsettings.Development.json | 8 ++++ .../appsettings.Production.json | 4 +- .../MiaoYu.Api.Admin/appsettings.json | 2 +- .../MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj | 6 ++- .../MiaoYu.Core.EntityFramework.csproj | 6 ++- .../MiaoYu.Core.Identity.csproj | 6 ++- .../MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj | 6 ++- .../MiaoYu.Core.QrCode.csproj | 6 ++- .../MiaoYu.Core.Quartz.csproj | 6 ++- .../MiaoYu.Core.Razor.csproj | 6 ++- .../MiaoYu.Core.Redis.csproj | 8 +++- .../MiaoYu.Core.Swagger.csproj | 6 ++- admin-server/MiaoYu.Core/MiaoYu.Core.csproj | 6 ++- .../MiaoYu.Repository.Admin.csproj | 6 ++- .../MiaoYu.Shared.Admin.csproj | 6 ++- .../MiaoYu.Shared/MiaoYu.Shared.csproj | 6 ++- 19 files changed, 151 insertions(+), 22 deletions(-) create mode 100644 admin-server/.dockerignore create mode 100644 admin-server/MiaoYu.Api.Admin/Dockerfile diff --git a/admin-server/.dockerignore b/admin-server/.dockerignore new file mode 100644 index 0000000..fe1152b --- /dev/null +++ b/admin-server/.dockerignore @@ -0,0 +1,30 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md +!**/.gitignore +!.git/HEAD +!.git/config +!.git/packed-refs +!.git/refs/heads/** \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/Dockerfile b/admin-server/MiaoYu.Api.Admin/Dockerfile new file mode 100644 index 0000000..8341b72 --- /dev/null +++ b/admin-server/MiaoYu.Api.Admin/Dockerfile @@ -0,0 +1,38 @@ +#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base +USER app +WORKDIR /app +EXPOSE 80 + +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build +ARG BUILD_CONFIGURATION=Release +WORKDIR /src +COPY ["MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj", "MiaoYu.Api.Admin/"] +COPY ["MiaoYu.Core.Cos/MiaoYu.Core.Cos.csproj", "MiaoYu.Core.Cos/"] +COPY ["MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj", "MiaoYu.Core.EntityFramework/"] +COPY ["MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj", "MiaoYu.Core.Identity/"] +COPY ["MiaoYu.Core/MiaoYu.Core.csproj", "MiaoYu.Core/"] +COPY ["MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj", "MiaoYu.Core.Quartz/"] +COPY ["MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj", "MiaoYu.Core.Razor/"] +COPY ["MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj", "MiaoYu.Core.Redis/"] +COPY ["MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj", "MiaoYu.Core.Swagger/"] +COPY ["MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj", "MiaoYu.Repository.Admin/"] +COPY ["MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj", "MiaoYu.Core.Logs/"] +COPY ["MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.csproj", "MiaoYu.Repository.ChatAI.Admin/"] +COPY ["MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj", "MiaoYu.Shared.Admin/"] +COPY ["MiaoYu.Shared/MiaoYu.Shared.csproj", "MiaoYu.Shared/"] +RUN ls +RUN dotnet restore "./MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj" +COPY . . +WORKDIR "/src/MiaoYu.Api.Admin" +RUN dotnet build "./MiaoYu.Api.Admin.csproj" -c $BUILD_CONFIGURATION -o /app/build + +FROM build AS publish +ARG BUILD_CONFIGURATION=Release +RUN dotnet publish "./MiaoYu.Api.Admin.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +ENTRYPOINT ["dotnet", "MiaoYu.Api.Admin.dll"] \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj index 1bb6acf..ac8bb82 100644 --- a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj +++ b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj @@ -3,11 +3,12 @@ - - - - - + net8.0 + enable + false + enable + True + Linux diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json index 94ff82f..275d541 100644 --- a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json +++ b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json @@ -27,5 +27,13 @@ "IsMonitorEFCore": true, "ConnectionString": "Server=192.168.195.2;Database=MiaoYu;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" + }, + //服务器配置 + "Kestrel": { + "Endpoints": { + "Http": { + "Url": "http://*:90" + } + } } } \ No newline at end of file diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Production.json b/admin-server/MiaoYu.Api.Admin/appsettings.Production.json index aa76fdc..637252f 100644 --- a/admin-server/MiaoYu.Api.Admin/appsettings.Production.json +++ b/admin-server/MiaoYu.Api.Admin/appsettings.Production.json @@ -9,7 +9,7 @@ //默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle "DefaultDatabaseType": "SqlServer", //是否监控EFCore程序 - "IsMonitorEFCore": true, + "IsMonitorEFCore": false, // 连接字符串 - mysql //"ConnectionString": "Server=localhost; port=3306; Database=hzy_admin_mysql_20230227; uid=root; pwd=123456; Convert Zero Datetime=False" //// 连接字符串 - sqlserver @@ -24,7 +24,7 @@ //默认数据库类型 SqlServer 、MySql 、PostgreSql、Oracle "DefaultDatabaseType": "SqlServer", //是否监控EFCore程序 - "IsMonitorEFCore": true, + "IsMonitorEFCore": false, "ConnectionString": "Server=192.168.195.2;Database=MiaoYu;User ID=zpc;Password=zpc;MultipleActiveResultSets=true;Encrypt=True;TrustServerCertificate=True;" } diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.json b/admin-server/MiaoYu.Api.Admin/appsettings.json index 0462b87..51a0f7c 100644 --- a/admin-server/MiaoYu.Api.Admin/appsettings.json +++ b/admin-server/MiaoYu.Api.Admin/appsettings.json @@ -73,7 +73,7 @@ "Kestrel": { "Endpoints": { "Http": { - "Url": "http://*:91" + "Url": "http://*:80" } } } diff --git a/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj b/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj index d15f7d2..6f116cf 100644 --- a/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj +++ b/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj b/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj index 7bca0f6..cc37d55 100644 --- a/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj +++ b/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj b/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj index 1a9c54d..b1a2197 100644 --- a/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj +++ b/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj b/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj index 9e4e931..1e74706 100644 --- a/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj +++ b/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj b/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj index 425a8cc..2d8f359 100644 --- a/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj +++ b/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj b/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj index af47c7a..2961933 100644 --- a/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj +++ b/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj b/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj index fc83d06..5e70ba8 100644 --- a/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj +++ b/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj b/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj index fc83d06..2a661a7 100644 --- a/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj +++ b/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj @@ -1,6 +1,10 @@  - - + + net8.0 + enable + enable + + diff --git a/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj b/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj index baad5da..84b524f 100644 --- a/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj +++ b/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Core/MiaoYu.Core.csproj b/admin-server/MiaoYu.Core/MiaoYu.Core.csproj index 4559e00..afc6574 100644 --- a/admin-server/MiaoYu.Core/MiaoYu.Core.csproj +++ b/admin-server/MiaoYu.Core/MiaoYu.Core.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj b/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj index a062a47..a161f05 100644 --- a/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj +++ b/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj b/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj index 32b0c48..adb5c1f 100644 --- a/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj +++ b/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable + diff --git a/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj b/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj index 751a8f0..1d3f239 100644 --- a/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj +++ b/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj @@ -1,5 +1,9 @@  - + + net8.0 + enable + enable +