Merge pull request #9 from myvas/alpha/3.1

huangxiangyao · web-flow · commit 327fe5827100 · 2019-12-14T12:46:56.000+08:00
Alpha/3.1
diff --git a/NuGet.Config b/NuGet.Config
@@ -4,6 +4,6 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="myvas-dev" value="https://www.myget.org/F/myvas-dev/api/v3/index.json" />
-    <add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
+    <add key="aspnetcore-dev" value="http://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/conf/BingSiteAuth.xml b/conf/BingSiteAuth.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<users>
+	<user>2DCEFB4A3920497180B9485B25F81B70</user>
+</users>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.0"
+    "version": "3.1"
   }
 }
diff --git a/src/Core/Demo.Data.Host/Demo.Data.Host.csproj b/src/Core/Demo.Data.Host/Demo.Data.Host.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core/Demo.Data.Host/Program.cs b/src/Core/Demo.Data.Host/Program.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace Demo.Data
@@ -14,18 +15,20 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args)
+            BuildWebHostBuilder(args).Build()
                 .MigrateDatabase()
                 .SeedDatabase()
                 .Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .ConfigureAppConfiguration(ConfigureAppConfiguration)
-                .ConfigureLogging(ConfigureLogging)
-                .UseStartup<Startup>()
-                .Build();
+        public static IHostBuilder BuildWebHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.ConfigureAppConfiguration(ConfigureAppConfiguration)
+                        .ConfigureLogging(ConfigureLogging)
+                        .UseStartup<Startup>();
+                });
 
         private static void ConfigureAppConfiguration(WebHostBuilderContext hostingContext, IConfigurationBuilder config)
         {
diff --git a/src/Core/Demo.Data/Data/AppDbInitializer.cs b/src/Core/Demo.Data/Data/AppDbInitializer.cs
@@ -16,10 +16,8 @@ public static class AppDbInitializer
 
         public static async Task Initialize(IServiceProvider serviceProvider)
         {
-            using (var db = new AppDbContext(serviceProvider.GetRequiredService<DbContextOptions<AppDbContext>>()))
-            {
-                await EnsureAdminUser(serviceProvider);
-            }
+            using var db = new AppDbContext(serviceProvider.GetRequiredService<DbContextOptions<AppDbContext>>());
+            await EnsureAdminUser(serviceProvider);
         }
 
         private static async Task EnsureAdminUser(IServiceProvider serviceProvider)
diff --git a/src/Core/Demo.Data/Data/HostDatabaseExtensions.cs b/src/Core/Demo.Data/Data/HostDatabaseExtensions.cs
@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/src/Core/Demo.Data/Demo.Data.csproj b/src/Core/Demo.Data/Demo.Data.csproj
@@ -1,10 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Demo.Shared\Demo.Shared.csproj" />
   </ItemGroup>
diff --git a/src/Core/Demo.Shared/Demo.Shared.csproj b/src/Core/Demo.Shared/Demo.Shared.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MvcDemo/.config/dotnet-tools.json b/src/MvcDemo/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "3.0.0",
+      "version": "3.1.0",
       "commands": [
         "dotnet-ef"
       ]
diff --git a/src/MvcDemo/Applications/IWeixinEventSink.cs b/src/MvcDemo/Applications/IWeixinEventSink.cs
diff --git a/src/MvcDemo/Applications/WeixinEventSink.cs b/src/MvcDemo/Applications/WeixinEventSink.cs
@@ -9,7 +9,7 @@
 
 namespace Demo.Applications
 {
-    public class WeixinEventSink : IWeixinEventSink
+    public class WeixinEventSink : WeixinEventSinkBase
 	{
 		private readonly ILogger<WeixinEventSink> _logger;
 		private readonly AppDbContext _db;
@@ -21,7 +21,7 @@ public WeixinEventSink(ILoggerFactory loggerFactory,
 			_db = db ?? throw new ArgumentNullException(nameof(db));
 		}
 
-		public async Task<bool> OnTextMessageReceived(object sender, TextMessageReceivedEventArgs e)
+		public override async Task<bool> OnTextMessageReceived(object sender, TextMessageReceivedEventArgs e)
 		{
 			_logger.LogDebug(XmlConvert.SerializeObject(e));
 
@@ -56,7 +56,7 @@ public async Task<bool> OnTextMessageReceived(object sender, TextMessageReceived
 			return true;
 		}
 
-		public async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceivedEventArgs e)
+		public override async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceivedEventArgs e)
 		{
 			_logger.LogInformation($"OnLinkMessageReceived: {e.Url}");
 
@@ -73,7 +73,7 @@ public async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceived
 			return true;
 		}
 
-		public async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceivedEventArgs e)
+		public override async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			var responseMessage = new ResponseMessageText();
@@ -85,7 +85,7 @@ public async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceiv
 			return true;
 		}
 
