diff --git a/projects/Infrastructure/Email/EmailSender.cs b/projects/Infrastructure/Email/EmailSender.cs
index aed336d7..bd8a32f1 100644
--- a/projects/Infrastructure/Email/EmailSender.cs
+++ b/projects/Infrastructure/Email/EmailSender.cs
@@ -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
diff --git a/projects/Infrastructure/Infrastructure.csproj b/projects/Infrastructure/Infrastructure.csproj
index efe7c610..045a222f 100644
--- a/projects/Infrastructure/Infrastructure.csproj
+++ b/projects/Infrastructure/Infrastructure.csproj
@@ -16,35 +16,32 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
+
-
+
-
+
-
-
+
+
diff --git a/projects/Infrastructure/Web/BaseStartup.cs b/projects/Infrastructure/Web/BaseStartup.cs
index e3c20af5..2aaad701 100644
--- a/projects/Infrastructure/Web/BaseStartup.cs
+++ b/projects/Infrastructure/Web/BaseStartup.cs
@@ -224,10 +224,6 @@ namespace Infrastructure.Web
});
});
services.AddSingleton();
- 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)
diff --git a/projects/IoT.Shared/IoT.Shared.csproj b/projects/IoT.Shared/IoT.Shared.csproj
index e4b386ac..1dd3dd27 100644
--- a/projects/IoT.Shared/IoT.Shared.csproj
+++ b/projects/IoT.Shared/IoT.Shared.csproj
@@ -11,12 +11,12 @@
-
-
-
+
+
+
-
+
diff --git a/projects/IoTCenter/Program.cs b/projects/IoTCenter/Program.cs
index fb10968b..73624a81 100644
--- a/projects/IoTCenter/Program.cs
+++ b/projects/IoTCenter/Program.cs
@@ -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("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("ServerAddresses").Split(';').ToList();
- o.Optional = section.GetValue("Optional");
- o.DataId = section.GetValue("DataId");
- o.Group = section.GetValue("Group");
- o.Tenant = section.GetValue("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()
- .Build()
- .Run();
+ Log.Logger = new LoggerConfiguration().WriteTo.Console().CreateLogger();
+ }
+ o.AddSerilog();
+ Log.Logger.Information(string.IsNullOrEmpty(config["docker"]) ? "start..." : "docker...");
+ })
+ .UseStartup()
+ .Build()
+ .Run();
}
}
}
\ No newline at end of file
diff --git a/projects/IoTNode/IoTNode.csproj b/projects/IoTNode/IoTNode.csproj
index 0485633c..75908c72 100644
--- a/projects/IoTNode/IoTNode.csproj
+++ b/projects/IoTNode/IoTNode.csproj
@@ -10,10 +10,10 @@
-
-
+
+
-
+
diff --git a/projects/JobServer/JobServer.csproj b/projects/JobServer/JobServer.csproj
index 4bbf3935..7a837870 100644
--- a/projects/JobServer/JobServer.csproj
+++ b/projects/JobServer/JobServer.csproj
@@ -13,15 +13,15 @@
-
+
-
+
-
-
+
+
\ No newline at end of file
diff --git a/projects/StudyCenter/Program.cs b/projects/StudyCenter/Program.cs
index 77d991d6..18f30750 100644
--- a/projects/StudyCenter/Program.cs
+++ b/projects/StudyCenter/Program.cs
@@ -21,21 +21,6 @@ namespace StudyCenter
.AddJsonFile("appsettings.json", optional: true)
.Build();
WebHost.CreateDefaultBuilder(args)
- .ConfigureAppConfiguration((c, o) =>
- {
- if (config.GetValue("useConfigServer", false))
- {
- o.AddNacosConfiguration(o =>
- {
- var section = config.GetSection("nacosConfigServer");
- o.ServerAddresses = section.GetValue("ServerAddresses").Split(';').ToList();
- o.Optional = section.GetValue("Optional");
- o.DataId = section.GetValue("DataId");
- o.Group = section.GetValue("Group");
- o.Tenant = section.GetValue("Tenant");
- });
- }
- })
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue("useLogServer", false))
diff --git a/projects/UserCenter/Program.cs b/projects/UserCenter/Program.cs
index 441dcb43..c7b90ab7 100644
--- a/projects/UserCenter/Program.cs
+++ b/projects/UserCenter/Program.cs
@@ -22,21 +22,6 @@ namespace UserCenter
.Build();
WebHost.CreateDefaultBuilder(args)
.UseConfiguration(config)
- .ConfigureAppConfiguration((c, o) =>
- {
- if (config.GetValue("useConfigServer", false))
- {
- o.AddNacosConfiguration(o =>
- {
- var section = config.GetSection("nacosConfigServer");
- o.ServerAddresses = section.GetValue("ServerAddresses").Split(';').ToList();
- o.Optional = section.GetValue("Optional");
- o.DataId = section.GetValue("DataId");
- o.Group = section.GetValue("Group");
- o.Tenant = section.GetValue("Tenant");
- });
- }
- })
.ConfigureLogging((c, o) => //http://localhost:9200/_search?size=100
{
if (config.GetValue("useLogServer", false))
diff --git a/projects/UserCenter/UserCenter.csproj b/projects/UserCenter/UserCenter.csproj
index 82aca4e8..22a0442c 100644
--- a/projects/UserCenter/UserCenter.csproj
+++ b/projects/UserCenter/UserCenter.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/projects/WebMVC/WebMVC.csproj b/projects/WebMVC/WebMVC.csproj
index f149744d..932f3e56 100644
--- a/projects/WebMVC/WebMVC.csproj
+++ b/projects/WebMVC/WebMVC.csproj
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/components/shared/list.html b/projects/WebMVC/wwwroot/components/shared/list.html
index ef5682d1..fd6933fd 100644
--- a/projects/WebMVC/wwwroot/components/shared/list.html
+++ b/projects/WebMVC/wwwroot/components/shared/list.html
@@ -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;
diff --git a/projects/WebSPA/WebSPA.csproj b/projects/WebSPA/WebSPA.csproj
index e58c9bba..9ac7e1be 100644
--- a/projects/WebSPA/WebSPA.csproj
+++ b/projects/WebSPA/WebSPA.csproj
@@ -6,6 +6,6 @@
-
+
\ No newline at end of file