修改配置文件

2024-08-17 01:40:03 +08:00 · 2024-08-17 01:40:03 +08:00 · b082d9b1c3
commit b082d9b1c3
parent 3c6a8ccfca
19 changed files with 151 additions and 22 deletions
--- a/admin-server/.dockerignore
+++ 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/**
--- a/admin-server/MiaoYu.Api.Admin/Dockerfile
+++ 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"]
--- a/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj
+++ b/admin-server/MiaoYu.Api.Admin/MiaoYu.Api.Admin.csproj
@ -3,11 +3,12 @@
 	<Import Project="..\projects\project.targets" />

 	<PropertyGroup>
-		<!--aot-->
-		<!--<PublishAot>true</PublishAot>-->
-		<!--如果我们不需要全球化代码和数据，需要特定的代码和数据，并且使用不变模式-->
-		<!--<InvariantGlobalization>true</InvariantGlobalization>-->
-
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <PublishAot>false</PublishAot>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 	</PropertyGroup>

 	<ItemGroup>
--- 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"
+      }
+    }
  }
 }
--- 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;"

  }
--- 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"
      }
    }
  }
--- a/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj
+++ b/admin-server/MiaoYu.Core.CAP/MiaoYu.Core.CAP.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj
+++ b/admin-server/MiaoYu.Core.EntityFramework/MiaoYu.Core.EntityFramework.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj
+++ b/admin-server/MiaoYu.Core.Identity/MiaoYu.Core.Identity.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj
+++ b/admin-server/MiaoYu.Core.Logs/MiaoYu.Core.Logs.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj
+++ b/admin-server/MiaoYu.Core.QrCode/MiaoYu.Core.QrCode.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj
+++ b/admin-server/MiaoYu.Core.Quartz/MiaoYu.Core.Quartz.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj
+++ b/admin-server/MiaoYu.Core.Razor/MiaoYu.Core.Razor.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj
+++ b/admin-server/MiaoYu.Core.Redis/MiaoYu.Core.Redis.csproj
@ -1,6 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<Import Project="..\projects\project.targets" />
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <Import Project="..\projects\project.targets" />

 	<ItemGroup>
 		<ProjectReference Include="..\MiaoYu.Core\MiaoYu.Core.csproj" />
--- a/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj
+++ b/admin-server/MiaoYu.Core.Swagger/MiaoYu.Core.Swagger.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Core/MiaoYu.Core.csproj
+++ b/admin-server/MiaoYu.Core/MiaoYu.Core.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj
+++ b/admin-server/MiaoYu.Repository.Admin/MiaoYu.Repository.Admin.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj
+++ b/admin-server/MiaoYu.Shared.Admin/MiaoYu.Shared.Admin.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>
--- a/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj
+++ b/admin-server/MiaoYu.Shared/MiaoYu.Shared.csproj
@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
 	<Import Project="..\projects\project.targets" />

 	<ItemGroup>