-		public async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMessageReceivedEventArgs e)
+		public override async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMessageReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			var responseMessage = new ResponseMessageText();
@@ -97,7 +97,7 @@ public async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMes
 			return true;
 		}
 
-		public async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceivedEventArgs e)
+		public override async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			var responseMessage = new ResponseMessageVoice();
@@ -112,7 +112,7 @@ public async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceiv
 			return true;
 		}
 
-		public async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceivedEventArgs e)
+		public override async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			var responseMessage = new ResponseMessageNews();
@@ -137,7 +137,7 @@ public async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceiv
 			return true;
 		}
 
-		public async Task<bool> OnLocationMessageReceived(object sender, LocationMessageReceivedEventArgs e)
+		public override async Task<bool> OnLocationMessageReceived(object sender, LocationMessageReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			var responseMessage = new ResponseMessageNews();
@@ -178,7 +178,7 @@ public async Task<bool> OnLocationMessageReceived(object sender, LocationMessage
 			return true;
 		}
 
-		public async Task<bool> OnLocationEventReceived(object sender, LocationEventReceivedEventArgs e)
+		public override async Task<bool> OnLocationEventReceived(object sender, LocationEventReceivedEventArgs e)
 		{
 			//这里是微信客户端（通过微信服务器）自动发送过来的位置信息
 			var messageHandler = sender as WeixinMessageHandler;
@@ -192,7 +192,7 @@ public async Task<bool> OnLocationEventReceived(object sender, LocationEventRece
 			return true;
 		}
 
-		public async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventReceivedEventArgs e)
+		public override async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventReceivedEventArgs e)
 		{
 			_logger.LogDebug("点击了子菜单按钮({0}): {1}", e.FromUserName, e.MenuItemKey);
 
@@ -206,7 +206,7 @@ public async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventRe
 			return true;
 		}
 
-		public async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventReceivedEventArgs e)
+		public override async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventReceivedEventArgs e)
 		{
 			_logger.LogDebug("点击了子菜单按钮({0}): {1}", e.FromUserName, e.Url);
 
@@ -220,7 +220,7 @@ public async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventRece
 			return true;
 		}
 
-		public async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEventReceivedEventArgs e)
+		public override async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEventReceivedEventArgs e)
 		{
 			_logger.LogDebug("Unsubscribe({0})", e.FromUserName);
 
@@ -234,7 +234,7 @@ public async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEve
 			return true;
 		}
 
-		public async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEventArgs e)
+		public override async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			_logger.LogDebug("Subscribe: from:{0}", e.FromUserName);
@@ -254,7 +254,7 @@ public async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEv
 			return true;
 		}
 
-		public async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventReceivedEventArgs e)
+		public override async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventReceivedEventArgs e)
 		{
 			var messageHandler = sender as WeixinMessageHandler;
 			if (string.IsNullOrWhiteSpace(e.EventKey))
@@ -294,7 +294,7 @@ public async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventRe
 			return true;
 		}
 
-		public async Task<bool> OnQrscanEventReceived(object sender, QrscanEventReceivedEventArgs e)
+		public override async Task<bool> OnQrscanEventReceived(object sender, QrscanEventReceivedEventArgs e)
 		{
 			_logger.LogDebug("Qrscan({0}): {1}, {2}", e.FromUserName, e.EventKey, e.Ticket);
 
diff --git a/src/MvcDemo/Demo.csproj b/src/MvcDemo/Demo.csproj
@@ -1,23 +1,24 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>Myvas.AspNetCore.Authentication.Demo</UserSecretsId>
     <RootNamespace>Demo</RootNamespace>
-    <AssemblyName>Demo</AssemblyName>    
-    <Version>3.0.100.1025</Version>
+    <AssemblyName>Demo</AssemblyName>
+    <Version>3.1.100.1214</Version>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
-    <PackageReference Include="Myvas.AspNetCore.Authentication.QQConnect" Version="3.0.100-alpha1" />
-    <PackageReference Include="Myvas.AspNetCore.Authentication.WeixinAuth" Version="3.0.100-alpha2" />
-    <PackageReference Include="Myvas.AspNetCore.Authentication.WeixinOpen" Version="3.0.100-alpha3" />
-    <PackageReference Include="Myvas.AspNetCore.TencentSms" Version="2.1.404" />
-    <PackageReference Include="Myvas.AspNetCore.ViewDivert" Version="2.1.507" />
-    <PackageReference Include="Myvas.AspNetCore.Weixin.Jssdk" Version="2.2.403" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
+    <PackageReference Include="Myvas.AspNetCore.Authentication.QQConnect" Version="3.1.0.1" />
+    <PackageReference Include="Myvas.AspNetCore.Authentication.WeixinAuth" Version="3.1.0.1" />
+    <PackageReference Include="Myvas.AspNetCore.Authentication.WeixinOpen" Version="3.1.0.1" />
+    <PackageReference Include="Myvas.AspNetCore.TencentSms" Version="3.1.0.1" />
+    <PackageReference Include="Myvas.AspNetCore.ViewDivert" Version="3.1.0.1" />
+    <PackageReference Include="Myvas.AspNetCore.Weixin" Version="3.1.100.5" />
+    <PackageReference Include="Myvas.AspNetCore.Weixin.Jssdk" Version="3.1.100.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/MvcDemo/Startup.cs b/src/MvcDemo/Startup.cs
@@ -98,7 +98,7 @@ public void ConfigureServices(IServiceCollection services)
                 options.AppId = Configuration["Weixin:AppId"];
             });
             services.AddScoped<IWeixinEventSink, WeixinEventSink>();
