Skip to content

Commit 327fe58

Browse files
huangxiangyaohuangxiangyao
authored
Merge pull request #9 from myvas/alpha/3.1
Alpha/3.1
2 parents a8c3e88 + b0d8194 commit 327fe58

17 files changed

+72
-83
lines changed

‎NuGet.Config

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<clear />
55
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
66
<add key="myvas-dev" value="https://www.myget.org/F/myvas-dev/api/v3/index.json" />
7-
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
7+
<add key="aspnetcore-dev" value="http://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
88
</packageSources>
99
</configuration>

‎conf/BingSiteAuth.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0"?>
2+
<users>
3+
<user>2DCEFB4A3920497180B9485B25F81B70</user>
4+
</users>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0"
3+
"version": "3.1"
44
}
55
}

‎src/Core/Demo.Data.Host/Demo.Data.Host.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<LangVersion>8.0</LangVersion>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/Core/Demo.Data.Host/Program.cs

+10-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.AspNetCore;
77
using Microsoft.AspNetCore.Hosting;
88
using Microsoft.Extensions.Configuration;
9+
using Microsoft.Extensions.Hosting;
910
using Microsoft.Extensions.Logging;
1011

1112
namespace Demo.Data
@@ -14,18 +15,20 @@ public class Program
1415
{
1516
public static void Main(string[] args)
1617
{
17-
BuildWebHost(args)
18+
BuildWebHostBuilder(args).Build()
1819
.MigrateDatabase()
1920
.SeedDatabase()
2021
.Run();
2122
}
2223

23-
public static IWebHost BuildWebHost(string[] args) =>
24-
WebHost.CreateDefaultBuilder(args)
25-
.ConfigureAppConfiguration(ConfigureAppConfiguration)
26-
.ConfigureLogging(ConfigureLogging)
27-
.UseStartup<Startup>()
28-
.Build();
24+
public static IHostBuilder BuildWebHostBuilder(string[] args) =>
25+
Host.CreateDefaultBuilder(args)
26+
.ConfigureWebHostDefaults(webBuilder =>
27+
{
28+
webBuilder.ConfigureAppConfiguration(ConfigureAppConfiguration)
29+
.ConfigureLogging(ConfigureLogging)
30+
.UseStartup<Startup>();
31+
});
2932

3033
private static void ConfigureAppConfiguration(WebHostBuilderContext hostingContext, IConfigurationBuilder config)
3134
{

‎src/Core/Demo.Data/Data/AppDbInitializer.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ public static class AppDbInitializer
1616

1717
public static async Task Initialize(IServiceProvider serviceProvider)
1818
{
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);
2321
}
2422

2523
private static async Task EnsureAdminUser(IServiceProvider serviceProvider)

‎src/Core/Demo.Data/Data/HostDatabaseExtensions.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Microsoft.AspNetCore.Hosting;
21
using Microsoft.EntityFrameworkCore;
32
using Microsoft.Extensions.DependencyInjection;
43
using Microsoft.Extensions.Hosting;

‎src/Core/Demo.Data/Demo.Data.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
</PropertyGroup>
77

8+
<ItemGroup>
9+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
10+
</ItemGroup>
11+
812
<ItemGroup>
913
<ProjectReference Include="..\Demo.Shared\Demo.Shared.csproj" />
1014
</ItemGroup>

‎src/Core/Demo.Shared/Demo.Shared.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<LangVersion>8.0</LangVersion>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎src/MvcDemo/.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "3.0.0",
6+
"version": "3.1.0",
77
"commands": [
88
"dotnet-ef"
99
]

‎src/MvcDemo/Applications/IWeixinEventSink.cs

-23
This file was deleted.

‎src/MvcDemo/Applications/WeixinEventSink.cs

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace Demo.Applications
1111
{
12-
public class WeixinEventSink : IWeixinEventSink
12+
public class WeixinEventSink : WeixinEventSinkBase
1313
{
1414
private readonly ILogger<WeixinEventSink> _logger;
1515
private readonly AppDbContext _db;
@@ -21,7 +21,7 @@ public WeixinEventSink(ILoggerFactory loggerFactory,
2121
_db = db ?? throw new ArgumentNullException(nameof(db));
2222
}
2323

24-
public async Task<bool> OnTextMessageReceived(object sender, TextMessageReceivedEventArgs e)
24+
public override async Task<bool> OnTextMessageReceived(object sender, TextMessageReceivedEventArgs e)
2525
{
2626
_logger.LogDebug(XmlConvert.SerializeObject(e));
2727

@@ -56,7 +56,7 @@ public async Task<bool> OnTextMessageReceived(object sender, TextMessageReceived
5656
return true;
5757
}
5858

59-
public async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceivedEventArgs e)
59+
public override async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceivedEventArgs e)
6060
{
6161
_logger.LogInformation($"OnLinkMessageReceived: {e.Url}");
6262

@@ -73,7 +73,7 @@ public async Task<bool> OnLinkMessageReceived(object sender, LinkMessageReceived
7373
return true;
7474
}
7575

76-
public async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceivedEventArgs e)
76+
public override async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceivedEventArgs e)
7777
{
7878
var messageHandler = sender as WeixinMessageHandler;
7979
var responseMessage = new ResponseMessageText();
@@ -85,7 +85,7 @@ public async Task<bool> OnVideoMessageReceived(object sender, VideoMessageReceiv
8585
return true;
8686
}
8787

88-
public async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMessageReceivedEventArgs e)
88+
public override async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMessageReceivedEventArgs e)
8989
{
9090
var messageHandler = sender as WeixinMessageHandler;
9191
var responseMessage = new ResponseMessageText();
@@ -97,7 +97,7 @@ public async Task<bool> OnShortVideoMessageReceived(object sender, ShortVideoMes
9797
return true;
9898
}
9999

100-
public async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceivedEventArgs e)
100+
public override async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceivedEventArgs e)
101101
{
102102
var messageHandler = sender as WeixinMessageHandler;
103103
var responseMessage = new ResponseMessageVoice();
@@ -112,7 +112,7 @@ public async Task<bool> OnVoiceMessageReceived(object sender, VoiceMessageReceiv
112112
return true;
113113
}
114114

115-
public async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceivedEventArgs e)
115+
public override async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceivedEventArgs e)
116116
{
117117
var messageHandler = sender as WeixinMessageHandler;
118118
var responseMessage = new ResponseMessageNews();
@@ -137,7 +137,7 @@ public async Task<bool> OnImageMessageReceived(object sender, ImageMessageReceiv
137137
return true;
138138
}
139139

140-
public async Task<bool> OnLocationMessageReceived(object sender, LocationMessageReceivedEventArgs e)
140+
public override async Task<bool> OnLocationMessageReceived(object sender, LocationMessageReceivedEventArgs e)
141141
{
142142
var messageHandler = sender as WeixinMessageHandler;
143143
var responseMessage = new ResponseMessageNews();
@@ -178,7 +178,7 @@ public async Task<bool> OnLocationMessageReceived(object sender, LocationMessage
178178
return true;
179179
}
180180

181-
public async Task<bool> OnLocationEventReceived(object sender, LocationEventReceivedEventArgs e)
181+
public override async Task<bool> OnLocationEventReceived(object sender, LocationEventReceivedEventArgs e)
182182
{
183183
//这里是微信客户端（通过微信服务器）自动发送过来的位置信息
184184
var messageHandler = sender as WeixinMessageHandler;
@@ -192,7 +192,7 @@ public async Task<bool> OnLocationEventReceived(object sender, LocationEventRece
192192
return true;
193193
}
194194

195-
public async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventReceivedEventArgs e)
195+
public override async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventReceivedEventArgs e)
196196
{
197197
_logger.LogDebug("点击了子菜单按钮({0}): {1}", e.FromUserName, e.MenuItemKey);
198198

@@ -206,7 +206,7 @@ public async Task<bool> OnClickMenuEventReceived(object sender, ClickMenuEventRe
206206
return true;
207207
}
208208

209-
public async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventReceivedEventArgs e)
209+
public override async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventReceivedEventArgs e)
210210
{
211211
_logger.LogDebug("点击了子菜单按钮({0}): {1}", e.FromUserName, e.Url);
212212

@@ -220,7 +220,7 @@ public async Task<bool> OnViewMenuEventReceived(object sender, ViewMenuEventRece
220220
return true;
221221
}
222222

223-
public async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEventReceivedEventArgs e)
223+
public override async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEventReceivedEventArgs e)
224224
{
225225
_logger.LogDebug("Unsubscribe({0})", e.FromUserName);
226226

@@ -234,7 +234,7 @@ public async Task<bool> OnUnsubscribeEventReceived(object sender, UnsubscribeEve
234234
return true;
235235
}
236236

237-
public async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEventArgs e)
237+
public override async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEventArgs e)
238238
{
239239
var messageHandler = sender as WeixinMessageHandler;
240240
_logger.LogDebug("Subscribe: from:{0}", e.FromUserName);
@@ -254,7 +254,7 @@ public async Task<bool> OnEnterEventReceived(object sender, EnterEventReceivedEv
254254
return true;
255255
}
256256

257-
public async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventReceivedEventArgs e)
257+
public override async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventReceivedEventArgs e)
258258
{
259259
var messageHandler = sender as WeixinMessageHandler;
260260
if (string.IsNullOrWhiteSpace(e.EventKey))
@@ -294,7 +294,7 @@ public async Task<bool> OnSubscribeEventReceived(object sender, SubscribeEventRe
294294
return true;
295295
}
296296

297-
public async Task<bool> OnQrscanEventReceived(object sender, QrscanEventReceivedEventArgs e)
297+
public override async Task<bool> OnQrscanEventReceived(object sender, QrscanEventReceivedEventArgs e)
298298
{
299299
_logger.LogDebug("Qrscan({0}): {1}, {2}", e.FromUserName, e.EventKey, e.Ticket);
300300

‎src/MvcDemo/Demo.csproj

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>Myvas.AspNetCore.Authentication.Demo</UserSecretsId>
66
<RootNamespace>Demo</RootNamespace>
7-
<AssemblyName>Demo</AssemblyName>
8-
<Version>3.0.100.1025</Version>
7+
<AssemblyName>Demo</AssemblyName>
8+
<Version>3.1.100.1214</Version>
99
<LangVersion>8.0</LangVersion>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
15-
<PackageReference Include="Myvas.AspNetCore.Authentication.QQConnect" Version="3.0.100-alpha1" />
16-
<PackageReference Include="Myvas.AspNetCore.Authentication.WeixinAuth" Version="3.0.100-alpha2" />
17-
<PackageReference Include="Myvas.AspNetCore.Authentication.WeixinOpen" Version="3.0.100-alpha3" />
18-
<PackageReference Include="Myvas.AspNetCore.TencentSms" Version="2.1.404" />
19-
<PackageReference Include="Myvas.AspNetCore.ViewDivert" Version="2.1.507" />
20-
<PackageReference Include="Myvas.AspNetCore.Weixin.Jssdk" Version="2.2.403" />
13+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
15+
<PackageReference Include="Myvas.AspNetCore.Authentication.QQConnect" Version="3.1.0.1" />
16+
<PackageReference Include="Myvas.AspNetCore.Authentication.WeixinAuth" Version="3.1.0.1" />
17+
<PackageReference Include="Myvas.AspNetCore.Authentication.WeixinOpen" Version="3.1.0.1" />
18+
<PackageReference Include="Myvas.AspNetCore.TencentSms" Version="3.1.0.1" />
19+
<PackageReference Include="Myvas.AspNetCore.ViewDivert" Version="3.1.0.1" />
20+
<PackageReference Include="Myvas.AspNetCore.Weixin" Version="3.1.100.5" />
21+
<PackageReference Include="Myvas.AspNetCore.Weixin.Jssdk" Version="3.1.100.5" />
2122
</ItemGroup>
2223

2324
<ItemGroup>

‎src/MvcDemo/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void ConfigureServices(IServiceCollection services)
9898
options.AppId = Configuration["Weixin:AppId"];
9999
});
100100
services.AddScoped<IWeixinEventSink, WeixinEventSink>();
101-
var weixinEventSink = services.BuildServiceProvider().GetRequiredService<IWeixinEventSink>();
101+
IWeixinEventSink weixinEventSink = services.BuildServiceProvider().GetRequiredService<IWeixinEventSink>();
102102
services.AddWeixinWelcomePage(options =>
103103
{
104104
options.AppId = Configuration["Weixin:AppId"];

‎src/MvcDemo/Views/Home/Index.cshtml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
@{
22
ViewData["Title"] = "Demo";
3+
4+
var versionNumber = System.Reflection.Assembly.GetEntryAssembly().GetName().Version;
35
}
46

5-
<h2 title="Myvas.AspNetCore.Authentication.Demo">@ViewData["Title"]</h2>
7+
<h2 title="Myvas.AspNetCore.Authentication.Demo">@ViewData["Title"] <small>@(versionNumber)</small></h2>
68

79
<p>这是一组github开源项目的演示网站。本网站源代码在此：<a href="https://github.com/myvas/AspNetCore.Authentication.Demo.git">Myvas.AspNetCore.Authentication.Demo</a></p>
810
<ul>
@@ -12,7 +14,7 @@
1214
</ul>
1315

1416
<h3>部署环境</h3>
15-
<p>本程序部署在Debian.9-x64服务器上。</p>
17+
<p>本程序部署在Debian.10-x64服务器上。</p>
1618
<p><strong>注意：</strong>本程序必须部署公网服务器80端口上，并在相应微信公众号上配置好“网页服务/网页授权获取用户基本信息”才能正常工作。</p>
1719
<hr />
1820
<h3>触发身份验证</h3>

‎src/MvcDemo/Views/Shared/_Layout.cshtml

+3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
@*BingSiteAuth.xml: SEO for Bing*@
7+
<meta name="msvalidate.01" content="2DCEFB4A3920497180B9485B25F81B70" />
68
<title>@ViewData["Title"] - Demo</title>
79

810
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
911
<link rel="stylesheet" href="~/css/site.min.css" />
1012
</head>
13+
1114
<body>
1215
<header>
1316
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-dark bg-dark border-bottom box-shadow mb-3">

0 commit comments

Comments
 (0)