Former-commit-id: 72430c3b227fa6f9a435af5e682fe910b929d9c4
Former-commit-id: c2dca3083c166d30558b0e4be6c40c0fbaa1178b
TSXN
wanggang 5 years ago
parent bcd33c28f7
commit cc400b0fe7

@ -18,7 +18,7 @@ namespace Infrastructure.Email
{
var message = new MimeMessage();
message.From.Add(new MailboxAddress(name, from));
message.To.Add(new MailboxAddress(to));
message.To.Add(MailboxAddress.Parse(to));
message.Subject = subject;
message.Body = new TextPart("html") { Text = body };
using var client = new SmtpClient

@ -16,35 +16,32 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="CS-Script.Core" Version="1.3.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.4" />
<PackageReference Include="CS-Script.Core" Version="1.3.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.6" />
<PackageReference Include="Minio" Version="3.1.13" />
<PackageReference Include="nacos-sdk-csharp-unofficial" Version="0.2.6" />
<PackageReference Include="nacos-sdk-csharp-unofficial.AspNetCore" Version="0.2.6" />
<PackageReference Include="nacos-sdk-csharp-unofficial.Extensions.Configuration" Version="0.2.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.2" />
<PackageReference Include="DotNetCore.NPOI" Version="1.2.2" />
<PackageReference Include="HtmlAgilityPack.NetCore" Version="1.5.0.1" />
<PackageReference Include="MailKit" Version="2.7.0" />
<PackageReference Include="MailKit" Version="2.8.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="3.4.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.InfluxDB.Standard" Version="1.0.5" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Management" Version="4.7.0" />
<PackageReference Include="ValueInjecter" Version="3.2.0" />

@ -224,10 +224,6 @@ namespace Infrastructure.Web
});
});
services.AddSingleton<IEventPublisher, EventPublisher>();
if (Configuration.GetValue("useServiceServer", false))
{
services.AddNacosAspNetCore(Configuration);
}
}
public virtual void ConfigureOptions(IServiceCollection services)
@ -365,10 +361,6 @@ namespace Infrastructure.Web
using var scope = app.ApplicationServices.CreateScope();
var services = scope.ServiceProvider;
this.CreateDatabase(services);
if (Configuration.GetValue("useServiceServer", false))
{
app.UseNacosAspNetCore();
}
}
public virtual void CreateDatabase(IServiceProvider services)

@ -11,12 +11,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.4" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.6" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
<PackageReference Include="SSH.NET" Version="2016.1.0" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.1.4" />
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.2" />
<PackageReference Include="System.IO.Ports" Version="4.7.0" />
<PackageReference Include="Vibrant.InfluxDB.Client" Version="4.0.3" />
</ItemGroup>

@ -7,7 +7,6 @@ using Serilog;
using Serilog.Sinks.InfluxDB;
using System;
using System.IO;
using System.Linq;
using System.Text;
namespace IoTCenter
@ -22,46 +21,31 @@ namespace IoTCenter
.Build();
WebHost.CreateDefaultBuilder(args)
.UseConfiguration(config)
.ConfigureAppConfiguration((c, o) =>
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue<bool>("useConfigServer", false))
if (config.GetValue("useLogServer", false))
{
o.AddNacosConfiguration(o =>
var url = c.Configuration["elasticsearch:url"];
var connectionInfo = new InfluxDBConnectionInfo
{
var section = config.GetSection("nacosConfigServer");
o.ServerAddresses = section.GetValue<string>("ServerAddresses").Split(';').ToList();
o.Optional = section.GetValue<bool>("Optional");
o.DataId = section.GetValue<string>("DataId");
o.Group = section.GetValue<string>("Group");
o.Tenant = section.GetValue<string>("Tenant");
});
Address = config["logserver:influxdb:address"],
Port = config.GetValue("logserver:influxdb:port", 8086),
DbName = config["logserver:influxdb:dbName"],
Username = config["logserver:influxdb:username"],
Password = config["logserver:influxdb:password"]
};
Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger();
}
})
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue("useLogServer", false))
{
var url = c.Configuration["elasticsearch:url"];
var connectionInfo = new InfluxDBConnectionInfo
else
{
Address = config["logserver:influxdb:address"],
Port = config.GetValue("logserver:influxdb:port", 8086),
DbName = config["logserver:influxdb:dbName"],
Username = config["logserver:influxdb:username"],
Password = config["logserver:influxdb:password"]
};
Log.Logger = new LoggerConfiguration().WriteTo.InfluxDB("iotcenter", connectionInfo).CreateLogger();
}
else
{
Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
}
o.AddSerilog();
Log.Logger.Information(string.IsNullOrEmpty(config["docker"]) ? "start..." : "docker...");
})
.UseStartup<Startup>()
.Build()
.Run();
Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
}
o.AddSerilog();
Log.Logger.Information(string.IsNullOrEmpty(config["docker"]) ? "start..." : "docker...");
})
.UseStartup<Startup>()
.Build()
.Run();
}
}
}