-            var weixinEventSink = services.BuildServiceProvider().GetRequiredService<IWeixinEventSink>();
+            IWeixinEventSink weixinEventSink = services.BuildServiceProvider().GetRequiredService<IWeixinEventSink>();
             services.AddWeixinWelcomePage(options =>
             {
                 options.AppId = Configuration["Weixin:AppId"];
diff --git a/src/MvcDemo/Views/Home/Index.cshtml b/src/MvcDemo/Views/Home/Index.cshtml
@@ -1,8 +1,10 @@
 ﻿@{
     ViewData["Title"] = "Demo";
+
+    var versionNumber = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
 }
 
-<h2 title="Myvas.AspNetCore.Authentication.Demo">@ViewData["Title"]</h2>
+<h2 title="Myvas.AspNetCore.Authentication.Demo">@ViewData["Title"] <small>@(versionNumber)</small></h2>
 
 <p>这是一组github开源项目的演示网站。本网站源代码在此：<a href="https://github.com/myvas/AspNetCore.Authentication.Demo.git">Myvas.AspNetCore.Authentication.Demo</a></p>
 <ul>
@@ -12,7 +14,7 @@
 </ul>
 
 <h3>部署环境</h3>
-<p>本程序部署在Debian.9-x64服务器上。</p>
+<p>本程序部署在Debian.10-x64服务器上。</p>
 <p><strong>注意：</strong>本程序必须部署公网服务器80端口上，并在相应微信公众号上配置好“网页服务/网页授权获取用户基本信息”才能正常工作。</p>
 <hr />
 <h3>触发身份验证</h3>
diff --git a/src/MvcDemo/Views/Shared/_Layout.cshtml b/src/MvcDemo/Views/Shared/_Layout.cshtml
@@ -3,11 +3,14 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    @*BingSiteAuth.xml: SEO for Bing*@
+    <meta name="msvalidate.01" content="2DCEFB4A3920497180B9485B25F81B70" />
     <title>@ViewData["Title"] - Demo</title>
 
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.min.css" />
 </head>
+
 <body>
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom box-shadow mb-3">
diff --git a/src/MvcDemo/libman.json b/src/MvcDemo/libman.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "3.0"`
	`3`	`+ "version": "3.1"`
`4`	`4`	`}`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,8 @@ public static class AppDbInitializer`
`16`	`16`
`17`	`17`	`public static async Task Initialize(IServiceProvider serviceProvider)`
`18`	`18`	`{`
`19`		`- using (var db = new AppDbContext(serviceProvider.GetRequiredService<DbContextOptions<AppDbContext>>()))`
`20`		`- {`
`21`		`- await EnsureAdminUser(serviceProvider);`
`22`		`- }`
	`19`	`+ using var db = new AppDbContext(serviceProvider.GetRequiredService<DbContextOptions<AppDbContext>>());`
	`20`	`+ await EnsureAdminUser(serviceProvider);`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`private static async Task EnsureAdminUser(IServiceProvider serviceProvider)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using Microsoft.AspNetCore.Hosting;`
`2`	`1`	`using Microsoft.EntityFrameworkCore;`
`3`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`4`	`3`	`using Microsoft.Extensions.Hosting;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"dotnet-ef": {`
`6`		`- "version": "3.0.0",`
	`6`	`+ "version": "3.1.0",`
`7`	`7`	`"commands": [`
`8`	`8`	`"dotnet-ef"`
`9`	`9`	`]`