xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善控制器接口

Browse Source
This commit is contained in:
lzw
2021-10-23 15:47:15 +08:00
parent 0c1b3632b4
commit a48c9b4061
16 changed files with 192 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Yi.Framework/Yi.Framework.Common/Helper/FileHelper.cs
View File

@@ -71,36 +71,36 @@ namespace Yi.Framework.Common.Helper
/// <param name="size">文件大小(1m)</param>
/// <param name="ext">文件后缀(.log)</param>
/// <returns>可用文件名</returns>
public static string GetAvailableFileWithPrefixOrderSize(string folderPath, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
{
var allFiles = new DirectoryInfo(folderPath);
var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d=>d.Name).ToList();
//public static string GetAvailableFileWithPrefixOrderSize(string folderPath, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
//{
// var allFiles = new DirectoryInfo(folderPath);
// var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d=>d.Name).ToList();
if (selectFiles.Count > 0)
{
return selectFiles.FirstOrDefault().FullName;
}
// if (selectFiles.Count > 0)
// {
// return selectFiles.FirstOrDefault().FullName;
// }
return Path.Combine(folderPath, $@"{prefix}_{DateTime.Now.DateToTimeStamp()}.log");
}
public static string GetAvailableFileNameWithPrefixOrderSize(string _contentRoot, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
{
var folderPath = Path.Combine(_contentRoot, "Log");
if (!Directory.Exists(folderPath))
{
Directory.CreateDirectory(folderPath);
}
// return Path.Combine(folderPath, $@"{prefix}_{DateTime.Now.DateToTimeStamp()}.log");
//}
//public static string GetAvailableFileNameWithPrefixOrderSize(string _contentRoot, string prefix, int size = 1 * 1024 * 1024, string ext = ".log")
//{
// var folderPath = Path.Combine(_contentRoot, "Log");
// if (!Directory.Exists(folderPath))
// {
// Directory.CreateDirectory(folderPath);
// }
var allFiles = new DirectoryInfo(folderPath);
var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d => d.Name).ToList();
// var allFiles = new DirectoryInfo(folderPath);
// var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(prefix.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d => d.Name).ToList();
if (selectFiles.Count > 0)
{
return selectFiles.FirstOrDefault().Name.Replace(".log","");
}
// if (selectFiles.Count > 0)
// {
// return selectFiles.FirstOrDefault().Name.Replace(".log","");
// }
return $@"{prefix}_{DateTime.Now.DateToTimeStamp()}";
}
// return $@"{prefix}_{DateTime.Now.DateToTimeStamp()}";
//}
#endregion
#region 写文件

47
Yi.Framework/Yi.Framework.Common/Helper/MD5Helper.cs
View File

@@ -1,47 +0,0 @@
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
namespace Yi.Framework.Common.Helper
{
/// <summary>
/// 加密用的
/// </summary>
public class MD5Helper
{
/// <summary>
/// MD5 加密字符串
/// </summary>
/// <param name="content">源字符串</param>
/// <returns>加密后字符串</returns>
public static string MD5EncodingOnly(string content)
{
// 创建MD5类的默认实例：MD5CryptoServiceProvider
MD5 md5 = MD5.Create();
byte[] bs = Encoding.UTF8.GetBytes(content);
byte[] hs = md5.ComputeHash(bs);
StringBuilder stb = new StringBuilder();
foreach (byte b in hs)
{
// 以十六进制格式格式化
stb.Append(b.ToString("x2"));
}
return stb.ToString();
}
/// <summary>
/// MD5盐值加密
/// </summary>
/// <param name="content">源字符串</param>
/// <param name="salt">盐值</param>
/// <returns>加密后字符串</returns>
public static string MD5EncodingWithSalt(string content, string salt)
{
if (salt == null) return content;
return MD5EncodingOnly(content + "{" + salt.ToString() + "}");
}
}
}

2
Yi.Framework/Yi.Framework.Common/Helper/MD5Hepler.cs
View File

@@ -4,7 +4,7 @@ using System.Text;
namespace Yi.Framework.Common.Helper
{
public class MD5Helper
public class MD5Helper
{
/// <summary>
/// 16位MD5加密

4
Yi.Framework/Yi.Framework.Common/Yi.Framework.Common.csproj
View File

@@ -4,4 +4,8 @@
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>