feat : Modify the inherited base class controller, modify the login interface, and upgrade the nuget package

KawhiWei · KawhiWei · commit d65d155113ff · 2021-06-18T22:57:40.000+08:00
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/AuditLogController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/AuditLogController.cs
@@ -6,7 +6,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using MongoDB.Bson;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Module.Core.AjaxResult;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.Entity;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/FunctionController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/FunctionController.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using Sukt.AspNetCore;
 using Sukt.Core.Application;
 using Sukt.Core.Dtos.Function;
+using Sukt.Core.Shared;
 using Sukt.Module.Core.AjaxResult;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.Entity;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/IdentityController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/IdentityController.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Sukt.Core.Application.LoginIdentity;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.LoginIdentity;
 using Sukt.Module.Core.OperationResult;
 using System.ComponentModel;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/IdentityServer4/ClientController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/IdentityServer4/ClientController.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Sukt.Core.Application.IdentityServer4Contract;
-using Sukt.AspNetCore;
 using Sukt.Core.Dtos.IdentityServer4Dto;
+using Sukt.Core.Shared;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.OperationResult;
 using System;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/MenuController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/MenuController.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Sukt.Core.Application;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.Menu;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.OperationResult;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/MenuFunctionController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/MenuFunctionController.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Sukt.Core.Application.MenuFunction;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.MenuFunction;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.OperationResult;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/MultiTenantController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/MultiTenantController.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Sukt.Core.Application.MultiTenant;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.MultiTenant;
 using Sukt.Module.Core.AjaxResult;
 using Sukt.Module.Core.Audit;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/OrganizationController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/OrganizationController.cs
@@ -1,4 +1,4 @@
-﻿using Sukt.AspNetCore;
+﻿using Sukt.Core.Shared;
 using System.ComponentModel;
 
 namespace Sukt.Core.API.Controllers
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/RoleController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/RoleController.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Sukt.Core.Application.Identity.Role;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.Identity.Role;
 using Sukt.Module.Core.AjaxResult;
 using Sukt.Module.Core.Audit;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/UpLoadController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/UpLoadController.cs
@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.Identity.Role;
 using Sukt.Module.Core.Entity;
 using System;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/UserController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/UserController.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Sukt.Core.Application;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.OperationResult;
diff --git a/Sukt.Core/src/Sukt.Core.API/Controllers/UserRoleController.cs b/Sukt.Core/src/Sukt.Core.API/Controllers/UserRoleController.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using Sukt.Core.Application.Identity.UserRole;
-using Sukt.AspNetCore;
+using Sukt.Core.Shared;
 using Sukt.Core.Dtos.Identity.UserRole;
 using Sukt.Module.Core.Audit;
 using Sukt.Module.Core.OperationResult;