@ -10,10 +10,10 @@
<Compile Include="..\Version.cs" Link="Version.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hangfire.Core" Version="1.7.11" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />
<PackageReference Include="Hangfire.Core" Version="1.7.12" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.12" />
<PackageReference Include="Hangfire.LiteDB" Version="0.3.1" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

@ -13,15 +13,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.12" />
<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.2" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.3" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.5.1" />
</ItemGroup>
</Project>

@ -21,21 +21,6 @@ namespace StudyCenter
.AddJsonFile("appsettings.json", optional: true)
.Build();
WebHost.CreateDefaultBuilder(args)
.ConfigureAppConfiguration((c, o) =>
{
if (config.GetValue<bool>("useConfigServer", false))
{
o.AddNacosConfiguration(o =>
{
var section = config.GetSection("nacosConfigServer");
o.ServerAddresses = section.GetValue<string>("ServerAddresses").Split(';').ToList();
o.Optional = section.GetValue<bool>("Optional");
o.DataId = section.GetValue<string>("DataId");
o.Group = section.GetValue<string>("Group");
o.Tenant = section.GetValue<string>("Tenant");
});
}
})
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue("useLogServer", false))

@ -22,21 +22,6 @@ namespace UserCenter
.Build();
WebHost.CreateDefaultBuilder(args)
.UseConfiguration(config)
.ConfigureAppConfiguration((c, o) =>
{
if (config.GetValue<bool>("useConfigServer", false))
{
o.AddNacosConfiguration(o =>
{
var section = config.GetSection("nacosConfigServer");
o.ServerAddresses = section.GetValue<string>("ServerAddresses").Split(';').ToList();
o.Optional = section.GetValue<bool>("Optional");
o.DataId = section.GetValue<string>("DataId");
o.Group = section.GetValue<string>("Group");
o.Tenant = section.GetValue<string>("Tenant");
});
}
})
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue("useLogServer", false))

@ -11,8 +11,8 @@
<Compile Include="..\Version.cs" Link="Version.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.1" />
<PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.1" />
<PackageReference Include="AspNet.Security.OAuth.GitHub" Version="3.1.3" />
<PackageReference Include="AspNet.Security.OAuth.QQ" Version="3.1.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />

@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
</ItemGroup>
</Project>

@ -137,7 +137,15 @@
var vm = this;
var url = this.baseUrl + this.url;
var query = 'pageIndex=' + this.data.model.pageIndex + '&pageSize=' + this.data.model.pageSize;
query += '&' + Qs.stringify(this.data.model.query);
query += '&' + Qs.stringify({ query: this.data.model.query }, {
filter: function (prefix, value) {
if (prefix === 'id') {
return
};
return value;
},
allowDots: true
});
url += '?' + query;
axios.get(url).then(function (response) {
vm.data = response.data;

@ -6,6 +6,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.6" />
</ItemGroup>
</Project>
Loading…
Cancel
Save