From 53e8097d5760b2d613b381c31abb23724c178969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Thu, 30 Sep 2021 12:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0=20UserDataSeedCo?=
 =?UTF-8?q?ntributor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectNameHttpApiHostModule.cs                   | 11 -----------
 .../appsettings.json                                  |  2 +-
 .../Users/UserDataSeedContributor.cs                  |  3 ++-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs
index 579d5e7d..e747a15c 100644
--- a/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs
+++ b/aspnet-core/services/host/CompanyName.ProjectName.HttpApi.Host/ProjectNameHttpApiHostModule.cs
@@ -1,22 +1,17 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Text;
 using CompanyName.ProjectName.ConfigurationOptions;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.DataProtection;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using CompanyName.ProjectName.EntityFrameworkCore;
 using CompanyName.ProjectName.Extensions.Filters;
-using CompanyName.ProjectName.Jobs;
-using CompanyName.ProjectName.MultiTenancy;
 using CompanyNameProjectName.Extensions.Filters;
 using Hangfire;
 using Hangfire.MySql;
@@ -28,14 +23,11 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
 using Volo.Abp.BackgroundJobs;
 using Volo.Abp.BackgroundJobs.Hangfire;
-using Volo.Abp.Caching;
 using Volo.Abp.Caching.StackExchangeRedis;
-using Volo.Abp.Identity.AspNetCore;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.Swashbuckle;
@@ -43,10 +35,7 @@ using Volo.Abp.VirtualFileSystem;
 using System.Threading.Tasks;
 using CompanyName.ProjectName.CAP;
 using CompanyName.ProjectName.Extensions;
-using Volo.Abp.AspNetCore.MultiTenancy;
-using Volo.Abp.MultiTenancy;
 using CompanyName.ProjectName.Extensions.Customs.Http;
-using CompanyName.ProjectName.QueryManagement.ElasticSearch;
 using Savorboard.CAP.InMemoryMessageQueue;
 using Serilog;
 using Volo.Abp.AspNetCore.ExceptionHandling;
diff --git a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json
index 1f210a15..47063d9a 100644
--- a/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json
+++ b/aspnet-core/services/src/CompanyName.ProjectName.DbMigrator/appsettings.json
@@ -1,5 +1,5 @@
 {
   "ConnectionStrings": {
-    "Default": "Data Source=localhost;Database=CompanyNameProjectNameDB;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
+    "Default": "Data Source=localhost;Database=CompanyNameProjectName;uid=root;pwd=1q2w3E*;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true"
   }
 }
\ No newline at end of file
diff --git a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Users/UserDataSeedContributor.cs b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Users/UserDataSeedContributor.cs
index 99626693..550d9e10 100644
--- a/aspnet-core/services/src/CompanyName.ProjectName.Domain/Users/UserDataSeedContributor.cs
+++ b/aspnet-core/services/src/CompanyName.ProjectName.Domain/Users/UserDataSeedContributor.cs
@@ -21,11 +21,12 @@ namespace CompanyName.ProjectName.Users
 
         public async Task SeedAsync(DataSeedContext context)
         {
+            // abp 默认会锁定当前用户
             const string adminUserName = "admin";
             var adminUser = await _userManager.FindByNameAsync(adminUserName);
             if (adminUser != null)
             {
-                await _userManager.SetLockoutEndDateAsync(adminUser, DateTimeOffset.UtcNow.AddDays(-1));
+                await _userManager.SetLockoutEnabledAsync(adminUser, false);
             }
 
             var role = await _identityRoleManager.FindByNameAsync(adminUserName);