diff --git a/Sukt.Core/src/Sukt.Core.API/Program.cs b/Sukt.Core/src/Sukt.Core.API/Program.cs
@@ -28,6 +28,7 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
+            //.UseServiceContext()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     //如果API项目需要接入GRPC服务需要配置两个Kestrel主机，分别指定两个不通端口，因为GRPC默认是使用https 
diff --git a/Sukt.Core/src/Sukt.Core.API/Startups/SuktAppWebModule.cs b/Sukt.Core/src/Sukt.Core.API/Startups/SuktAppWebModule.cs
@@ -43,7 +43,7 @@ public override void ConfigureServices(ConfigureServicesContext context)
             service.AddControllers(x =>
             {
                 x.SuppressAsyncSuffixInActionNames = false;
-                x.Filters.Add<PermissionAuthorizationFilter>();
+                //x.Filters.Add<PermissionAuthorizationFilter>();
                 x.Filters.Add<AuditLogFilter>();
             }).AddNewtonsoftJson(options =>
             {
diff --git a/Sukt.Core/src/Sukt.Core.API/Sukt.Core.API.csproj b/Sukt.Core/src/Sukt.Core.API/Sukt.Core.API.csproj
@@ -25,10 +25,10 @@
 
   <ItemGroup>
     <PackageReference Include="AspectCore.Extensions.Hosting" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.7" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -41,15 +41,16 @@
     <PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
     <PackageReference Include="Sukt.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="Sukt.Swagger" Version="1.0.1" />
-    <PackageReference Include="Sukt.SeriLog" Version="1.0.1" />
-    <PackageReference Include="Sukt.AspNetCore" Version="1.0.0" />
+    <PackageReference Include="Sukt.Swagger" Version="1.0.10" />
+    <PackageReference Include="Sukt.SeriLog" Version="1.0.10" />
+    <PackageReference Include="Sukt.AspNetCore" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Sukt.Core.Application\Sukt.Core.Application.csproj" />
     <ProjectReference Include="..\Sukt.Core.Dtos\Sukt.Core.Dtos.csproj" />
     <ProjectReference Include="..\Sukt.Core.EntityFrameworkCore.DbMigrations\Sukt.Core.EntityFrameworkCore.DbMigrations.csproj" />
+    <ProjectReference Include="..\Sukt.Core.Shared\Sukt.Core.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sukt.Core/src/Sukt.Core.Application/Test/TestBackJob.cs b/Sukt.Core/src/Sukt.Core.Application/Test/TestBackJob.cs
@@ -0,0 +1,18 @@
+﻿using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Sukt.Core.Application.Test
+{
+    public class TestBackJob : BackgroundService
+    {
+        protected override Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Sukt.Core/src/Sukt.Core.AuthenticationCenter/Program.cs b/Sukt.Core/src/Sukt.Core.AuthenticationCenter/Program.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
-
+using AspectCore.Extensions.Hosting;
 namespace Sukt.Core.AuthenticationCenter
 {
     public class Program
@@ -12,6 +12,7 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
+            //.UseServiceContext()
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
diff --git a/Sukt.Core/src/Sukt.Core.AuthenticationCenter/Sukt.Core.AuthenticationCenter.csproj b/Sukt.Core/src/Sukt.Core.AuthenticationCenter/Sukt.Core.AuthenticationCenter.csproj
@@ -8,7 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.6" />
+    <PackageReference Include="AspectCore.Extensions.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.7" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
   </ItemGroup>
 
diff --git a/Sukt.Core/src/Sukt.Core.AuthenticationCenter/wwwroot/css/newdemo.css b/Sukt.Core/src/Sukt.Core.AuthenticationCenter/wwwroot/css/newdemo.css
@@ -30,6 +30,13 @@ body {
     position: absolute;
     height: 100%;
     width: 100%;
+    color:white;
+}
+.welcome-page {
+    z-index:1200;
+}
+.nav-page {
+    z-index: 1200;
 }
 #content {
     position: absolute;
diff --git a/Sukt.Core/src/Sukt.Core.Domain.Models/Sukt.Core.Domain.Models.csproj b/Sukt.Core/src/Sukt.Core.Domain.Models/Sukt.Core.Domain.Models.csproj
@@ -4,9 +4,9 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.4" />
-    <PackageReference Include="Sukt.Module.Core" Version="1.0.2" />
-    <PackageReference Include="Sukt.AutoMapper" Version="1.0.0" />
+    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.10" />
+    <PackageReference Include="Sukt.Module.Core" Version="1.0.10" />
+    <PackageReference Include="Sukt.AutoMapper" Version="1.0.10" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sukt.Core.Identity\Sukt.Core.Identity.csproj" />
diff --git a/Sukt.Core/src/Sukt.Core.Domain.Repository/Sukt.Core.Domain.Repository.csproj b/Sukt.Core/src/Sukt.Core.Domain.Repository/Sukt.Core.Domain.Repository.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Sukt.MongoDB" Version="1.0.1" />
+    <PackageReference Include="Sukt.MongoDB" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sukt.Core/src/Sukt.Core.Domain.Services/Sukt.Core.Domain.Services.csproj b/Sukt.Core/src/Sukt.Core.Domain.Services/Sukt.Core.Domain.Services.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Sukt.Aop" Version="1.0.0" />
+    <PackageReference Include="Sukt.Aop" Version="1.0.10" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sukt.Core.Domain.Models\Sukt.Core.Domain.Models.csproj" />
diff --git a/Sukt.Core/src/Sukt.Core.EntityFrameworkCore/Sukt.Core.EntityFrameworkCore.csproj b/Sukt.Core/src/Sukt.Core.EntityFrameworkCore/Sukt.Core.EntityFrameworkCore.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0" />
-    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.6" />
-    <PackageReference Include="Sukt.Module.Core" Version="1.0.2" />
+    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.10" />
+    <PackageReference Include="Sukt.Module.Core" Version="1.0.10" />
   </ItemGroup>
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
diff --git a/Sukt.Core/src/Sukt.Core.Identity/Sukt.Core.Identity.csproj b/Sukt.Core/src/Sukt.Core.Identity/Sukt.Core.Identity.csproj
@@ -6,8 +6,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.6" />
-    <PackageReference Include="Sukt.Module.Core" Version="1.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.7" />
+    <PackageReference Include="Sukt.Module.Core" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sukt.Core/src/Sukt.Core.IdentityServer4Store/Sukt.Core.IdentityServer4Store.csproj b/Sukt.Core/src/Sukt.Core.IdentityServer4Store/Sukt.Core.IdentityServer4Store.csproj
@@ -7,8 +7,8 @@
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="IdentityServer4.Storage" Version="4.1.2" />
-    <PackageReference Include="Sukt.AutoMapper" Version="1.0.0" />
-    <PackageReference Include="Sukt.Module.Core" Version="1.0.2" />
+    <PackageReference Include="Sukt.AutoMapper" Version="1.0.10" />
+    <PackageReference Include="Sukt.Module.Core" Version="1.0.10" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Sukt.Core/src/Sukt.Core.Shared/ApiControllerBase.cs b/Sukt.Core/src/Sukt.Core.Shared/ApiControllerBase.cs
@@ -3,7 +3,7 @@
 
 namespace Sukt.Core.Shared
 {
-    [Route("api/[controller]/[action]")]
+    [Route("admin/[controller]/[action]")]
     [ApiController]
     public abstract class ApiControllerBase
     {
diff --git a/Sukt.Core/test/Sukt.Core.Test/Sukt.Core.Test.csproj b/Sukt.Core/test/Sukt.Core.Test/Sukt.Core.Test.csproj
@@ -16,11 +16,11 @@
     <Compile Remove="UnitTest1.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.4" />
-    <PackageReference Include="Sukt.Module.Core" Version="1.0.2" />
-    <PackageReference Include="Sukt.TestBase" Version="1.0.0" />
-    <PackageReference Include="Sukt.CodeGenerator" Version="1.0.0" />
-    <PackageReference Include="Sukt.MongoDB" Version="1.0.1" />
+    <PackageReference Include="Sukt.EntityFrameworkCore" Version="1.0.10" />
+    <PackageReference Include="Sukt.Module.Core" Version="1.0.10" />
+    <PackageReference Include="Sukt.TestBase" Version="1.0.10" />
+    <PackageReference Include="Sukt.CodeGenerator" Version="1.0.10" />
+    <PackageReference Include="Sukt.MongoDB" Version="1.0.10" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="appsettings.Development.json" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Sukt.AspNetCore;`
	`1`	`+using Sukt.Core.Shared;`
`2`	`2`	`using System.ComponentModel;`
`3`	`3`
`4`	`4`	`namespace Sukt.Core.API.Controllers`