From ef21335c4b7aea1decfeabe0bcafcea714a7c4dc Mon Sep 17 00:00:00 2001 From: liaozb <635990945@qq.com> Date: Mon, 8 Jun 2020 10:27:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#=E5=8D=87=E7=BA=A7=E5=88=B0.netcore3.1#?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj | 17 +++++++---------- APIJSON.NET/APIJSON.NET/Startup.cs | 19 +++++++++---------- .../APIJSONCommon/ApiJson.Common.csproj | 6 +++--- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj index d4d0dd7..ca433bf 100644 --- a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj +++ b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.1 @@ -19,18 +19,15 @@ - - - + - - - - - - + + + + + diff --git a/APIJSON.NET/APIJSON.NET/Startup.cs b/APIJSON.NET/APIJSON.NET/Startup.cs index 15d9b6c..4a0cfb6 100644 --- a/APIJSON.NET/APIJSON.NET/Startup.cs +++ b/APIJSON.NET/APIJSON.NET/Startup.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; + using Microsoft.OpenApi.Models; using Swashbuckle.AspNetCore.Swagger; public class Startup @@ -46,10 +47,10 @@ public void ConfigureServices(IServiceCollection services) .AllowAnyHeader() .AllowAnyMethod().AllowCredentials() )); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); + services.AddControllers(); services.AddSwaggerGen(c => { - c.SwaggerDoc("v1", new Info { Title = "APIJSON.NET", Version = "v1" }); + c.SwaggerDoc("v1", new OpenApiInfo { Title = "APIJSON.NET", Version = "v1" }); }); services.AddSingleton(); services.AddSingleton(); @@ -61,17 +62,12 @@ public void ConfigureServices(IServiceCollection services) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.UseAuthentication(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); + app.UseRouting(); app.UseStaticFiles(); app.UseCors(_defaultCorsPolicyName); app.UseSwagger(); @@ -80,7 +76,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); }); - + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); app.UseJwtTokenMiddleware(); DbInit.Initialize(app); } diff --git a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj index e89cd9f..cc2d355 100644 --- a/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj +++ b/APIJSON.NET/APIJSONCommon/ApiJson.Common.csproj @@ -12,9 +12,9 @@ - - - + + + From 20851c5f2688a63583e949253438592087291de4 Mon Sep 17 00:00:00 2001 From: liaozb <635990945@qq.com> Date: 2020年6月30日 18:00:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF#?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APIJSON.NET/APIJSONCommon/SelectTable.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/APIJSON.NET/APIJSONCommon/SelectTable.cs b/APIJSON.NET/APIJSONCommon/SelectTable.cs index de56221..a2c402c 100644 --- a/APIJSON.NET/APIJSONCommon/SelectTable.cs +++ b/APIJSON.NET/APIJSONCommon/SelectTable.cs @@ -624,9 +624,8 @@ private void ProcessHaving(JObject values, ISugarQueryable tb) } hw.Add(model); } - - var d = db.Context.Utilities.ConditionalModelToSql(hw); - //tb.Having(d.Key, d.Value); + + tb.Having(string.Join(",", havingItems)); } } From d58966117f3765d766cec0a1123943f7d213ccde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=BF=8A=E7=B9=81?= Date: 2020年11月10日 10:23:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99nuget?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=B7=A8=E5=9F=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8C=96=EF=BC=8C=E9=85=8D=E7=BD=AEJSON.NET=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DJObject=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj | 16 +++++++--------- APIJSON.NET/APIJSON.NET/Startup.cs | 10 ++++++++-- APIJSON.NET/APIJSON.NET/appsettings.json | 1 + 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj index ca433bf..1a23f95 100644 --- a/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj +++ b/APIJSON.NET/APIJSON.NET/APIJSON.NET.csproj @@ -19,15 +19,13 @@ - - - - - - - - - + + + + + + + diff --git a/APIJSON.NET/APIJSON.NET/Startup.cs b/APIJSON.NET/APIJSON.NET/Startup.cs index 4a0cfb6..756a23c 100644 --- a/APIJSON.NET/APIJSON.NET/Startup.cs +++ b/APIJSON.NET/APIJSON.NET/Startup.cs @@ -41,13 +41,19 @@ public void ConfigureServices(IServiceCollection services) }); AuthConfigurer.Configure(services, Configuration); + var origins = Configuration.GetSection("CorsUrls").Value.Split(","); services.AddCors( options => options.AddPolicy( _defaultCorsPolicyName, builder => - builder.AllowAnyOrigin() + builder.WithOrigins(origins) .AllowAnyHeader() .AllowAnyMethod().AllowCredentials() )); - services.AddControllers(); + services.AddControllers() + .AddNewtonsoftJson(options => + { + options.SerializerSettings.ReferenceLoopHandling = Newtonsoft.Json.ReferenceLoopHandling.Ignore; + options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; + }); ; services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo { Title = "APIJSON.NET", Version = "v1" }); diff --git a/APIJSON.NET/APIJSON.NET/appsettings.json b/APIJSON.NET/APIJSON.NET/appsettings.json index da52e61..610c96b 100644 --- a/APIJSON.NET/APIJSON.NET/appsettings.json +++ b/APIJSON.NET/APIJSON.NET/appsettings.json @@ -4,6 +4,7 @@ "ConnectionString": "Server=192.168.2.25;Database=yunwei;Uid=root;Pwd=xmjk;Port=3306;Character Set=utf8;" //"ConnectionString": "Server=119.29.9.25;Port=3306;Database=test;Uid=root;Pwd=1q,2w.3e?;CharSet=UTF8;" }, + "CorsUrls": "http://localhost:5000,http://localhost5001", "Authentication": { "JwtBearer": { "IsEnabled": "true",

AltStyle によって変換されたページ (->オリジナル) /