From 381dcc40ff574b2b61c9d21678f14e3d9a055279 Mon Sep 17 00:00:00 2001
From: Argo Window10 <argo@163.com>
Date: Fri, 22 Nov 2019 22:51:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20OAuth=20=E8=AE=A4=E8=AF=81=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/appsettings.Development.json | 8 ++++----
 src/admin/Bootstrap.Admin/appsettings.json             | 8 ++++----
 src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/appsettings.Development.json b/src/admin/Bootstrap.Admin/appsettings.Development.json
index 4c6a1cc4..100af3f8 100644
--- a/src/admin/Bootstrap.Admin/appsettings.Development.json
+++ b/src/admin/Bootstrap.Admin/appsettings.Development.json
@@ -80,7 +80,7 @@
     "HomePath": "/Admin/Profiles",
     "Scope": [ "user_info", "projects" ],
     "Roles": [ "Administrators" ],
-    "App": "0",
+    "App": "Demo",
     "StarredUrl": "https://gitee.com/api/v5/user/starred/LongbowEnterprise/BootstrapAdmin"
   },
   "GitHubOptions": {
@@ -91,7 +91,7 @@
     "HomePath": "/Admin/Profiles",
     "Scope": [ "user_info", "repo" ],
     "Roles": [ "Administrators" ],
-    "App": "0",
+    "App": "Demo",
     "StarredUrl": "https://api.github.com/user/starred/ArgoZhang/BootstrapAdmin"
   },
   "WeChatOptions": {
@@ -102,14 +102,14 @@
     "HomePath": "/Admin/Profiles",
     "Scope": [ "snsapi_login" ],
     "Roles": [ "Administrators" ],
-    "App": "0"
+    "App": "Demo"
   },
   "SMSOptions": {
     "CompanyCode": "<CompanyCode>",
     "MD5Key": "MD5Key",
     "Roles": [ "Administrators" ],
     "HomePath": "/Admin/Profiles",
-    "App": "0"
+    "App": "Demo"
   },
   "TencentSMSOptions": {
     "AppId": "<TencentAppId>",
diff --git a/src/admin/Bootstrap.Admin/appsettings.json b/src/admin/Bootstrap.Admin/appsettings.json
index 7338804b..5ee72fdd 100644
--- a/src/admin/Bootstrap.Admin/appsettings.json
+++ b/src/admin/Bootstrap.Admin/appsettings.json
@@ -84,7 +84,7 @@
     "HomePath": "/Home/Index",
     "Scope": [ "user_info", "projects" ],
     "Roles": [ "Default" ],
-    "App": "2"
+    "App": "Demo"
   },
   "GitHubOptions": {
     "Enabled": true,
@@ -94,7 +94,7 @@
     "HomePath": "/Home/Index",
     "Scope": [ "user_info", "repo" ],
     "Roles": [ "Default" ],
-    "App": "2"
+    "App": "Demo"
   },
   "WeChatOptions": {
     "Enabled": true,
@@ -104,14 +104,14 @@
     "HomePath": "/Admin/Profiles",
     "Scope": [ "snsapi_login" ],
     "Roles": [ "Default" ],
-    "App": "0"
+    "App": "Demo"
   },
   "SMSOptions": {
     "CompanyCode": "<CompanyCode>",
     "MD5Key": "MD5Key",
     "Roles": [ "Default" ],
     "HomePath": "/Home/Index",
-    "App": "2"
+    "App": "Demo"
   },
   "TencentSMSOptions": {
     "AppId": "<TencentAppId>",
diff --git a/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
index cf36f8ae..8736b0ac 100644
--- a/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
+++ b/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
@@ -98,7 +98,7 @@ namespace Bootstrap.DataAccess
         /// <param name="roles"></param>
         internal static void SaveUser(User newUser, IEnumerable<string> roles)
         {
-            if (!string.IsNullOrEmpty(newUser.Id))
+            if (string.IsNullOrEmpty(newUser.Id))
             {
                 var uid = UserHelper.Retrieves().FirstOrDefault(u => u.UserName == newUser.UserName)?.Id;
                 var user = DbContextManager.Create<User>();

From 1841e4430900bbe88284ab4d3008b6083c319648 Mon Sep 17 00:00:00 2001
From: Argo Window10 <argo@163.com>
Date: Sat, 23 Nov 2019 10:53:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?build:=20SaveByUserId=20=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E7=A9=BA=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs b/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
index 8736b0ac..c18e1411 100644
--- a/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
+++ b/src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
@@ -114,9 +114,9 @@ namespace Bootstrap.DataAccess
                             var roleIds = role.Retrieves().Where(r => roles.Any(rl => rl.Equals(r.RoleName, StringComparison.OrdinalIgnoreCase))).Select(r => r.Id);
                             if (roleIds.Any())
                             {
-#pragma warning disable CS8620 // 由于引用类型的可为 null 性差异，实参不能用于形参。
+#nullable disable
                                 role.SaveByUserId(newUser.Id, roleIds);
-#pragma warning restore CS8620 // 由于引用类型的可为 null 性差异，实参不能用于形参。
+#nullable restore
                                 CacheCleanUtility.ClearCache(userIds: new string[0], roleIds: new string[0], cacheKey: $"{UserHelper.RetrieveUsersByNameDataKey}-{newUser.UserName}");
                             }
                         }