Compare commits

..

No commits in common. "6bd50675a0e645f2e2d2532408c8aef900e2756b" and "00374380a9efe0fb3d61f378506c8e726d6f7093" have entirely different histories.

4 changed files with 9 additions and 4 deletions

@ -1 +1 @@
Subproject commit 8987046ceef38da3caf900227e71aaf95671af1a Subproject commit 6a5cb5a96082f72d899f82fe67b8882f2dc892a7

View File

@ -2,7 +2,7 @@
<configuration> <configuration>
<packageSources> <packageSources>
<!--<add key="JiSheTeam" value="http://proget.jisheyun.com:9511/nuget/JiSheTeam/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />--> <add key="JiSheTeam" value="http://proget.jisheyun.com:9511/nuget/JiSheTeam/v3/index.json" protocolVersion="3" allowInsecureConnections="true" />
<add key="nuget" value="https://api.nuget.org/v3/index.json" /> <add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

View File

@ -47,7 +47,12 @@ namespace JiShe.IoT
ConfigurationSignalR(context); ConfigurationSignalR(context);
ConfigurationMultiTenancy(); ConfigurationMultiTenancy();
ConfigureBlobStorage(); ConfigureBlobStorage();
Configure<ServerApplicationOptions>(options =>
{
configuration.GetSection(nameof(ServerApplicationOptions)).Bind(options);
});
Configure<DataChannelOptions>(options => Configure<DataChannelOptions>(options =>
{ {
configuration.GetSection(nameof(DataChannelOptions)).Bind(options); configuration.GetSection(nameof(DataChannelOptions)).Bind(options);

View File

@ -38,7 +38,7 @@
"TenantName": "1YMVZZkAkRArjxSD8457", "TenantName": "1YMVZZkAkRArjxSD8457",
"Namespace": "OneNET", "Namespace": "OneNET",
"PulsarSecretKey": "0fd7afb8b0d04e6abc4fdfdac2190a79", "PulsarSecretKey": "0fd7afb8b0d04e6abc4fdfdac2190a79",
"PulsarSubscriptionCustomName": "sub4", "PulsarSubscriptionCustomName": "sub3",
"EnableTls": false, "EnableTls": false,
"ValidateServerCertificate": false, "ValidateServerCertificate": false,
"ConnectionTimeout": 30, "ConnectionTimeout": 30,