innov
/
BootstrapAdmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'publish'

This commit is contained in:
Argo Windows 2019-10-19 16:11:42 +08:00
parent ecebc5cc15 3271a54185
commit 65bbf00d16
12 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -348,7 +348,7 @@ ASALocalRun/
# Net Core Keys
**/[Kk]eys/*.xml
Bootstrap.Admin.xml
Bootstrap.*.xml
###### -- Custom Ignore Section, Make sure all files you add to the git repo are below this line -- ######

1
Directory.Build.props
View File

@ -7,6 +7,7 @@
<LangVersion>latest</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)src\Keys\Longbow.Utility.snk</AssemblyOriginatorKeyFile>
<DocumentationFile>$(MSBuildProjectName).xml</DocumentationFile>
</PropertyGroup>
<Target Condition=" $(IsWebProject) == true " Name="PostPublish" AfterTargets="Publish">

6
src/admin/Bootstrap.Admin/Bootstrap.Admin.csproj
View File

@ -6,16 +6,16 @@
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>$(MSBuildProjectName).xml</DocumentationFile>
<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta10" />
<PackageReference Include="Longbow.Logging" Version="3.0.1-beta1" />
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1" />
<PackageReference Include="Longbow.Logging" Version="3.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.0.0-preview8.19405.7" />
<PackageReference Include="Sentry.AspNetCore" Version="2.0.0-beta4" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
</ItemGroup>
<ItemGroup>

4
src/admin/Bootstrap.Admin/Startup.cs
View File

@ -60,7 +60,7 @@ namespace Bootstrap.Admin
services.AddSignalR().AddJsonProtocol(op => op.PayloadSerializerOptions.AddDefaultConverters());
services.AddSignalRExceptionFilterHandler<SignalRHub>(async (client, ex) => await client.SendMessageBody(ex).ConfigureAwait(false));
services.AddResponseCompression();
services.AddBootstrapAdminAuthentication().AddGitee(OAuthHelper.Configure).AddGitHub(OAuthHelper.Configure);
services.AddBootstrapAdminAuthentication(Configuration).AddGitee(OAuthHelper.Configure).AddGitHub(OAuthHelper.Configure);
services.AddAuthorization(options => options.DefaultPolicy = new AuthorizationPolicyBuilder().RequireBootstrapAdminAuthorizate().Build());
services.AddSwagger();
services.AddButtonAuthorization(MenuHelper.AuthorizateButtons);
@ -107,7 +107,7 @@ namespace Bootstrap.Admin
app.UseStaticFiles();
app.UseAutoGenerateDatabase();
app.UseRouting();
app.UseBootstrapAdminAuthentication("", RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName);
app.UseBootstrapAdminAuthentication("0", RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName);
app.UseAuthorization();
app.UseSwagger(Configuration["SwaggerPathBase"].TrimEnd('/'));
app.UseOnlineUsers(TraceHelper.Filter, TraceHelper.Save);

4
src/admin/Bootstrap.DataAccess.MongoDB/Bootstrap.DataAccess.MongoDB.csproj
View File

@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0-beta1" />
<PackageReference Include="Bootstrap.Security" Version="3.0.0" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0" />
<PackageReference Include="MongoDB.Driver" Version="2.9.2" />
</ItemGroup>

24
src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
View File

@ -5,22 +5,22 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0-beta1" />
<PackageReference Include="Longbow" Version="3.0.0-beta6" />
<PackageReference Include="Longbow.Cache" Version="3.0.0-beta2" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Data" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.GiteeAuth" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.GitHubAuth" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.OAuth" Version="3.0.1-beta1" />
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0" />
<PackageReference Include="Longbow" Version="3.0.0" />
<PackageReference Include="Longbow.Cache" Version="3.0.0" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0" />
<PackageReference Include="Longbow.Data" Version="3.0.0" />
<PackageReference Include="Longbow.GiteeAuth" Version="3.0.0" />
<PackageReference Include="Longbow.GitHubAuth" Version="3.0.0" />
<PackageReference Include="Longbow.OAuth" Version="3.0.1" />
<PackageReference Include="Longbow.PetaPoco" Version="1.0.2" />
<PackageReference Include="Longbow.Security.Cryptography" Version="1.3.0" />
<PackageReference Include="Longbow.Tasks" Version="3.0.0-beta2" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta6" />
<PackageReference Include="Longbow.WeChatAuth" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Tasks" Version="3.0.0" />
<PackageReference Include="Longbow.Web" Version="3.0.0" />
<PackageReference Include="Longbow.WeChatAuth" Version="3.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
<PackageReference Include="PetaPoco.Extensions" Version="1.0.9" />
<PackageReference Include="PetaPoco.Extensions" Version="3.0.0" />
</ItemGroup>
</Project>

4
src/admin/Bootstrap.DataAccess/Helper/LoginHelper.cs
View File

@ -17,7 +17,9 @@ namespace Bootstrap.DataAccess
/// <summary>
/// 记录登陆日志方法
/// </summary>
/// <param name="userName"></param>
/// <param name="context"></param>
/// <param name="userName">登录用户名</param>
/// <param name="auth">是否登录成功</param>
/// <returns></returns>
public static bool Log(this HttpContext context, string userName, bool auth)
{

12
src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
View File

@ -5,12 +5,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0-beta1" />
<PackageReference Include="Longbow" Version="3.0.0-beta6" />
<PackageReference Include="Longbow.Cache" Version="3.0.0-beta2" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Data" Version="3.0.0-beta1" />
<PackageReference Include="Longbow.Web" Version="3.0.0-beta6" />
<PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.0" />
<PackageReference Include="Longbow" Version="3.0.0" />
<PackageReference Include="Longbow.Cache" Version="3.0.0" />
<PackageReference Include="Longbow.Configuration" Version="3.0.0" />
<PackageReference Include="Longbow.Data" Version="3.0.0" />
<PackageReference Include="Longbow.Web" Version="3.0.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
</ItemGroup>

5
src/client/Bootstrap.Client/Bootstrap.Client.csproj
View File

@ -6,9 +6,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1-beta10" />
<PackageReference Include="Longbow.Logging" Version="3.0.1-beta1" />
<PackageReference Include="Bootstrap.Security.Mvc" Version="3.0.1" />
<PackageReference Include="Longbow.Logging" Version="3.0.1" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
</ItemGroup>
<ItemGroup>

3
src/client/Bootstrap.Client/Models/ModelBase.cs
View File

@ -19,6 +19,9 @@ namespace Bootstrap.Client.Models
Theme = DictHelper.RetrieveActiveTheme();
}
/// <summary>
/// 获得 应用程序标识
/// </summary>
public string AppId { get; private set; }
/// <summary>

4
src/client/Bootstrap.Client/Startup.cs
View File

@ -53,7 +53,7 @@ namespace Bootstrap.Client
services.AddIPLocator(DictHelper.ConfigIPLocator);
services.AddOnlineUsers();
services.AddResponseCompression();
services.AddBootstrapAdminAuthentication();
services.AddBootstrapAdminAuthentication(Configuration);
services.AddAuthorization(options => options.DefaultPolicy = new AuthorizationPolicyBuilder().RequireBootstrapAdminAuthorizate().Build());
services.AddControllersWithViews(options => options.Filters.Add<ExceptionFilter>()).AddJsonOptions(op => op.JsonSerializerOptions.AddDefaultConverters());
services.AddAutoPublish();
@ -86,7 +86,7 @@ namespace Bootstrap.Client
app.UseCookiePolicy();
app.UseRouting();
app.UseBootstrapAdminAuthentication(Configuration.GetValue("AppId", "2"), RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName);
app.UseBootstrapAdminAuthentication("2", RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName);
app.UseAuthorization();
app.UseCacheManager();
app.UseOnlineUsers(callback: TraceHelper.Save);

2
test/UnitTest/UnitTest.csproj
View File

@ -18,7 +18,7 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="3.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Include="MySql.Data" Version="8.0.17" />
<PackageReference Include="MySql.Data" Version="8.0.18" />
<PackageReference Include="Npgsql" Version="4.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">