mirror of
https://github.com/anjoy8/Blog.Core.git
synced 2024-09-20 23:48:27 +08:00
feat: remove some needless code
This commit is contained in:
parent
2ce3e6b7ff
commit
8188403b60
|
@ -186,6 +186,7 @@
|
||||||
<param name="roleServices"></param>
|
<param name="roleServices"></param>
|
||||||
<param name="requirement"></param>
|
<param name="requirement"></param>
|
||||||
<param name="roleModulePermissionServices"></param>
|
<param name="roleModulePermissionServices"></param>
|
||||||
|
<param name="logger"></param>
|
||||||
</member>
|
</member>
|
||||||
<member name="M:Blog.Core.Controllers.LoginController.GetJwtStr(System.String,System.String)">
|
<member name="M:Blog.Core.Controllers.LoginController.GetJwtStr(System.String,System.String)">
|
||||||
<summary>
|
<summary>
|
||||||
|
|
|
@ -8,6 +8,7 @@ using Blog.Core.Model.ViewModels;
|
||||||
using Blog.Core.SwaggerHelper;
|
using Blog.Core.SwaggerHelper;
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Serilog;
|
||||||
using StackExchange.Profiling;
|
using StackExchange.Profiling;
|
||||||
using static Blog.Core.Extensions.CustomApiVersion;
|
using static Blog.Core.Extensions.CustomApiVersion;
|
||||||
|
|
||||||
|
@ -99,6 +100,7 @@ namespace Blog.Core.Controllers
|
||||||
public async Task<MessageModel<BlogViewModels>> DetailNuxtNoPer(long id)
|
public async Task<MessageModel<BlogViewModels>> DetailNuxtNoPer(long id)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("xxxxxxxxxxxxxxxxxxx");
|
_logger.LogInformation("xxxxxxxxxxxxxxxxxxx");
|
||||||
|
Log.Information("yyyyyyyyyyyyyyyyy");
|
||||||
return Success(await _blogArticleServices.GetBlogDetails(id));
|
return Success(await _blogArticleServices.GetBlogDetails(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Mvc;
|
||||||
using System.IdentityModel.Tokens.Jwt;
|
using System.IdentityModel.Tokens.Jwt;
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using Blog.Core.Common.Swagger;
|
using Blog.Core.Common.Swagger;
|
||||||
using Serilog;
|
|
||||||
|
|
||||||
|
|
||||||
namespace Blog.Core.Controllers
|
namespace Blog.Core.Controllers
|
||||||
|
@ -38,6 +37,7 @@ namespace Blog.Core.Controllers
|
||||||
/// <param name="roleServices"></param>
|
/// <param name="roleServices"></param>
|
||||||
/// <param name="requirement"></param>
|
/// <param name="requirement"></param>
|
||||||
/// <param name="roleModulePermissionServices"></param>
|
/// <param name="roleModulePermissionServices"></param>
|
||||||
|
/// <param name="logger"></param>
|
||||||
public LoginController(ISysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices,
|
public LoginController(ISysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices,
|
||||||
IRoleServices roleServices, PermissionRequirement requirement,
|
IRoleServices roleServices, PermissionRequirement requirement,
|
||||||
IRoleModulePermissionServices roleModulePermissionServices, ILogger<LoginController> logger)
|
IRoleModulePermissionServices roleModulePermissionServices, ILogger<LoginController> logger)
|
||||||
|
|
|
@ -1,76 +0,0 @@
|
||||||
using Blog.Core.Common.Helper;
|
|
||||||
using Serilog;
|
|
||||||
using Serilog.Events;
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace Blog.Core.Common.LogHelper
|
|
||||||
{
|
|
||||||
public class SerilogServer
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 记录日常日志
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="filename"></param>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
/// <param name="info"></param>
|
|
||||||
public static void WriteLog(string filename, string[] dataParas, bool IsHeader = true, string defaultFolder = "", bool isJudgeJsonFormat = false)
|
|
||||||
{
|
|
||||||
Log.Logger = new LoggerConfiguration()
|
|
||||||
.MinimumLevel.Debug()
|
|
||||||
.MinimumLevel.Override("Microsoft", LogEventLevel.Error)
|
|
||||||
//.WriteTo.File(Path.Combine($"log/Serilog/{filename}/", ".log"), rollingInterval: RollingInterval.Day, outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level}] {Message}{NewLine}{Exception}")
|
|
||||||
.WriteTo.File(Path.Combine("Log", defaultFolder, $"{filename}.log"),
|
|
||||||
rollingInterval: RollingInterval.Infinite,
|
|
||||||
outputTemplate: "{Message}{NewLine}{Exception}")
|
|
||||||
.CreateLogger();
|
|
||||||
|
|
||||||
var now = DateTime.Now;
|
|
||||||
string logContent = String.Join("\r\n", dataParas);
|
|
||||||
var isJsonFormat = true;
|
|
||||||
if (isJudgeJsonFormat)
|
|
||||||
{
|
|
||||||
var judCont = logContent.Substring(0, logContent.LastIndexOf(","));
|
|
||||||
isJsonFormat = JsonHelper.IsJson(judCont);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isJsonFormat)
|
|
||||||
{
|
|
||||||
if (IsHeader)
|
|
||||||
{
|
|
||||||
logContent = (
|
|
||||||
"--------------------------------\r\n" +
|
|
||||||
DateTime.Now + "|\r\n" +
|
|
||||||
String.Join("\r\n", dataParas) + "\r\n"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// 展示elk支持输出4种日志级别
|
|
||||||
Log.Information(logContent);
|
|
||||||
//Log.Warning(logContent);
|
|
||||||
//Log.Error(logContent);
|
|
||||||
//Log.Debug(logContent);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Console.WriteLine("【JSON格式异常:】"+logContent + now.ObjToString());
|
|
||||||
}
|
|
||||||
Log.CloseAndFlush();
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// 记录异常日志
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="filename"></param>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
/// <param name="ex"></param>
|
|
||||||
public static void WriteErrorLog(string filename, string message, Exception ex)
|
|
||||||
{
|
|
||||||
Log.Logger = new LoggerConfiguration()
|
|
||||||
.MinimumLevel.Debug()
|
|
||||||
.MinimumLevel.Override("Microsoft", LogEventLevel.Error)
|
|
||||||
.WriteTo.File(Path.Combine($"log/Error/{filename}/", ".txt"), rollingInterval: RollingInterval.Day)
|
|
||||||
.CreateLogger();
|
|
||||||
Log.Error(ex, message);
|
|
||||||
Log.CloseAndFlush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,89 +0,0 @@
|
||||||
using Blog.Core.Common.Helper;
|
|
||||||
using Blog.Core.Serilog.Es;
|
|
||||||
using Blog.Core.Serilog.Es.Formatters;
|
|
||||||
using Serilog;
|
|
||||||
using Serilog.Events;
|
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace Blog.Core.Common.LogHelper
|
|
||||||
{
|
|
||||||
public class SerilogServer_Es
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// 记录日常日志
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="filename"></param>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
/// <param name="info"></param>
|
|
||||||
public static void WriteLog(string filename, string[] dataParas, bool IsHeader = true, string defaultFolder = "", bool isJudgeJsonFormat = false)
|
|
||||||
{
|
|
||||||
Log.Logger = new LoggerConfiguration()
|
|
||||||
// TCPSink 集成Serilog 使用tcp的方式向elk 输出log日志 LogstashJsonFormatter 这个是按照自定义格式化输出内容
|
|
||||||
.WriteTo.TCPSink(new LogstashJsonFormatter())
|
|
||||||
.MinimumLevel.Debug()
|
|
||||||
.MinimumLevel.Override("Microsoft", LogEventLevel.Error)
|
|
||||||
//.WriteTo.File(Path.Combine($"log/Serilog/{filename}/", ".log"), rollingInterval: RollingInterval.Day, outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level}] {Message}{NewLine}{Exception}")
|
|
||||||
.WriteTo.File(Path.Combine("Log", defaultFolder, $"{filename}.log"),
|
|
||||||
rollingInterval: RollingInterval.Infinite,
|
|
||||||
outputTemplate: "{Message}{NewLine}{Exception}")
|
|
||||||
|
|
||||||
// 将日志托送到远程ES
|
|
||||||
// docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" -e ES_JAVA_OPTS="-Xms256m -Xmx256m" -d --name ES01 elasticsearch:7.2.0
|
|
||||||
//.Enrich.FromLogContext()
|
|
||||||
//.WriteTo.Elasticsearch(new ElasticsearchSinkOptions(new Uri("http://x.xxx.xx.xx:9200/"))
|
|
||||||
//{
|
|
||||||
// AutoRegisterTemplate = true,
|
|
||||||
//})
|
|
||||||
|
|
||||||
.CreateLogger();
|
|
||||||
|
|
||||||
var now = DateTime.Now;
|
|
||||||
string logContent = String.Join("\r\n", dataParas);
|
|
||||||
var isJsonFormat = true;
|
|
||||||
if (isJudgeJsonFormat)
|
|
||||||
{
|
|
||||||
var judCont = logContent.Substring(0, logContent.LastIndexOf(","));
|
|
||||||
isJsonFormat = JsonHelper.IsJson(judCont);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isJsonFormat)
|
|
||||||
{
|
|
||||||
if (IsHeader)
|
|
||||||
{
|
|
||||||
logContent = (
|
|
||||||
"--------------------------------\r\n" +
|
|
||||||
DateTime.Now + "|\r\n" +
|
|
||||||
String.Join("\r\n", dataParas) + "\r\n"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// 展示elk支持输出4种日志级别
|
|
||||||
Log.Information(logContent);
|
|
||||||
//Log.Warning(logContent);
|
|
||||||
//Log.Error(logContent);
|
|
||||||
//Log.Debug(logContent);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Console.WriteLine("【JSON格式异常:】"+logContent + now.ObjToString());
|
|
||||||
}
|
|
||||||
Log.CloseAndFlush();
|
|
||||||
}
|
|
||||||
/// <summary>
|
|
||||||
/// 记录异常日志
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="filename"></param>
|
|
||||||
/// <param name="message"></param>
|
|
||||||
/// <param name="ex"></param>
|
|
||||||
public static void WriteErrorLog(string filename, string message, Exception ex)
|
|
||||||
{
|
|
||||||
Log.Logger = new LoggerConfiguration()
|
|
||||||
.MinimumLevel.Debug()
|
|
||||||
.MinimumLevel.Override("Microsoft", LogEventLevel.Error)
|
|
||||||
.WriteTo.File(Path.Combine($"log/Error/{filename}/", ".txt"), rollingInterval: RollingInterval.Day)
|
|
||||||
.CreateLogger();
|
|
||||||
Log.Error(ex, message);
|
|
||||||
Log.CloseAndFlush();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -6,14 +6,9 @@ using Blog.Core.Model.Tenants;
|
||||||
using Magicodes.ExporterAndImporter.Excel;
|
using Magicodes.ExporterAndImporter.Excel;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
using SqlSugar;
|
using SqlSugar;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Blog.Core.Common.Const;
|
using Blog.Core.Common.Const;
|
||||||
|
|
||||||
namespace Blog.Core.Common.Seed
|
namespace Blog.Core.Common.Seed
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
using Blog.Core.Common.Seed;
|
using Blog.Core.Common.Seed;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace Blog.Core.Extensions
|
namespace Blog.Core.Extensions
|
||||||
{
|
{
|
||||||
|
|
|
@ -6,8 +6,6 @@ using Microsoft.Extensions.Hosting;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Debugging;
|
using Serilog.Debugging;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
using Blog.Core.Common.Option;
|
using Blog.Core.Common.Option;
|
||||||
|
|
||||||
namespace Blog.Core.Extensions.ServiceExtensions;
|
namespace Blog.Core.Extensions.ServiceExtensions;
|
||||||
|
|
|
@ -2,19 +2,10 @@
|
||||||
using Blog.Core.Common.Const;
|
using Blog.Core.Common.Const;
|
||||||
using Blog.Core.Common.DB;
|
using Blog.Core.Common.DB;
|
||||||
using Blog.Core.Common.DB.Aop;
|
using Blog.Core.Common.DB.Aop;
|
||||||
using Blog.Core.Common.LogHelper;
|
|
||||||
using Microsoft.Extensions.Caching.Memory;
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using SqlSugar;
|
using SqlSugar;
|
||||||
using StackExchange.Profiling;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Blog.Core.Common.Caches;
|
using Blog.Core.Common.Caches;
|
||||||
using Blog.Core.Common.Core;
|
|
||||||
using Blog.Core.Common.HttpContextUser;
|
|
||||||
using static Grpc.Core.ChannelOption;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
namespace Blog.Core.Extensions
|
namespace Blog.Core.Extensions
|
||||||
|
|
Loading…
Reference in New Issue
Block a user