yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并啊啊

develop
old yi 2024-03-27 22:20:24 +08:00
parent 4aeba76c8a 5d47954b15
commit f055c08fa1
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
New_College.Api/Controllers/OAuthController.cs
View File

@ -6,6 +6,7 @@ using New_College.Common.Helper;
using New_College.IServices; using New_College.IServices;
using New_College.Model; using New_College.Model;
using New_College.Model.ViewModels; using New_College.Model.ViewModels;
using Newtonsoft.Json;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

18
New_College.Api/New_College.Api.csproj
View File

@ -14,13 +14,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>..\New_College.Api\New_College.xml</DocumentationFile> <DocumentationFile>..\New_College.Api\New_College.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<Optimize>True</Optimize>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>..\New_College\New_College.xml</DocumentationFile> <DocumentationFile>..\New_College\New_College.xml</DocumentationFile>
<NoWarn>1701;1702;1591</NoWarn> <NoWarn>1701;1702;1591</NoWarn>
<Optimize>False</Optimize>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -43,10 +41,6 @@
<None Remove="Middlewares\**" /> <None Remove="Middlewares\**" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Remove="appsettings.json" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<None Remove="index.html" /> <None Remove="index.html" />
</ItemGroup> </ItemGroup>
@ -58,21 +52,15 @@
<PackageReference Include="Microsoft.Graph.Core" Version="1.23.0" /> <PackageReference Include="Microsoft.Graph.Core" Version="1.23.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.10" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\New_College.Common\New_College.Common.csproj" />
<ProjectReference Include="..\New_College.Extensions\New_College.Extensions.csproj" /> <ProjectReference Include="..\New_College.Extensions\New_College.Extensions.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\.editorconfig" Link=".editorconfig" /> <None Include="..\.editorconfig" Link=".editorconfig" />
<None Include="appsettings.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<None Include="wwwroot\BlogCore.Data.json\BlogArticle.tsv" /> <None Include="wwwroot\BlogCore.Data.json\BlogArticle.tsv" />
<None Include="wwwroot\BlogCore.Data.json\Department.tsv" /> <None Include="wwwroot\BlogCore.Data.json\Department.tsv" />
<None Include="wwwroot\BlogCore.Data.json\Modules.tsv" /> <None Include="wwwroot\BlogCore.Data.json\Modules.tsv" />
@ -91,8 +79,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="appsettings.Development.json"> <Content Update="appsettings.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>