检查并添加租户管理员角色；

升级代码生成器，改进实体模型。
NewLifeX · Sep 10, 2023 · ef2c50e · ef2c50e
1 parent da234c6
commit ef2c50e
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 437 deletions.
diff --git a/CubeSSO/CubeSSO.csproj b/CubeSSO/CubeSSO.csproj
@@ -23,7 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.824-beta1618" />
+    <PackageReference Include="NewLife.Core" Version="10.5.2023.903" />
     <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.829-beta0552" />
   </ItemGroup>
 

diff --git a/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj b/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
@@ -49,7 +49,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="7.9.3" />
+    <PackageReference Include="BootstrapBlazor" Version="7.10.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/NewLife.Cube/Entity/Cube.xml b/NewLife.Cube/Entity/Cube.xml
diff --git a/NewLife.Cube/Entity/xcodetool.exe b/NewLife.Cube/Entity/xcodetool.exe
diff --git a/NewLife.Cube/NewLife.Cube.csproj b/NewLife.Cube/NewLife.Cube.csproj
@@ -83,7 +83,7 @@
     <Compile Include="..\NewLife.CubeNC\WebMiddleware\TenantMiddleware.cs" Link="WebMiddleware\TenantMiddleware.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.824-beta1618" />
+    <PackageReference Include="NewLife.Core" Version="10.5.2023.903" />
     <PackageReference Include="NewLife.IP" Version="2.1.2023.704-beta0221" />
     <PackageReference Include="NewLife.Stardust" Version="2.9.2023.829-beta0552" />
     <PackageReference Include="NewLife.XCode" Version="11.9.2023.829-beta0727" />

diff --git a/NewLife.CubeNC/Membership/ManagerProviderHelper.cs b/NewLife.CubeNC/Membership/ManagerProviderHelper.cs
@@ -100,6 +100,26 @@ public static void ChooseTenant(this HttpContext context, Int32 userId)
             else
                 SaveTenant(context, 0);
         }
+
+        CheckTenantRole();
+    }
+
+    private static Int32 _checkRole;
+    /// <summary>检查并添加租户管理员角色</summary>
+    private static void CheckTenantRole()
+    {
+        if (_checkRole > 0 || Interlocked.CompareExchange(ref _checkRole, 1, 0) != 0) return;
+
+        var role = Role.FindByName("租户管理员");
+        if (role == null)
+        {
+            role = new Role
+            {
+                Name = "租户管理员",
+                Enable = true,
+            };
+            role.Insert();
+        }
     }
 
     /// <summary>设置租户</summary>

diff --git a/NewLife.CubeNC/NewLife.CubeNC.csproj b/NewLife.CubeNC/NewLife.CubeNC.csproj
@@ -50,7 +50,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.824-beta1618" />
+    <PackageReference Include="NewLife.Core" Version="10.5.2023.903" />
     <PackageReference Include="NewLife.IP" Version="2.1.2023.704-beta0221" />
     <PackageReference Include="NewLife.Stardust" Version="2.9.2023.829-beta0552" />
     <PackageReference Include="NewLife.XCode" Version="11.9.2023.829-beta0727" />