Browse Source
Merge pull request #5759 from abpframework/maliming-patch-1
Avoid decrypt null setting value.
pull/5764/head
liangshiwei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
framework/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingProvider.cs
|
|
@ -35,7 +35,7 @@ namespace Volo.Abp.Settings |
|
|
//TODO: How to implement setting.IsInherited?
|
|
|
//TODO: How to implement setting.IsInherited?
|
|
|
|
|
|
|
|
|
var value = await GetOrNullValueFromProvidersAsync(providers, setting); |
|
|
var value = await GetOrNullValueFromProvidersAsync(providers, setting); |
|
|
if (setting.IsEncrypted) |
|
|
if (value != null && setting.IsEncrypted) |
|
|
{ |
|
|
{ |
|
|
value = SettingEncryptionService.Decrypt(setting, value); |
|
|
value = SettingEncryptionService.Decrypt(setting, value); |
|
|
} |
|
|
} |
|
|
@ -84,4 +84,4 @@ namespace Volo.Abp.Settings |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
