diff --git a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
index f21af371bb..1b952e34cc 100644
--- a/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
+++ b/framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
@@ -5,6 +5,8 @@
net7.0
+ enable
+ Nullable
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs
index aa14bbe7f2..43e9dbc953 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprClientFactory.cs
@@ -24,7 +24,7 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
JsonSerializerOptions = CreateJsonSerializerOptions(systemTextJsonSerializerOptions.Value);
}
- public virtual DaprClient Create(Action builderAction = null)
+ public virtual DaprClient Create(Action? builderAction = null)
{
var builder = new DaprClientBuilder()
.UseJsonSerializationOptions(JsonSerializerOptions);
@@ -51,9 +51,9 @@ public class AbpDaprClientFactory : IAbpDaprClientFactory, ISingletonDependency
}
public virtual HttpClient CreateHttpClient(
- string appId = null,
- string daprEndpoint = null,
- string daprApiToken = null)
+ string? appId = null,
+ string? daprEndpoint = null,
+ string? daprApiToken = null)
{
if(daprEndpoint.IsNullOrWhiteSpace() &&
!DaprOptions.HttpEndpoint.IsNullOrWhiteSpace())
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
index 4153ae2ec1..e1ca4bb0db 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprModule.cs
@@ -33,14 +33,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["DAPR_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
- options.DaprApiToken = confEnv;
+ options.DaprApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("DAPR_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
- options.DaprApiToken = env;
+ options.DaprApiToken = env!;
}
}
}
@@ -50,14 +50,14 @@ public class AbpDaprModule : AbpModule
var confEnv = configuration["APP_API_TOKEN"];
if (!confEnv.IsNullOrWhiteSpace())
{
- options.AppApiToken = confEnv;
+ options.AppApiToken = confEnv!;
}
else
{
var env = Environment.GetEnvironmentVariable("APP_API_TOKEN");
if (!env.IsNullOrWhiteSpace())
{
- options.AppApiToken = env;
+ options.AppApiToken = env!;
}
}
}
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs
index 7ac19ad31c..f436f35147 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/AbpDaprOptions.cs
@@ -2,11 +2,11 @@
public class AbpDaprOptions
{
- public string HttpEndpoint { get; set; }
+ public string? HttpEndpoint { get; set; }
- public string GrpcEndpoint { get; set; }
+ public string? GrpcEndpoint { get; set; }
- public string DaprApiToken { get; set; }
+ public string? DaprApiToken { get; set; }
- public string AppApiToken { get; set; }
+ public string? AppApiToken { get; set; }
}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs
index 10dd3913ed..c38f36bf10 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/DaprApiTokenProvider.cs
@@ -12,12 +12,12 @@ public class DaprApiTokenProvider : IDaprApiTokenProvider, ISingletonDependency
Options = options.Value;
}
- public virtual string GetDaprApiToken()
+ public virtual string? GetDaprApiToken()
{
return Options.DaprApiToken;
}
- public virtual string GetAppApiToken()
+ public virtual string? GetAppApiToken()
{
return Options.AppApiToken;
}
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs
index 65c4e76b7e..bbf074af6c 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IAbpDaprClientFactory.cs
@@ -6,11 +6,11 @@ namespace Volo.Abp.Dapr;
public interface IAbpDaprClientFactory
{
- DaprClient Create(Action builderAction = null);
+ DaprClient Create(Action? builderAction = null);
HttpClient CreateHttpClient(
- string appId = null,
- string daprEndpoint = null,
- string daprApiToken = null
+ string? appId = null,
+ string? daprEndpoint = null,
+ string? daprApiToken = null
);
}
diff --git a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs
index 60f2195596..5e153ba2ea 100644
--- a/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs
+++ b/framework/src/Volo.Abp.Dapr/Volo/Abp/Dapr/IDaprApiTokenProvider.cs
@@ -2,7 +2,7 @@ namespace Volo.Abp.Dapr;
public interface IDaprApiTokenProvider
{
- string GetDaprApiToken();
+ string? GetDaprApiToken();
- string GetAppApiToken();
+ string? GetAppApiToken();
}