Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
63dcd0f13f | ||
|
|
22704590f5 | ||
|
|
98907ba5af |
@@ -4,15 +4,24 @@ namespace SimApi.Configs
|
|||||||
{
|
{
|
||||||
public class SimApiOptions
|
public class SimApiOptions
|
||||||
{
|
{
|
||||||
public bool EnableCors { get; set; } = true;
|
public bool EnableCors { get; set; } = false;
|
||||||
|
|
||||||
public bool EnableSimApiAuth { get; set; } = false;
|
public bool EnableSimApiAuth { get; set; } = false;
|
||||||
public bool EnableSimApiDoc { get; set; } = true;
|
|
||||||
public bool EnableSimApiException { get; set; } = true;
|
public bool EnableSimApiDoc { get; set; } = false;
|
||||||
|
|
||||||
|
public bool EnableSimApiException { get; set; } = false;
|
||||||
|
|
||||||
public bool EnableSimApiStorage { get; set; } = false;
|
public bool EnableSimApiStorage { get; set; } = false;
|
||||||
public bool EnableForwardHeaders { get; set; } = true;
|
|
||||||
public bool EnableLowerUrl { get; set; } = true;
|
public bool EnableForwardHeaders { get; set; } = false;
|
||||||
public bool EnableLogger { get; set; } = true;
|
|
||||||
|
public bool EnableLowerUrl { get; set; } = false;
|
||||||
|
|
||||||
|
public bool EnableLogger { get; set; } = false;
|
||||||
|
|
||||||
public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
|
public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
|
||||||
|
|
||||||
public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
|
public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+16
-9
@@ -10,6 +10,22 @@ namespace SimApi.Helpers
|
|||||||
{
|
{
|
||||||
public static class SimApiUtil
|
public static class SimApiUtil
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 当前CST时间
|
||||||
|
/// </summary>
|
||||||
|
public static DateTime CstNow
|
||||||
|
{
|
||||||
|
get => DateTime.UtcNow.AddHours(8);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 当前秒级时间戳
|
||||||
|
/// </summary>
|
||||||
|
public static double TimestampNow
|
||||||
|
{
|
||||||
|
get => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 检测手机号是否正确
|
/// 检测手机号是否正确
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -53,14 +69,5 @@ namespace SimApi.Helpers
|
|||||||
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
|
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 获取 CST 当前时间
|
|
||||||
/// </summary>
|
|
||||||
/// <returns></returns>
|
|
||||||
public static DateTime GetCstNow()
|
|
||||||
{
|
|
||||||
return DateTime.UtcNow.AddHours(8);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Logger
|
namespace SimApi.Logger
|
||||||
{
|
{
|
||||||
@@ -30,7 +31,7 @@ namespace SimApi.Logger
|
|||||||
_ => defautColor
|
_ => defautColor
|
||||||
};
|
};
|
||||||
Console.WriteLine(
|
Console.WriteLine(
|
||||||
$"[ {Name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
|
$"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
|
||||||
Console.ForegroundColor = defautColor;
|
Console.ForegroundColor = defautColor;
|
||||||
Console.WriteLine($"{state}");
|
Console.WriteLine($"{state}");
|
||||||
if (exception != null)
|
if (exception != null)
|
||||||
|
|||||||
@@ -1,23 +1,36 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
using SimApi.Helpers;
|
||||||
|
|
||||||
namespace SimApi.Models
|
namespace SimApi.Models
|
||||||
{
|
{
|
||||||
public class SimApiBaseModel
|
public class SimApiBaseModel
|
||||||
{
|
{
|
||||||
protected virtual string[] MapperIgnoreField { get; set; } = {"Id", "CreatedAt", "UpdatedAt"};
|
protected virtual string[] MapperIgnoreField { get; set; } =
|
||||||
|
{
|
||||||
|
"Id", "CreatedAt", "UpdatedAt"
|
||||||
|
};
|
||||||
|
|
||||||
protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
|
protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
|
||||||
|
|
||||||
public void MapData<TS>(TS source, bool mapAll = false)
|
public void MapData<TS>(TS source, bool mapAll = false)
|
||||||
{
|
{
|
||||||
//获取要赋值的源数据不为null的项目
|
//获取要赋值的源数据不为null的项目
|
||||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||||
.Select(x => new {x.Name, x.PropertyType})
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
|
|
||||||
//获取目标对象的属性信息
|
//获取目标对象的属性信息
|
||||||
var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
|
var targetProps = GetType().GetProperties().Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
foreach (var sp in sourceProps)
|
foreach (var sp in sourceProps)
|
||||||
{
|
{
|
||||||
@@ -37,11 +50,19 @@ namespace SimApi.Models
|
|||||||
{
|
{
|
||||||
//获取要赋值的源数据不为null的项目
|
//获取要赋值的源数据不为null的项目
|
||||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||||
.Select(x => new {x.Name, x.PropertyType})
|
.Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
|
|
||||||
//获取目标对象的属性信息
|
//获取目标对象的属性信息
|
||||||
var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
|
var targetProps = GetType().GetProperties().Select(x => new
|
||||||
|
{
|
||||||
|
x.Name,
|
||||||
|
x.PropertyType
|
||||||
|
})
|
||||||
.ToDictionary(x => x.Name, x => x.PropertyType);
|
.ToDictionary(x => x.Name, x => x.PropertyType);
|
||||||
foreach (var sp in sourceProps)
|
foreach (var sp in sourceProps)
|
||||||
{
|
{
|
||||||
@@ -63,7 +84,7 @@ namespace SimApi.Models
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public void UpdateTime()
|
public void UpdateTime()
|
||||||
{
|
{
|
||||||
GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
|
GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -27,7 +27,7 @@
|
|||||||
<Folder Include="Configurations\" />
|
<Folder Include="Configurations\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Minio" Version="4.0.2" />
|
<PackageReference Include="Minio" Version="4.0.4" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
|
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
|
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user