合并代码

Author: Meowv

README.md

@@ -1,4 +1,4 @@
-# 🤣阿星Plus⭐⭐⭐ 个人博客
+# 🤣阿星Plus⭐⭐⭐ 个人博客
 
 ## 项目介绍
 
@@ -8,6 +8,24 @@
 
 If you liked `Blog` project or if it helped you, please give a star ⭐️ for this repository. 👍👍👍
 
+```tree
+blog
+ ├── assets ---------- assets
+ ├── LICENSE ---------- LICENSE
+ ├── meowv.blog.sln ---------- Solution
+ ├── README.md ---------- README.md
+ └── src
+     ├── Meowv.Blog.Admin ---------- Admin项目 admin.meowv.com
+     ├── Meowv.Blog.Api ---------- Api项目 api.meowv.com
+     ├── Meowv.Blog.Application ---------- Application
+     ├── Meowv.Blog.BackgroundWorkers ---------- BackgroundWorkers
+     ├── Meowv.Blog.Core ---------- Core
+     ├── Meowv.Blog.DbMigrator ---------- DbMigrator
+     ├── Meowv.Blog.MongoDb ---------- MongoDb
+     ├── Meowv.Blog.Response ---------- Response
+     └── Meowv.Blog.Web ---------- Web项目 meowv.com
+```
+
 ## 预览体验
 
 ### Web项目：[https://meowv.com](https://meowv.com)
@@ -30,6 +48,8 @@ If you liked `Blog` project or if it helped you, please give a star ⭐️ for t
 
 ## [文章介绍](https://docs.meowv.com/aspnetcore/abp-blog/)
 
