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

Merge branch 'refs/heads/publish' into dev

This commit is contained in:
Argo Window10 2019-11-23 10:56:14 +08:00
parent e5fa7a99ea 1841e44309
commit cc544337e4
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/admin/Bootstrap.Admin/appsettings.Development.json
View File

@ -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>",

8
src/admin/Bootstrap.Admin/appsettings.json
View File

@ -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>",

6
src/admin/Bootstrap.DataAccess/Helper/OAuthHelper.cs
View File

@ -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>();
@ -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}");
}
}