From e14c973a74ff6a0fa35376642bf3b9523cab5be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 16 Dec 2023 14:10:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Options/RbacOptions.cs                       | 16 ++++++++++++++++
 .../YiFrameworkRbacDomainSharedModule.cs         | 11 ++++++++++-
 .../DataSeeds/UserDataSeed.cs                    | 10 +++++++---
 Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs     |  4 +---
 Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json      |  6 ++++++
 5 files changed, 40 insertions(+), 7 deletions(-)
 create mode 100644 Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Options/RbacOptions.cs

diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Options/RbacOptions.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Options/RbacOptions.cs
new file mode 100644
index 00000000..5d082a29
--- /dev/null
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/Options/RbacOptions.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Rbac.Domain.Shared.Options
+{
+    public class RbacOptions
+    {
+        /// <summary>
+        /// 超级管理员默认密码
+        /// </summary>
+        public string AdminPassword { get; set; } = "123456";
+    }
+}
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/YiFrameworkRbacDomainSharedModule.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/YiFrameworkRbacDomainSharedModule.cs
index bccfbcfa..73d5fe3a 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/YiFrameworkRbacDomainSharedModule.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain.Shared/YiFrameworkRbacDomainSharedModule.cs
@@ -1,6 +1,9 @@
-using Volo.Abp.Domain;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Domain;
 using Volo.Abp.Modularity;
 using Yi.Framework.Mapster;
+using Yi.Framework.Rbac.Domain.Shared.Options;
 
 namespace Yi.Framework.Rbac.Domain.Shared
 {
@@ -9,6 +12,12 @@ namespace Yi.Framework.Rbac.Domain.Shared
         )]
     public class YiFrameworkRbacDomainSharedModule : AbpModule
     {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            var configuration = context.Services.GetConfiguration();
+            Configure<JwtOptions>(configuration.GetSection(nameof(JwtOptions)));
 
+            Configure<RbacOptions>(configuration.GetSection(nameof(RbacOptions)));
+        }
     }
 }
\ No newline at end of file
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs
index 4253a4c5..2183e868 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.SqlSugarCore/DataSeeds/UserDataSeed.cs
@@ -1,7 +1,9 @@
-using Volo.Abp.Data;
+using Microsoft.Extensions.Options;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Yi.Framework.Rbac.Domain.Entities;
 using Yi.Framework.Rbac.Domain.Shared.Enums;
+using Yi.Framework.Rbac.Domain.Shared.Options;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
@@ -9,9 +11,11 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
     public class UserDataSeed : IDataSeedContributor, ITransientDependency
     {
         private ISqlSugarRepository<UserEntity> _repository;
-        public UserDataSeed(ISqlSugarRepository<UserEntity> repository)
+        private RbacOptions _options;
+        public UserDataSeed(ISqlSugarRepository<UserEntity> repository, IOptions<RbacOptions> options)
         {
             _repository = repository;
+            _options = options.Value;
         }
         public async Task SeedAsync(DataSeedContext context)
         {
@@ -23,7 +27,7 @@ namespace Yi.Framework.Rbac.SqlSugarCore.DataSeeds
                     Name = "大橙子",
                     UserName = "cc",
                     Nick = "橙子",
-                    Password = "123456",
+                    Password = _options.AdminPassword,
                     Email = "454313500@qq.com",
                     Phone = 13800000000,
                     Sex = SexEnum.Male,
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
index a38c41d3..151f5d74 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
@@ -98,9 +98,7 @@ namespace Yi.Abp.Web
             });
 
             //jwt鉴权
-            var section = configuration.GetSection(nameof(JwtOptions));
-            Configure<JwtOptions>(section);
-            var jwtOptions = section.Get<JwtOptions>();
+            var jwtOptions = configuration.GetSection(nameof(JwtOptions)).Get<JwtOptions>();
             context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>
                 {
diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
index cce6973b..8ff87e80 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.json
@@ -36,5 +36,11 @@
     "Audience": "https://ccnetcore.com",
     "SecurityKey": "zqxwcevrbtnymu312412ihe9rfwhe78rh23djoi32hrui3ryf9e8wfh34iuj54y0934uti4h97fgw7hf97wyh8yy69520",
     "ExpiresMinuteTime": 86400
+  },
+
+  //Rbac模块
+  "RbacOptions": {
+    //超级管理员种子数据默认密码
+    "AdminPassword": "123456"
   }
 }