+### v3.4.0
+
 1. **[使用 abp cli 搭建项目](https://mp.weixin.qq.com/s/3Sc4Z2xkLdQNErvXf92B9A)**
 2. **[给项目瘦身，让它跑起来](https://mp.weixin.qq.com/s/oc96GG2sxz0J_vT6sReojQ)**
 3. **[完善与美化，Swagger登场](https://mp.weixin.qq.com/s/usz1BRYzBO2tT_z9MaonPg)**
@@ -61,23 +81,9 @@ If you liked `Blog` project or if it helped you, please give a star ⭐️ for t
 29. **[Blazor 实战系列（九）](https://mp.weixin.qq.com/s/0-mMmkr3HelmoJUWN7R7JA)**
 30. **[终结篇之发布项目](https://mp.weixin.qq.com/s/Lf543XOxSIGYdOGM8Zt4Lw)**
 
-```tree
-blog
- ├── assets ---------- assets
- ├── LICENSE ---------- LICENSE
- ├── meowv.blog.sln ---------- Solution
- ├── README.md ---------- README.md
- └── src
-     ├── Meowv.Blog.Admin ---------- Admin项目 admin.meowv.com
-     ├── Meowv.Blog.Api ---------- Api项目 api.meowv.com
-     ├── Meowv.Blog.Application ---------- Application
-     ├── Meowv.Blog.BackgroundWorkers ---------- BackgroundWorkers
-     ├── Meowv.Blog.Core ---------- Core
-     ├── Meowv.Blog.DbMigrator ---------- DbMigrator
-     ├── Meowv.Blog.MongoDb ---------- MongoDb
-     ├── Meowv.Blog.Response ---------- Response
-     └── Meowv.Blog.Web ---------- Web项目 meowv.com
-```
+### v4.0.0
+
+TODO...
 
 ## LICENSE
 

src/Meowv.Blog.Api/appsettings.yml

@@ -74,7 +74,7 @@ authorize:
     redirectUrl: 'https://admin.meowv.com/oauth/weibo'
     scope: 'all'
   qq:
-    clientId: '101931838'
+    clientId: '101935194'
     clientSecret: ''
-    redirectUrl: 'https://api.meowv.com/api/meowv/oauth/qq/token'
+    redirectUrl: 'https://admin.meowv.com/oauth/qq'
     scope: 'get_user_info'

src/Meowv.Blog.Application/Authorize/OAuth/Impl/OAuthQQService.cs

@@ -24,13 +24,13 @@ public override async Task<User> GetUserByOAuthAsync(string type, string code, s
             var accessToken = await GetAccessTokenAsync(code, state);
             var userInfo = await GetUserInfoAsync(accessToken);
 
-            return await UserService.CreateUserAsync(userInfo.Email, type, userInfo.Id, userInfo.Name, userInfo.Avatar, userInfo.Email);
+            return await UserService.CreateUserAsync(userInfo.Name, type, userInfo.Id, userInfo.Name, userInfo.Avatar, userInfo.Email);
         }
 
         public override async Task<AccessTokenBase> GetAccessTokenAsync(string code, string state)
         {
             var param = BuildAccessTokenParams(code, state);
-            Options.Value.AccessTokenUrl = $"{Options.Value.AccessTokenUrl}?{param.ToQueryStringWithEncode()}";
+            Options.Value.AccessTokenUrl = $"{Options.Value.AccessTokenUrl}?{param.ToQueryString()}";
 
             using var client = HttpClient.CreateClient();
             var response = await client.GetStringAsync(Options.Value.AccessTokenUrl);
@@ -47,12 +47,17 @@ public override async Task<QQUserInfo> GetUserInfoAsync(AccessTokenBase accessTo
         {
             using var client = HttpClient.CreateClient();
 
-            var openIdResponse = await client.GetStringAsync($"{Options.Value.OpenIdUrl}?access_token={accessToken.AccessToken}");
-          
+            var openIdResponse = await client.GetStringAsync($"{Options.Value.OpenIdUrl}?access_token={accessToken.AccessToken}&fmt=json");
+            var openId = openIdResponse.DeserializeToObject<QQOpenId>().OpenId;
+
+            var param = BuildUserInfoParams(accessToken.AccessToken, openId);
+            Options.Value.UserInfoUrl = $"{Options.Value.UserInfoUrl}?{param.ToQueryString()}";
 
             var response = await client.GetStringAsync(Options.Value.UserInfoUrl);
 
             var userInfo = response.DeserializeToObject<QQUserInfo>();
+            userInfo.Id = openId;
+            
             return userInfo;
         }
 
@@ -80,5 +85,15 @@ protected Dictionary<string, string> BuildAccessTokenParams(string code, string
                 ["state"] = state
             };
         }
+
+        protected Dictionary<string, string> BuildUserInfoParams(string accessToken, string openId)
+        {
+            return new Dictionary<string, string>()
+            {
+                ["access_token"] = accessToken,
+                ["oauth_consumer_key"] = Options.Value.ClientId,
+                ["openid"] = openId,
+            };
+        }
     }
 }

src/Meowv.Blog.Application/Users/Impl/UserService.cs

@@ -220,7 +220,7 @@ public async Task<BlogResponse<UserDto>> GetCurrentUserAsync()
         [RemoteService(false)]
         public async Task<User> CreateUserAsync(string username, string type, string identity, string name, string avatar, string email)
         {
-            var user = await _users.FindAsync(x => x.Username == username && x.Type == type && x.Identity == identity);
+            var user = await _users.FindAsync(x => x.Type == type && x.Identity == identity);
             if (user is null)
             {
                 await _users.InsertAsync(new User

src/Meowv.Blog.Response/Dto/Authorize/QQUserInfo.cs

@@ -1,6 +1,23 @@
-namespace Meowv.Blog.Dto.Authorize
+using Newtonsoft.Json;
+
+namespace Meowv.Blog.Dto.Authorize
 {
-    public class QQUserInfo : UserInfoBase
+    public class QQUserInfo
     {
+        public string Id { get; set; }
+
+        [JsonProperty("nickname")]
+        public string Name { get; set; }
+
+        [JsonProperty("figureurl_qq")]
+        public string Avatar { get; set; }
+
+        public string Email { get; set; } = "";
+    }
+
+    public class QQOpenId
+    {
+        [JsonProperty("openid")]
+        public string OpenId { get; set; }
     }
 }