Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

升级到net6.0

Browse Source
This commit is contained in:
不做码农
2022-03-06 14:26:05 +08:00
parent 013b6ea4db
commit 7fe07b104c
50 changed files with 306 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Admin.WebApi/Extensions/EntityExtension.cs
View File

@@ -1,14 +1,14 @@
using Microsoft.AspNetCore.Http;
using Snowflake.Core;
//using Microsoft.AspNetCore.Http;
//using Snowflake.Core;
using System;
namespace ZR.Admin.WebApi.Extensions
{
public static class EntityExtension
{
public static TSource ToCreate<TSource>(this TSource source, HttpContext context = null)
public static TSource ToCreate<TSource>(this TSource source, HttpContext? context = null)
{
var types = source.GetType();
var types = source?.GetType();
//var worker = new IdWorker(1, 1);
//if (types.GetProperty("ID") != null)

8
ZR.Admin.WebApi/Extensions/HttpContextExtension.cs
View File

@@ -51,7 +51,7 @@ namespace ZR.Admin.WebApi.Extensions
var result = context.Request.Headers["X-Forwarded-For"].FirstOrDefault();
if (string.IsNullOrEmpty(result))
{
result = context.Connection.RemoteIpAddress.ToString();
result = context.Connection.RemoteIpAddress?.ToString();
}
if (string.IsNullOrEmpty(result) || result.Contains("::1"))
result = "127.0.0.1";
@@ -72,7 +72,7 @@ namespace ZR.Admin.WebApi.Extensions
return !string.IsNullOrEmpty(uid) ? long.Parse(uid) : 0;
}
public static string GetName(this HttpContext context)
public static string? GetName(this HttpContext context)
{
var uid = context.User?.Identity?.Name;
@@ -84,7 +84,7 @@ namespace ZR.Admin.WebApi.Extensions
/// </summary>
/// <param name="context"></param>
/// <returns></returns>
public static IEnumerable<ClaimsIdentity> GetClaims(this HttpContext context)
public static IEnumerable<ClaimsIdentity>? GetClaims(this HttpContext context)
{
return context.User?.Identities;
}
@@ -119,7 +119,7 @@ namespace ZR.Admin.WebApi.Extensions
return c;
}
public static string GetRequestUrl(this HttpContext context)
public static string? GetRequestUrl(this HttpContext context)
{
return context != null ? context.Request.Path.Value : "";
}

8
ZR.Admin.WebApi/Extensions/SwaggerExtension.cs
View File

@@ -1,13 +1,7 @@
using Infrastructure;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Filters;
using System;
using System.Collections.Generic;
using System.IO;
namespace ZR.Admin.WebApi.Extensions
{
@@ -51,7 +45,7 @@ namespace ZR.Admin.WebApi.Extensions
{
c.SwaggerDoc("v1", new OpenApiInfo
{
Title = "ZrAdmin.NET Api - .NET5",
Title = "ZrAdmin.NET Api - .NET6",
Version = "v1",
Description = "",
});