diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Extensions/HttpContextExtensions.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Extensions/HttpContextExtensions.cs
index 759555ed..b16e5509 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Extensions/HttpContextExtensions.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.AspNetCore/Extensions/HttpContextExtensions.cs
@@ -10,6 +10,57 @@ namespace Yi.Framework.AspNetCore.Extensions
{
public static class HttpContextExtensions
{
+ ///
+ /// 设置文件下载名称
+ ///
+ ///
+ ///
+ public static void FileInlineHandle(this HttpContext httpContext, string fileName)
+ {
+ string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
+ httpContext.Response.Headers.Add("Content-Disposition", "inline;filename=" + encodeFilename);
+
+ }
+
+ ///
+ /// 设置文件附件名称
+ ///
+ ///
+ ///
+ public static void FileAttachmentHandle(this HttpContext httpContext, string fileName)
+ {
+ string encodeFilename = System.Web.HttpUtility.UrlEncode(fileName, Encoding.GetEncoding("UTF-8"));
+ httpContext.Response.Headers.Add("Content-Disposition", "attachment;filename=" + encodeFilename);
+
+ }
+
+ ///
+ /// 获取语言种类
+ ///
+ ///
+ ///
+ public static string GetLanguage(this HttpContext httpContext)
+ {
+ string res = "zh-CN";
+ var str = httpContext.Request.Headers["Accept-Language"].FirstOrDefault();
+ if (str is not null)
+ {
+ res = str.Split(",")[0];
+ }
+ return res;
+
+ }
+
+ ///
+ /// 判断是否为异步请求
+ ///
+ ///
+ ///
+ public static bool IsAjaxRequest(this HttpRequest request)
+ {
+ string header = request.Headers["X-Requested-With"];
+ return "XMLHttpRequest".Equals(header);
+ }
///
/// 获取客户端IP
///
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Const/PathConst.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Const/PathConst.cs
new file mode 100644
index 00000000..ba393ce5
--- /dev/null
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Const/PathConst.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Core.Const
+{
+ ///
+ /// 定义公共文件常量
+ ///
+ public class PathConst
+ {
+ public const string wwwroot = "wwwroot";
+ public const string DataTemplate = "_DataTemplate";
+ public const string DataExport = "_DataExport";
+ }
+}
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/FileTypeEnum.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/FileTypeEnum.cs
new file mode 100644
index 00000000..1776d35f
--- /dev/null
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Enums/FileTypeEnum.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Core.Enums
+{
+ ///
+ /// 定义公共文件路径
+ ///
+ public enum FileTypeEnum
+ {
+ File,
+ Image,
+ Thumbnail,
+ Excel,
+ Temp
+ }
+}
diff --git a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs
index ca0e7c05..c0b5b611 100644
--- a/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs
+++ b/Yi.Framework.Net6/src/framework/Yi.Framework.Core/Helper/MimeHelper.cs
@@ -4,241 +4,257 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Yi.Framework.Core.Enums;
namespace Yi.Framework.Core.Helper
{
- public static class MimeHelper
+ public static class MimeHelper
{
// 通过自己定义一个静态类
// 将所有的Content Type都扔进去吧
// 调用的时候直接调用静态方法即可。
-
- private static Hashtable _mimeMappingTable;
- private static void AddMimeMapping(string extension, string MimeType)
+ public static List ImageType { get; set; } = new List
+ {
+ ".jpg",".png",".jpge",".gif"
+ };
+
+ private static Hashtable _mimeMappingTable;
+
+ private static void AddMimeMapping(string extension, string MimeType)
+ {
+ MimeHelper._mimeMappingTable.Add(extension, MimeType);
+ }
+
+ public static string GetMimeMapping(string FileName)
+ {
+ string text = null!;
+ int num = FileName.LastIndexOf('.');
+ if (0 < num && num > FileName.LastIndexOf('\\'))
{
- MimeHelper._mimeMappingTable.Add(extension, MimeType);
+ text = (string)MimeHelper._mimeMappingTable[FileName.Substring(num)]!;
}
-
- public static string GetMimeMapping(string FileName)
+ if (text == null)
{
- string text = null!;
- int num = FileName.LastIndexOf('.');
- if (0 < num && num > FileName.LastIndexOf('\\'))
- {
- text = (string)MimeHelper._mimeMappingTable[FileName.Substring(num)]!;
- }
- if (text == null)
- {
- text = (string)MimeHelper._mimeMappingTable[".*"]!;
- }
- return text;
+ text = (string)MimeHelper._mimeMappingTable[".*"]!;
}
+ return text;
+ }
+
+ public static FileTypeEnum GetFileType(string fileName)
+ {
+ var extension = Path.GetExtension(fileName);
+ if(ImageType.Contains(extension.ToLower()))
+ return FileTypeEnum.Image;
+ return FileTypeEnum.File;
+
+
+ }
+
+ static MimeHelper()
+ {
+ MimeHelper._mimeMappingTable = new Hashtable(190, StringComparer.CurrentCultureIgnoreCase);
+ MimeHelper.AddMimeMapping(".323", "text/h323");
+ MimeHelper.AddMimeMapping(".asx", "video/x-ms-asf");
+ MimeHelper.AddMimeMapping(".acx", "application/internet-property-stream");
+ MimeHelper.AddMimeMapping(".ai", "application/postscript");
+ MimeHelper.AddMimeMapping(".aif", "audio/x-aiff");
+ MimeHelper.AddMimeMapping(".aiff", "audio/aiff");
+ MimeHelper.AddMimeMapping(".axs", "application/olescript");
+ MimeHelper.AddMimeMapping(".aifc", "audio/aiff");
+ MimeHelper.AddMimeMapping(".asr", "video/x-ms-asf");
+ MimeHelper.AddMimeMapping(".avi", "video/x-msvideo");
+ MimeHelper.AddMimeMapping(".asf", "video/x-ms-asf");
+ MimeHelper.AddMimeMapping(".au", "audio/basic");
+ MimeHelper.AddMimeMapping(".application", "application/x-ms-application");
+ MimeHelper.AddMimeMapping(".bin", "application/octet-stream");
+ MimeHelper.AddMimeMapping(".bas", "text/plain");
+ MimeHelper.AddMimeMapping(".bcpio", "application/x-bcpio");
+ MimeHelper.AddMimeMapping(".bmp", "image/bmp");
+ MimeHelper.AddMimeMapping(".cdf", "application/x-cdf");
+ MimeHelper.AddMimeMapping(".cat", "application/vndms-pkiseccat");
+ MimeHelper.AddMimeMapping(".crt", "application/x-x509-ca-cert");
+ MimeHelper.AddMimeMapping(".c", "text/plain");
+ MimeHelper.AddMimeMapping(".css", "text/css");
+ MimeHelper.AddMimeMapping(".cer", "application/x-x509-ca-cert");
+ MimeHelper.AddMimeMapping(".crl", "application/pkix-crl");
+ MimeHelper.AddMimeMapping(".cmx", "image/x-cmx");
+ MimeHelper.AddMimeMapping(".csh", "application/x-csh");
+ MimeHelper.AddMimeMapping(".cod", "image/cis-cod");
+ MimeHelper.AddMimeMapping(".cpio", "application/x-cpio");
+ MimeHelper.AddMimeMapping(".clp", "application/x-msclip");
+ MimeHelper.AddMimeMapping(".crd", "application/x-mscardfile");
+ MimeHelper.AddMimeMapping(".deploy", "application/octet-stream");
+ MimeHelper.AddMimeMapping(".dll", "application/x-msdownload");
+ MimeHelper.AddMimeMapping(".dot", "application/msword");
+ MimeHelper.AddMimeMapping(".doc", "application/msword");
+ MimeHelper.AddMimeMapping(".dvi", "application/x-dvi");
+ MimeHelper.AddMimeMapping(".dir", "application/x-director");
+ MimeHelper.AddMimeMapping(".dxr", "application/x-director");
+ MimeHelper.AddMimeMapping(".der", "application/x-x509-ca-cert");
+ MimeHelper.AddMimeMapping(".dib", "image/bmp");
+ MimeHelper.AddMimeMapping(".dcr", "application/x-director");
+ MimeHelper.AddMimeMapping(".disco", "text/xml");
+ MimeHelper.AddMimeMapping(".exe", "application/octet-stream");
+ MimeHelper.AddMimeMapping(".etx", "text/x-setext");
+ MimeHelper.AddMimeMapping(".evy", "application/envoy");
+ MimeHelper.AddMimeMapping(".eml", "message/rfc822");
+ MimeHelper.AddMimeMapping(".eps", "application/postscript");
+ MimeHelper.AddMimeMapping(".flr", "x-world/x-vrml");
+ MimeHelper.AddMimeMapping(".fif", "application/fractals");
+ MimeHelper.AddMimeMapping(".gtar", "application/x-gtar");
+ MimeHelper.AddMimeMapping(".gif", "image/gif");
+ MimeHelper.AddMimeMapping(".gz", "application/x-gzip");
+ MimeHelper.AddMimeMapping(".hta", "application/hta");
+ MimeHelper.AddMimeMapping(".htc", "text/x-component");
+ MimeHelper.AddMimeMapping(".htt", "text/webviewhtml");
+ MimeHelper.AddMimeMapping(".h", "text/plain");
+ MimeHelper.AddMimeMapping(".hdf", "application/x-hdf");
+ MimeHelper.AddMimeMapping(".hlp", "application/winhlp");
+ MimeHelper.AddMimeMapping(".html", "text/html");
+ MimeHelper.AddMimeMapping(".htm", "text/html");
+ MimeHelper.AddMimeMapping(".hqx", "application/mac-binhex40");
+ MimeHelper.AddMimeMapping(".isp", "application/x-internet-signup");
+ MimeHelper.AddMimeMapping(".iii", "application/x-iphone");
+ MimeHelper.AddMimeMapping(".ief", "image/ief");
+ MimeHelper.AddMimeMapping(".ivf", "video/x-ivf");
+ MimeHelper.AddMimeMapping(".ins", "application/x-internet-signup");
+ MimeHelper.AddMimeMapping(".ico", "image/x-icon");
+ MimeHelper.AddMimeMapping(".jpg", "image/jpeg");
+ MimeHelper.AddMimeMapping(".jfif", "image/pjpeg");
+ MimeHelper.AddMimeMapping(".jpe", "image/jpeg");
+ MimeHelper.AddMimeMapping(".jpeg", "image/jpeg");
+ MimeHelper.AddMimeMapping(".js", "application/x-javascript");
+ MimeHelper.AddMimeMapping(".lsx", "video/x-la-asf");
+ MimeHelper.AddMimeMapping(".latex", "application/x-latex");
+ MimeHelper.AddMimeMapping(".lsf", "video/x-la-asf");
+ MimeHelper.AddMimeMapping(".manifest", "application/x-ms-manifest");
+ MimeHelper.AddMimeMapping(".mhtml", "message/rfc822");
+ MimeHelper.AddMimeMapping(".mny", "application/x-msmoney");
+ MimeHelper.AddMimeMapping(".mht", "message/rfc822");
+ MimeHelper.AddMimeMapping(".mid", "audio/mid");
+ MimeHelper.AddMimeMapping(".mpv2", "video/mpeg");
+ MimeHelper.AddMimeMapping(".man", "application/x-troff-man");
+ MimeHelper.AddMimeMapping(".mvb", "application/x-msmediaview");
+ MimeHelper.AddMimeMapping(".mpeg", "video/mpeg");
+ MimeHelper.AddMimeMapping(".m3u", "audio/x-mpegurl");
+ MimeHelper.AddMimeMapping(".mdb", "application/x-msaccess");
+ MimeHelper.AddMimeMapping(".mpp", "application/vnd.ms-project");
+ MimeHelper.AddMimeMapping(".m1v", "video/mpeg");
+ MimeHelper.AddMimeMapping(".mpa", "video/mpeg");
+ MimeHelper.AddMimeMapping(".me", "application/x-troff-me");
+ MimeHelper.AddMimeMapping(".m13", "application/x-msmediaview");
+ MimeHelper.AddMimeMapping(".movie", "video/x-sgi-movie");
+ MimeHelper.AddMimeMapping(".m14", "application/x-msmediaview");
+ MimeHelper.AddMimeMapping(".mpe", "video/mpeg");
+ MimeHelper.AddMimeMapping(".mp2", "video/mpeg");
+ MimeHelper.AddMimeMapping(".mov", "video/quicktime");
+ MimeHelper.AddMimeMapping(".mp3", "audio/mpeg");
+ MimeHelper.AddMimeMapping(".mpg", "video/mpeg");
+ MimeHelper.AddMimeMapping(".ms", "application/x-troff-ms");
+ MimeHelper.AddMimeMapping(".nc", "application/x-netcdf");
+ MimeHelper.AddMimeMapping(".nws", "message/rfc822");
+ MimeHelper.AddMimeMapping(".oda", "application/oda");
+ MimeHelper.AddMimeMapping(".ods", "application/oleobject");
+ MimeHelper.AddMimeMapping(".pmc", "application/x-perfmon");
+ MimeHelper.AddMimeMapping(".p7r", "application/x-pkcs7-certreqresp");
+ MimeHelper.AddMimeMapping(".p7b", "application/x-pkcs7-certificates");
+ MimeHelper.AddMimeMapping(".p7s", "application/pkcs7-signature");
+ MimeHelper.AddMimeMapping(".pmw", "application/x-perfmon");
+ MimeHelper.AddMimeMapping(".ps", "application/postscript");
+ MimeHelper.AddMimeMapping(".p7c", "application/pkcs7-mime");
+ MimeHelper.AddMimeMapping(".pbm", "image/x-portable-bitmap");
+ MimeHelper.AddMimeMapping(".ppm", "image/x-portable-pixmap");
+ MimeHelper.AddMimeMapping(".pub", "application/x-mspublisher");
+ MimeHelper.AddMimeMapping(".pnm", "image/x-portable-anymap");
+ MimeHelper.AddMimeMapping(".png", "image/png");
+ MimeHelper.AddMimeMapping(".pml", "application/x-perfmon");
+ MimeHelper.AddMimeMapping(".p10", "application/pkcs10");
+ MimeHelper.AddMimeMapping(".pfx", "application/x-pkcs12");
+ MimeHelper.AddMimeMapping(".p12", "application/x-pkcs12");
+ MimeHelper.AddMimeMapping(".pdf", "application/pdf");
+ MimeHelper.AddMimeMapping(".pps", "application/vnd.ms-powerpoint");
+ MimeHelper.AddMimeMapping(".p7m", "application/pkcs7-mime");
+ MimeHelper.AddMimeMapping(".pko", "application/vndms-pkipko");
+ MimeHelper.AddMimeMapping(".ppt", "application/vnd.ms-powerpoint");
+ MimeHelper.AddMimeMapping(".pmr", "application/x-perfmon");
+ MimeHelper.AddMimeMapping(".pma", "application/x-perfmon");
+ MimeHelper.AddMimeMapping(".pot", "application/vnd.ms-powerpoint");
+ MimeHelper.AddMimeMapping(".prf", "application/pics-rules");
+ MimeHelper.AddMimeMapping(".pgm", "image/x-portable-graymap");
+ MimeHelper.AddMimeMapping(".qt", "video/quicktime");
+ MimeHelper.AddMimeMapping(".ra", "audio/x-pn-realaudio");
+ MimeHelper.AddMimeMapping(".rgb", "image/x-rgb");
+ MimeHelper.AddMimeMapping(".ram", "audio/x-pn-realaudio");
+ MimeHelper.AddMimeMapping(".rmi", "audio/mid");
+ MimeHelper.AddMimeMapping(".ras", "image/x-cmu-raster");
+ MimeHelper.AddMimeMapping(".roff", "application/x-troff");
+ MimeHelper.AddMimeMapping(".rtf", "application/rtf");
+ MimeHelper.AddMimeMapping(".rtx", "text/richtext");
+ MimeHelper.AddMimeMapping(".sv4crc", "application/x-sv4crc");
+ MimeHelper.AddMimeMapping(".spc", "application/x-pkcs7-certificates");
+ MimeHelper.AddMimeMapping(".setreg", "application/set-registration-initiation");
+ MimeHelper.AddMimeMapping(".snd", "audio/basic");
+ MimeHelper.AddMimeMapping(".stl", "application/vndms-pkistl");
+ MimeHelper.AddMimeMapping(".setpay", "application/set-payment-initiation");
+ MimeHelper.AddMimeMapping(".stm", "text/html");
+ MimeHelper.AddMimeMapping(".shar", "application/x-shar");
+ MimeHelper.AddMimeMapping(".sh", "application/x-sh");
+ MimeHelper.AddMimeMapping(".sit", "application/x-stuffit");
+ MimeHelper.AddMimeMapping(".spl", "application/futuresplash");
+ MimeHelper.AddMimeMapping(".sct", "text/scriptlet");
+ MimeHelper.AddMimeMapping(".scd", "application/x-msschedule");
+ MimeHelper.AddMimeMapping(".sst", "application/vndms-pkicertstore");
+ MimeHelper.AddMimeMapping(".src", "application/x-wais-source");
+ MimeHelper.AddMimeMapping(".sv4cpio", "application/x-sv4cpio");
+ MimeHelper.AddMimeMapping(".tex", "application/x-tex");
+ MimeHelper.AddMimeMapping(".tgz", "application/x-compressed");
+ MimeHelper.AddMimeMapping(".t", "application/x-troff");
+ MimeHelper.AddMimeMapping(".tar", "application/x-tar");
+ MimeHelper.AddMimeMapping(".tr", "application/x-troff");
+ MimeHelper.AddMimeMapping(".tif", "image/tiff");
+ MimeHelper.AddMimeMapping(".txt", "text/plain");
+ MimeHelper.AddMimeMapping(".texinfo", "application/x-texinfo");
+ MimeHelper.AddMimeMapping(".trm", "application/x-msterminal");
+ MimeHelper.AddMimeMapping(".tiff", "image/tiff");
+ MimeHelper.AddMimeMapping(".tcl", "application/x-tcl");
+ MimeHelper.AddMimeMapping(".texi", "application/x-texinfo");
+ MimeHelper.AddMimeMapping(".tsv", "text/tab-separated-values");
+ MimeHelper.AddMimeMapping(".ustar", "application/x-ustar");
+ MimeHelper.AddMimeMapping(".uls", "text/iuls");
+ MimeHelper.AddMimeMapping(".vcf", "text/x-vcard");
+ MimeHelper.AddMimeMapping(".wps", "application/vnd.ms-works");
+ MimeHelper.AddMimeMapping(".wav", "audio/wav");
+ MimeHelper.AddMimeMapping(".wrz", "x-world/x-vrml");
+ MimeHelper.AddMimeMapping(".wri", "application/x-mswrite");
+ MimeHelper.AddMimeMapping(".wks", "application/vnd.ms-works");
+ MimeHelper.AddMimeMapping(".wmf", "application/x-msmetafile");
+ MimeHelper.AddMimeMapping(".wcm", "application/vnd.ms-works");
+ MimeHelper.AddMimeMapping(".wrl", "x-world/x-vrml");
+ MimeHelper.AddMimeMapping(".wdb", "application/vnd.ms-works");
+ MimeHelper.AddMimeMapping(".wsdl", "text/xml");
+ MimeHelper.AddMimeMapping(".xap", "application/x-silverlight-app");
+ MimeHelper.AddMimeMapping(".xml", "text/xml");
+ MimeHelper.AddMimeMapping(".xlm", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xaf", "x-world/x-vrml");
+ MimeHelper.AddMimeMapping(".xla", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xls", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xlsx", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xof", "x-world/x-vrml");
+ MimeHelper.AddMimeMapping(".xlt", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xlc", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xsl", "text/xml");
+ MimeHelper.AddMimeMapping(".xbm", "image/x-xbitmap");
+ MimeHelper.AddMimeMapping(".xlw", "application/vnd.ms-excel");
+ MimeHelper.AddMimeMapping(".xpm", "image/x-xpixmap");
+ MimeHelper.AddMimeMapping(".xwd", "image/x-xwindowdump");
+ MimeHelper.AddMimeMapping(".xsd", "text/xml");
+ MimeHelper.AddMimeMapping(".z", "application/x-compress");
+ MimeHelper.AddMimeMapping(".zip", "application/x-zip-compressed");
+ MimeHelper.AddMimeMapping(".*", "application/octet-stream");
+ }
+ }
+
- static MimeHelper()
- {
- MimeHelper._mimeMappingTable = new Hashtable(190, StringComparer.CurrentCultureIgnoreCase);
- MimeHelper.AddMimeMapping(".323", "text/h323");
- MimeHelper.AddMimeMapping(".asx", "video/x-ms-asf");
- MimeHelper.AddMimeMapping(".acx", "application/internet-property-stream");
- MimeHelper.AddMimeMapping(".ai", "application/postscript");
- MimeHelper.AddMimeMapping(".aif", "audio/x-aiff");
- MimeHelper.AddMimeMapping(".aiff", "audio/aiff");
- MimeHelper.AddMimeMapping(".axs", "application/olescript");
- MimeHelper.AddMimeMapping(".aifc", "audio/aiff");
- MimeHelper.AddMimeMapping(".asr", "video/x-ms-asf");
- MimeHelper.AddMimeMapping(".avi", "video/x-msvideo");
- MimeHelper.AddMimeMapping(".asf", "video/x-ms-asf");
- MimeHelper.AddMimeMapping(".au", "audio/basic");
- MimeHelper.AddMimeMapping(".application", "application/x-ms-application");
- MimeHelper.AddMimeMapping(".bin", "application/octet-stream");
- MimeHelper.AddMimeMapping(".bas", "text/plain");
- MimeHelper.AddMimeMapping(".bcpio", "application/x-bcpio");
- MimeHelper.AddMimeMapping(".bmp", "image/bmp");
- MimeHelper.AddMimeMapping(".cdf", "application/x-cdf");
- MimeHelper.AddMimeMapping(".cat", "application/vndms-pkiseccat");
- MimeHelper.AddMimeMapping(".crt", "application/x-x509-ca-cert");
- MimeHelper.AddMimeMapping(".c", "text/plain");
- MimeHelper.AddMimeMapping(".css", "text/css");
- MimeHelper.AddMimeMapping(".cer", "application/x-x509-ca-cert");
- MimeHelper.AddMimeMapping(".crl", "application/pkix-crl");
- MimeHelper.AddMimeMapping(".cmx", "image/x-cmx");
- MimeHelper.AddMimeMapping(".csh", "application/x-csh");
- MimeHelper.AddMimeMapping(".cod", "image/cis-cod");
- MimeHelper.AddMimeMapping(".cpio", "application/x-cpio");
- MimeHelper.AddMimeMapping(".clp", "application/x-msclip");
- MimeHelper.AddMimeMapping(".crd", "application/x-mscardfile");
- MimeHelper.AddMimeMapping(".deploy", "application/octet-stream");
- MimeHelper.AddMimeMapping(".dll", "application/x-msdownload");
- MimeHelper.AddMimeMapping(".dot", "application/msword");
- MimeHelper.AddMimeMapping(".doc", "application/msword");
- MimeHelper.AddMimeMapping(".dvi", "application/x-dvi");
- MimeHelper.AddMimeMapping(".dir", "application/x-director");
- MimeHelper.AddMimeMapping(".dxr", "application/x-director");
- MimeHelper.AddMimeMapping(".der", "application/x-x509-ca-cert");
- MimeHelper.AddMimeMapping(".dib", "image/bmp");
- MimeHelper.AddMimeMapping(".dcr", "application/x-director");
- MimeHelper.AddMimeMapping(".disco", "text/xml");
- MimeHelper.AddMimeMapping(".exe", "application/octet-stream");
- MimeHelper.AddMimeMapping(".etx", "text/x-setext");
- MimeHelper.AddMimeMapping(".evy", "application/envoy");
- MimeHelper.AddMimeMapping(".eml", "message/rfc822");
- MimeHelper.AddMimeMapping(".eps", "application/postscript");
- MimeHelper.AddMimeMapping(".flr", "x-world/x-vrml");
- MimeHelper.AddMimeMapping(".fif", "application/fractals");
- MimeHelper.AddMimeMapping(".gtar", "application/x-gtar");
- MimeHelper.AddMimeMapping(".gif", "image/gif");
- MimeHelper.AddMimeMapping(".gz", "application/x-gzip");
- MimeHelper.AddMimeMapping(".hta", "application/hta");
- MimeHelper.AddMimeMapping(".htc", "text/x-component");
- MimeHelper.AddMimeMapping(".htt", "text/webviewhtml");
- MimeHelper.AddMimeMapping(".h", "text/plain");
- MimeHelper.AddMimeMapping(".hdf", "application/x-hdf");
- MimeHelper.AddMimeMapping(".hlp", "application/winhlp");
- MimeHelper.AddMimeMapping(".html", "text/html");
- MimeHelper.AddMimeMapping(".htm", "text/html");
- MimeHelper.AddMimeMapping(".hqx", "application/mac-binhex40");
- MimeHelper.AddMimeMapping(".isp", "application/x-internet-signup");
- MimeHelper.AddMimeMapping(".iii", "application/x-iphone");
- MimeHelper.AddMimeMapping(".ief", "image/ief");
- MimeHelper.AddMimeMapping(".ivf", "video/x-ivf");
- MimeHelper.AddMimeMapping(".ins", "application/x-internet-signup");
- MimeHelper.AddMimeMapping(".ico", "image/x-icon");
- MimeHelper.AddMimeMapping(".jpg", "image/jpeg");
- MimeHelper.AddMimeMapping(".jfif", "image/pjpeg");
- MimeHelper.AddMimeMapping(".jpe", "image/jpeg");
- MimeHelper.AddMimeMapping(".jpeg", "image/jpeg");
- MimeHelper.AddMimeMapping(".js", "application/x-javascript");
- MimeHelper.AddMimeMapping(".lsx", "video/x-la-asf");
- MimeHelper.AddMimeMapping(".latex", "application/x-latex");
- MimeHelper.AddMimeMapping(".lsf", "video/x-la-asf");
- MimeHelper.AddMimeMapping(".manifest", "application/x-ms-manifest");
- MimeHelper.AddMimeMapping(".mhtml", "message/rfc822");
- MimeHelper.AddMimeMapping(".mny", "application/x-msmoney");
- MimeHelper.AddMimeMapping(".mht", "message/rfc822");
- MimeHelper.AddMimeMapping(".mid", "audio/mid");
- MimeHelper.AddMimeMapping(".mpv2", "video/mpeg");
- MimeHelper.AddMimeMapping(".man", "application/x-troff-man");
- MimeHelper.AddMimeMapping(".mvb", "application/x-msmediaview");
- MimeHelper.AddMimeMapping(".mpeg", "video/mpeg");
- MimeHelper.AddMimeMapping(".m3u", "audio/x-mpegurl");
- MimeHelper.AddMimeMapping(".mdb", "application/x-msaccess");
- MimeHelper.AddMimeMapping(".mpp", "application/vnd.ms-project");
- MimeHelper.AddMimeMapping(".m1v", "video/mpeg");
- MimeHelper.AddMimeMapping(".mpa", "video/mpeg");
- MimeHelper.AddMimeMapping(".me", "application/x-troff-me");
- MimeHelper.AddMimeMapping(".m13", "application/x-msmediaview");
- MimeHelper.AddMimeMapping(".movie", "video/x-sgi-movie");
- MimeHelper.AddMimeMapping(".m14", "application/x-msmediaview");
- MimeHelper.AddMimeMapping(".mpe", "video/mpeg");
- MimeHelper.AddMimeMapping(".mp2", "video/mpeg");
- MimeHelper.AddMimeMapping(".mov", "video/quicktime");
- MimeHelper.AddMimeMapping(".mp3", "audio/mpeg");
- MimeHelper.AddMimeMapping(".mpg", "video/mpeg");
- MimeHelper.AddMimeMapping(".ms", "application/x-troff-ms");
- MimeHelper.AddMimeMapping(".nc", "application/x-netcdf");
- MimeHelper.AddMimeMapping(".nws", "message/rfc822");
- MimeHelper.AddMimeMapping(".oda", "application/oda");
- MimeHelper.AddMimeMapping(".ods", "application/oleobject");
- MimeHelper.AddMimeMapping(".pmc", "application/x-perfmon");
- MimeHelper.AddMimeMapping(".p7r", "application/x-pkcs7-certreqresp");
- MimeHelper.AddMimeMapping(".p7b", "application/x-pkcs7-certificates");
- MimeHelper.AddMimeMapping(".p7s", "application/pkcs7-signature");
- MimeHelper.AddMimeMapping(".pmw", "application/x-perfmon");
- MimeHelper.AddMimeMapping(".ps", "application/postscript");
- MimeHelper.AddMimeMapping(".p7c", "application/pkcs7-mime");
- MimeHelper.AddMimeMapping(".pbm", "image/x-portable-bitmap");
- MimeHelper.AddMimeMapping(".ppm", "image/x-portable-pixmap");
- MimeHelper.AddMimeMapping(".pub", "application/x-mspublisher");
- MimeHelper.AddMimeMapping(".pnm", "image/x-portable-anymap");
- MimeHelper.AddMimeMapping(".png", "image/png");
- MimeHelper.AddMimeMapping(".pml", "application/x-perfmon");
- MimeHelper.AddMimeMapping(".p10", "application/pkcs10");
- MimeHelper.AddMimeMapping(".pfx", "application/x-pkcs12");
- MimeHelper.AddMimeMapping(".p12", "application/x-pkcs12");
- MimeHelper.AddMimeMapping(".pdf", "application/pdf");
- MimeHelper.AddMimeMapping(".pps", "application/vnd.ms-powerpoint");
- MimeHelper.AddMimeMapping(".p7m", "application/pkcs7-mime");
- MimeHelper.AddMimeMapping(".pko", "application/vndms-pkipko");
- MimeHelper.AddMimeMapping(".ppt", "application/vnd.ms-powerpoint");
- MimeHelper.AddMimeMapping(".pmr", "application/x-perfmon");
- MimeHelper.AddMimeMapping(".pma", "application/x-perfmon");
- MimeHelper.AddMimeMapping(".pot", "application/vnd.ms-powerpoint");
- MimeHelper.AddMimeMapping(".prf", "application/pics-rules");
- MimeHelper.AddMimeMapping(".pgm", "image/x-portable-graymap");
- MimeHelper.AddMimeMapping(".qt", "video/quicktime");
- MimeHelper.AddMimeMapping(".ra", "audio/x-pn-realaudio");
- MimeHelper.AddMimeMapping(".rgb", "image/x-rgb");
- MimeHelper.AddMimeMapping(".ram", "audio/x-pn-realaudio");
- MimeHelper.AddMimeMapping(".rmi", "audio/mid");
- MimeHelper.AddMimeMapping(".ras", "image/x-cmu-raster");
- MimeHelper.AddMimeMapping(".roff", "application/x-troff");
- MimeHelper.AddMimeMapping(".rtf", "application/rtf");
- MimeHelper.AddMimeMapping(".rtx", "text/richtext");
- MimeHelper.AddMimeMapping(".sv4crc", "application/x-sv4crc");
- MimeHelper.AddMimeMapping(".spc", "application/x-pkcs7-certificates");
- MimeHelper.AddMimeMapping(".setreg", "application/set-registration-initiation");
- MimeHelper.AddMimeMapping(".snd", "audio/basic");
- MimeHelper.AddMimeMapping(".stl", "application/vndms-pkistl");
- MimeHelper.AddMimeMapping(".setpay", "application/set-payment-initiation");
- MimeHelper.AddMimeMapping(".stm", "text/html");
- MimeHelper.AddMimeMapping(".shar", "application/x-shar");
- MimeHelper.AddMimeMapping(".sh", "application/x-sh");
- MimeHelper.AddMimeMapping(".sit", "application/x-stuffit");
- MimeHelper.AddMimeMapping(".spl", "application/futuresplash");
- MimeHelper.AddMimeMapping(".sct", "text/scriptlet");
- MimeHelper.AddMimeMapping(".scd", "application/x-msschedule");
- MimeHelper.AddMimeMapping(".sst", "application/vndms-pkicertstore");
- MimeHelper.AddMimeMapping(".src", "application/x-wais-source");
- MimeHelper.AddMimeMapping(".sv4cpio", "application/x-sv4cpio");
- MimeHelper.AddMimeMapping(".tex", "application/x-tex");
- MimeHelper.AddMimeMapping(".tgz", "application/x-compressed");
- MimeHelper.AddMimeMapping(".t", "application/x-troff");
- MimeHelper.AddMimeMapping(".tar", "application/x-tar");
- MimeHelper.AddMimeMapping(".tr", "application/x-troff");
- MimeHelper.AddMimeMapping(".tif", "image/tiff");
- MimeHelper.AddMimeMapping(".txt", "text/plain");
- MimeHelper.AddMimeMapping(".texinfo", "application/x-texinfo");
- MimeHelper.AddMimeMapping(".trm", "application/x-msterminal");
- MimeHelper.AddMimeMapping(".tiff", "image/tiff");
- MimeHelper.AddMimeMapping(".tcl", "application/x-tcl");
- MimeHelper.AddMimeMapping(".texi", "application/x-texinfo");
- MimeHelper.AddMimeMapping(".tsv", "text/tab-separated-values");
- MimeHelper.AddMimeMapping(".ustar", "application/x-ustar");
- MimeHelper.AddMimeMapping(".uls", "text/iuls");
- MimeHelper.AddMimeMapping(".vcf", "text/x-vcard");
- MimeHelper.AddMimeMapping(".wps", "application/vnd.ms-works");
- MimeHelper.AddMimeMapping(".wav", "audio/wav");
- MimeHelper.AddMimeMapping(".wrz", "x-world/x-vrml");
- MimeHelper.AddMimeMapping(".wri", "application/x-mswrite");
- MimeHelper.AddMimeMapping(".wks", "application/vnd.ms-works");
- MimeHelper.AddMimeMapping(".wmf", "application/x-msmetafile");
- MimeHelper.AddMimeMapping(".wcm", "application/vnd.ms-works");
- MimeHelper.AddMimeMapping(".wrl", "x-world/x-vrml");
- MimeHelper.AddMimeMapping(".wdb", "application/vnd.ms-works");
- MimeHelper.AddMimeMapping(".wsdl", "text/xml");
- MimeHelper.AddMimeMapping(".xap", "application/x-silverlight-app");
- MimeHelper.AddMimeMapping(".xml", "text/xml");
- MimeHelper.AddMimeMapping(".xlm", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xaf", "x-world/x-vrml");
- MimeHelper.AddMimeMapping(".xla", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xls", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xlsx", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xof", "x-world/x-vrml");
- MimeHelper.AddMimeMapping(".xlt", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xlc", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xsl", "text/xml");
- MimeHelper.AddMimeMapping(".xbm", "image/x-xbitmap");
- MimeHelper.AddMimeMapping(".xlw", "application/vnd.ms-excel");
- MimeHelper.AddMimeMapping(".xpm", "image/x-xpixmap");
- MimeHelper.AddMimeMapping(".xwd", "image/x-xwindowdump");
- MimeHelper.AddMimeMapping(".xsd", "text/xml");
- MimeHelper.AddMimeMapping(".z", "application/x-compress");
- MimeHelper.AddMimeMapping(".zip", "application/x-zip-compressed");
- MimeHelper.AddMimeMapping(".*", "application/octet-stream");
- }
- }
-
-
}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileEntity.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileEntity.cs
new file mode 100644
index 00000000..18c9c58f
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileEntity.cs
@@ -0,0 +1,48 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Data.Auditing;
+using Yi.Framework.Ddd.Entities;
+
+namespace Yi.Framework.FileManager
+{
+ ///
+ /// 文件表
+ ///
+ [SugarTable("File")]
+ public class FileEntity : IEntity,IAuditedObject
+ {
+ [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
+ public long Id { get; set; }
+ ///
+ /// 文件类型
+ ///
+ [SugarColumn(ColumnName = "FileContentType")]
+ public string? FileContentType { get; set; }
+ ///
+ /// 文件大小
+ ///
+ [SugarColumn(ColumnName = "FileSize")]
+ public decimal FileSize { get; set; }
+ ///
+ /// 文件名
+ ///
+ [SugarColumn(ColumnName = "FileName")]
+ public string FileName { get; set; }
+ ///
+ /// 文件路径
+ ///
+ [SugarColumn(ColumnName = "FilePath")]
+ public string FilePath { get; set; }
+
+ public DateTime CreationTime { get; set; }
+ public long? CreatorId { get; set; }
+
+ public long? LastModifierId { get; set; }
+
+ public DateTime? LastModificationTime { get; set; }
+ }
+}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileGetListOutputDto.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileGetListOutputDto.cs
new file mode 100644
index 00000000..9cc4c5e4
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileGetListOutputDto.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.Ddd.Dtos;
+
+namespace Yi.Framework.FileManager
+{
+ public class FileGetListOutputDto:IEntityDto
+ {
+ public long Id { get; set; }
+ }
+}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs
new file mode 100644
index 00000000..59f89626
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/FileService.cs
@@ -0,0 +1,158 @@
+using Cike.AutoWebApi.Setting;
+using Mapster;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Yi.Framework.AspNetCore.Extensions;
+using Yi.Framework.Core.Const;
+using Yi.Framework.Core.Enums;
+using Yi.Framework.Core.Helper;
+using Yi.Framework.Ddd.Repositories;
+using Yi.Framework.Ddd.Services;
+using Yi.Framework.Ddd.Services.Abstract;
+using Yi.Framework.ThumbnailSharp;
+
+namespace Yi.Framework.FileManager
+{
+ ///
+ /// 文件处理
+ ///
+ public class FileService : ApplicationService, IFileService, IAutoApiService
+ {
+ private readonly IRepository _repository;
+ private readonly ThumbnailSharpManager _thumbnailSharpManager;
+ private readonly HttpContext _httpContext;
+ public FileService(IRepository repository, ThumbnailSharpManager thumbnailSharpManager, IHttpContextAccessor httpContextAccessor
+ )
+ {
+ _repository = repository;
+ _thumbnailSharpManager = thumbnailSharpManager;
+ if (httpContextAccessor.HttpContext is null)
+ {
+ throw new ApplicationException("HttpContext为空");
+ }
+ _httpContext = httpContextAccessor.HttpContext;
+ }
+
+ ///
+ /// 下载文件,是否缩略图
+ ///
+ ///
+ [Route("/api/file/{code}/{isThumbnail?}")]
+ public async Task Get([FromRoute] long code, [FromRoute] bool? isThumbnail)
+ {
+ var file = await _repository.GetByIdAsync(code);
+ if (file is null)
+ {
+ return new NotFoundResult();
+ }
+
+ var path = file.FilePath;
+ //如果为缩略图，需要修改路径
+ if (isThumbnail is true)
+ {
+ path = $"{PathConst.wwwroot}/{FileTypeEnum.Thumbnail}/{file.Id}{Path.GetExtension(file.FileName)}";
+ }
+ //路径为： 文件路径/文件id+文件扩展名
+
+ if (!File.Exists(path))
+ {
+ return new NotFoundResult();
+ }
+
+ var steam = await File.ReadAllBytesAsync(path);
+
+ //设置附件下载，下载名称
+ _httpContext.FileAttachmentHandle(file.FileName);
+ return new FileContentResult(steam, file.FileContentType ?? @"text/plain");
+ }
+
+ ///
+ /// 上传文件
+ ///
+ ///
+ public async Task> Post([FromForm] IFormFileCollection file)
+ {
+ if (file.Count() == 0)
+ {
+ throw new ArgumentException("文件上传为空！");
+ }
+ //批量插入
+ List entities = new();
+
+ foreach (var f in file)
+ {
+ FileEntity data = new();
+ data.Id = SnowflakeHelper.NextId;
+ data.FileSize = ((decimal)f.Length) / 1024;
+ data.FileName = f.FileName;
+
+
+ data.FileContentType = MimeHelper.GetMimeMapping(f.FileName);
+
+
+ var type = MimeHelper.GetFileType(f.FileName);
+
+ //落盘文件，文件名为雪花id+自己的扩展名
+ string filename = data.Id.ToString() + Path.GetExtension(f.FileName);
+ string typePath = $"{PathConst.wwwroot}/{type}";
+ if (!Directory.Exists(typePath))
+ {
+ Directory.CreateDirectory(typePath);
+ }
+
+ var filePath = Path.Combine(typePath, filename);
+ data.FilePath = filePath;
+
+
+ //生成文件
+ using (var stream = new FileStream(filePath, FileMode.CreateNew, FileAccess.ReadWrite))
+ {
+ await f.CopyToAsync(stream);
+
+ //如果是图片类型，还需要生成缩略图,当然，如果图片很小，直接复制过去即可
+ if (FileTypeEnum.Image.Equals(type))
+ {
+ string thumbnailPath = $"{PathConst.wwwroot}/{FileTypeEnum.Thumbnail}";
+ if (!Directory.Exists(thumbnailPath))
+ {
+ Directory.CreateDirectory(thumbnailPath);
+ }
+ //保存至缩略图路径
+ byte[] result = null!;
+ try
+ {
+ result = _thumbnailSharpManager.CreateThumbnailBytes(thumbnailSize: 300, imageStream: stream, imageFormat: Format.Jpeg);
+ }
+ catch
+ {
+ result = new byte[stream.Length];
+ stream.Read(result, 0, result.Length);
+ // 设置当前流的位置为流的开始
+ stream.Seek(0, SeekOrigin.Begin);
+ }
+ finally
+ {
+
+ await System.IO.File.WriteAllBytesAsync(Path.Combine(thumbnailPath, filename), result);
+ }
+ }
+
+
+ };
+ entities.Add(data);
+ }
+ await _repository.InsertRangeAsync(entities);
+ return entities.Adapt>();
+
+
+ }
+ }
+}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/IFileService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/IFileService.cs
new file mode 100644
index 00000000..ad47147f
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/IFileService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.FileManager
+{
+ public interface IFileService
+ {
+ }
+}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj
index 4317b5b8..453826c2 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj
@@ -4,10 +4,15 @@
net6.0
enable
enable
+ True
+
+
+
+
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs
index 371a8b6a..34d1deb2 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs
@@ -1,7 +1,20 @@
-namespace Yi.Framework.FileManager
-{
- public class YiFrameworkFileManagerModule
- {
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using StartupModules;
+namespace Yi.Framework.FileManager
+{
+ public class YiFrameworkFileManagerModule : IStartupModule
+ {
+ public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context)
+ {
+
+ }
+
+ public void ConfigureServices(IServiceCollection services, ConfigureServicesContext context)
+ {
+ services.AddTransient();
+ services.AddTransient();
+ }
}
}
\ No newline at end of file
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
index e4000629..5aad5dba 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
@@ -17,6 +17,7 @@
+
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
index 06869cdb..0c06234c 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Yi.Framework.Core.Attributes;
using Yi.Framework.Data;
using Yi.Framework.EventBus;
+using Yi.Framework.FileManager;
using Yi.Framework.OperLogManager;
using Yi.Framework.ThumbnailSharp;
using Yi.RBAC.Domain.Logs;
@@ -22,7 +23,8 @@ namespace Yi.RBAC.Domain
typeof(YiFrameworkDataModule),
typeof(YiFrameworkThumbnailSharpModule),
typeof(YiFrameworkEventBusModule),
- typeof(YiFrameworkOperLogManagerModule)
+ typeof(YiFrameworkOperLogManagerModule),
+ typeof(YiFrameworkFileManagerModule)
)]
public class YiRBACDomainModule : IStartupModule
{
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628277864304640.txt b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628277864304640.txt
new file mode 100644
index 00000000..119417d4
--- /dev/null
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628277864304640.txt
@@ -0,0 +1,28 @@
+3-5
+一周一次
+
+实现涂膜功能
+1：数据存储，Crud
+2：后台线程，任务调度
+3：plc通信交互，IM工厂
+4：定时任务界面管控
+5：signlr开发
+6：授权鉴权
+7：用户角色菜单模块
+8：配置文件统一标准化
+9：规范问题
+10：动态api
+11：发布订阅
+12：resful
+13：dto注释
+14：代码中文
+15：种子数据
+
+1：job任务调度的模式，可以在if上的改
+2：Crud，EntityServiceBase，考虑复用的话sqlsugar这块就不用动了、仓储、工作单元、过滤器
+3：IOptionsWritable ，直接可以复用
+4：事件，是否需要，需要的话，用哪个
+5：动态api，是否需要
+6：IM,IVarReader中的IDataChannel工厂
+6：ISignal
+7：微软日志扩展，这块是否考虑封装出来，还是直接提供微软日志的扩展，我们提供模板就可以了
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628396160454656.txt b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628396160454656.txt
new file mode 100644
index 00000000..119417d4
--- /dev/null
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628396160454656.txt
@@ -0,0 +1,28 @@
+3-5
+一周一次
+
+实现涂膜功能
+1：数据存储，Crud
+2：后台线程，任务调度
+3：plc通信交互，IM工厂
+4：定时任务界面管控
+5：signlr开发
+6：授权鉴权
+7：用户角色菜单模块
+8：配置文件统一标准化
+9：规范问题
+10：动态api
+11：发布订阅
+12：resful
+13：dto注释
+14：代码中文
+15：种子数据
+
+1：job任务调度的模式，可以在if上的改
+2：Crud，EntityServiceBase，考虑复用的话sqlsugar这块就不用动了、仓储、工作单元、过滤器
+3：IOptionsWritable ，直接可以复用
+4：事件，是否需要，需要的话，用哪个
+5：动态api，是否需要
+6：IM,IVarReader中的IDataChannel工厂
+6：ISignal
+7：微软日志扩展，这块是否考虑封装出来，还是直接提供微软日志的扩展，我们提供模板就可以了
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628415508779008.txt b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628415508779008.txt
new file mode 100644
index 00000000..119417d4
--- /dev/null
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628628415508779008.txt
@@ -0,0 +1,28 @@
+3-5
+一周一次
+
+实现涂膜功能
+1：数据存储，Crud
+2：后台线程，任务调度
+3：plc通信交互，IM工厂
+4：定时任务界面管控
+5：signlr开发
+6：授权鉴权
+7：用户角色菜单模块
+8：配置文件统一标准化
+9：规范问题
+10：动态api
+11：发布订阅
+12：resful
+13：dto注释
+14：代码中文
+15：种子数据
+
+1：job任务调度的模式，可以在if上的改
+2：Crud，EntityServiceBase，考虑复用的话sqlsugar这块就不用动了、仓储、工作单元、过滤器
+3：IOptionsWritable ，直接可以复用
+4：事件，是否需要，需要的话，用哪个
+5：动态api，是否需要
+6：IM,IVarReader中的IDataChannel工厂
+6：ISignal
+7：微软日志扩展，这块是否考虑封装出来，还是直接提供微软日志的扩展，我们提供模板就可以了
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628636925021786112.txt b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628636925021786112.txt
new file mode 100644
index 00000000..119417d4
--- /dev/null
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/File/1628636925021786112.txt
@@ -0,0 +1,28 @@
+3-5
+一周一次
+
+实现涂膜功能
+1：数据存储，Crud
+2：后台线程，任务调度
+3：plc通信交互，IM工厂
+4：定时任务界面管控
+5：signlr开发
+6：授权鉴权
+7：用户角色菜单模块
+8：配置文件统一标准化
+9：规范问题
+10：动态api
+11：发布订阅
+12：resful
+13：dto注释
+14：代码中文
+15：种子数据
+
+1：job任务调度的模式，可以在if上的改
+2：Crud，EntityServiceBase，考虑复用的话sqlsugar这块就不用动了、仓储、工作单元、过滤器
+3：IOptionsWritable ，直接可以复用
+4：事件，是否需要，需要的话，用哪个
+5：动态api，是否需要
+6：IM,IVarReader中的IDataChannel工厂
+6：ISignal
+7：微软日志扩展，这块是否考虑封装出来，还是直接提供微软日志的扩展，我们提供模板就可以了
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639014875697152.jpg b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639014875697152.jpg
new file mode 100644
index 00000000..57c1f446
Binary files /dev/null and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639014875697152.jpg differ
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639326948691968.jpg b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639326948691968.jpg
new file mode 100644
index 00000000..57c1f446
Binary files /dev/null and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Image/1628639326948691968.jpg differ
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Thumbnail/1628639326948691968.jpg b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Thumbnail/1628639326948691968.jpg
new file mode 100644
index 00000000..446af2c8
Binary files /dev/null and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/wwwroot/Thumbnail/1628639326948691968.jpg differ
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db
index 3025232e..578acc3b 100644
Binary files a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/yi-sqlsugar-dev.db differ