diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs index b2ca8438..b48014c3 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using System; @@ -40,6 +41,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers public async Task Login(user _user) { var user_data = await _userService.Login(_user); + if (user_data == null) + { + return Result.Error("该用户不存在"); + } var menuList = await _menuService.GetTopMenuByUserId(user_data.id); if ( user_data!=null) { @@ -152,6 +157,16 @@ namespace Yi.Framework.ApiMicroservice.Controllers return Result.Success(msg); } - + [HttpGet] + public async Task EditIcon(int userId,IFormFile file) + { + var user_data = await _userService.GetUserById(userId); + var fileController = new FileController(); + var type = Common.Const.FileConst.Image; + var filename= fileController.Upload(type,file); + user_data.icon = filename.ToString(); + await _userService.UpdateAsync(user_data); + return Result.Success(); + } } } \ No newline at end of file diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/FileController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/FileController.cs new file mode 100644 index 00000000..81f6e525 --- /dev/null +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/FileController.cs @@ -0,0 +1,67 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Yi.Framework.Common.Models; +using Yi.Framework.Interface; +using Yi.Framework.WebCore; + +namespace Yi.Framework.ApiMicroservice.Controllers +{ + [Route("api/[controller]/[action]")] + [ApiController] + public class FileController : ControllerBase + { + private IUserService _userService; + private readonly IHostEnvironment _env; + public FileController(IUserService userService, IHostEnvironment env) + { + _userService = userService; + _env = env; + } + + public FileController() + { + } + + [HttpGet] + [Route("{type}/{imageNmae}")] + public IActionResult Get(string type, string imageNmae) + { + var path = Path.Combine(@"wwwroot/file", imageNmae); + var stream = System.IO.File.OpenRead(path); + var MimeType = Common.Helper.MimeMapping.GetMimeMapping(imageNmae); + return new FileStreamResult(stream, MimeType); + } + + [HttpPost] + [Route("{type}/{imageNmae}")] + public async Task Upload(string type,IFormFile file) + { + if (type != Common.Const.FileConst.Image) { return Result.Error(); } + string filename = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName); + string filepath = Path.Combine(@"wwwroot/image", filename); + using (var stream = new FileStream(Path.Combine(_env.ContentRootPath, filepath), FileMode.CreateNew, FileAccess.Write)) + { + await file.CopyToAsync(stream); + } + + return Result.Success().SetData(filename); + } + [HttpGet] + public async Task GetFile() + { + var userdata = await _userService.GetAllEntitiesTrueAsync(); + var userList = userdata.ToList(); + Dictionary dt = new(); + dt.Add("sc", "user"); + var bt = Excel.ExportExcel(userList, dt); + MemoryStream ms = new(bt); + return new FileStreamResult(ms, "application/vnd.ms-excel"); + } + } +} diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs index c7fb0744..4681efe4 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/RoleController.cs @@ -107,13 +107,13 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// 用于给角色设置菜单的时候，点击一个角色，显示这个角色拥有的并列的菜单 /// - /// + /// /// [HttpGet] - public async Task GetTopMenusByRoleId(role role) + public async Task GetTopMenusByRoleId(int roleId) { - return Result.Success().SetData(await _roleService.GetTopMenusByRoleId(role.id) ); ; + return Result.Success().SetData(await _roleService.GetTopMenusByRoleId(roleId) ); ; } } } diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs index f8eb206a..10f3e159 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs @@ -120,7 +120,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers [HttpGet] public async Task GetAxiosByRouter(string router) { + var _user = HttpContext.GetCurrentUserInfo(out List menuIds); + if (menuIds == null) + { + return Result.Error(); + } var menuList= await _userService.GetAxiosByRouter(router, _user.id, menuIds); AxiosUrlsModel urlsModel = new(); menuList.ForEach(u => diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj b/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj index b4833ceb..c7ef45b5 100644 --- a/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj +++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Yi.Framework.ApiMicroservice.csproj @@ -24,4 +24,9 @@ + + + + + diff --git a/Yi.Framework/Yi.Framework.Common/Const/FileConst.cs b/Yi.Framework/Yi.Framework.Common/Const/FileConst.cs new file mode 100644 index 00000000..a7ae7119 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Common/Const/FileConst.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Common.Const +{ + public class FileConst + { + public const string Image = "Image"; + public const string File = "File"; + } +} diff --git a/Yi.Framework/Yi.Framework.Common/Helper/MimeMapping.cs b/Yi.Framework/Yi.Framework.Common/Helper/MimeMapping.cs new file mode 100644 index 00000000..47d38753 --- /dev/null +++ b/Yi.Framework/Yi.Framework.Common/Helper/MimeMapping.cs @@ -0,0 +1,243 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Yi.Framework.Common.Helper +{ + public static class MimeMapping + { + // 通过自己定义一个静态类 + // 将所有的Content Type都扔进去吧 + // 调用的时候直接调用静态方法即可。 + + private static Hashtable _mimeMappingTable; + + private static void AddMimeMapping(string extension, string MimeType) + { + MimeMapping._mimeMappingTable.Add(extension, MimeType); + } + + public static string GetMimeMapping(string FileName) + { + string text = null; + int num = FileName.LastIndexOf('.'); + if (0 < num && num > FileName.LastIndexOf('\\')) + { + text = (string)MimeMapping._mimeMappingTable[FileName.Substring(num)]; + } + if (text == null) + { + text = (string)MimeMapping._mimeMappingTable[".*"]; + } + return text; + } + + static MimeMapping() + { + MimeMapping._mimeMappingTable = new Hashtable(190, StringComparer.CurrentCultureIgnoreCase); + MimeMapping.AddMimeMapping(".323", "text/h323"); + MimeMapping.AddMimeMapping(".asx", "video/x-ms-asf"); + MimeMapping.AddMimeMapping(".acx", "application/internet-property-stream"); + MimeMapping.AddMimeMapping(".ai", "application/postscript"); + MimeMapping.AddMimeMapping(".aif", "audio/x-aiff"); + MimeMapping.AddMimeMapping(".aiff", "audio/aiff"); + MimeMapping.AddMimeMapping(".axs", "application/olescript"); + MimeMapping.AddMimeMapping(".aifc", "audio/aiff"); + MimeMapping.AddMimeMapping(".asr", "video/x-ms-asf"); + MimeMapping.AddMimeMapping(".avi", "video/x-msvideo"); + MimeMapping.AddMimeMapping(".asf", "video/x-ms-asf"); + MimeMapping.AddMimeMapping(".au", "audio/basic"); + MimeMapping.AddMimeMapping(".application", "application/x-ms-application"); + MimeMapping.AddMimeMapping(".bin", "application/octet-stream"); + MimeMapping.AddMimeMapping(".bas", "text/plain"); + MimeMapping.AddMimeMapping(".bcpio", "application/x-bcpio"); + MimeMapping.AddMimeMapping(".bmp", "image/bmp"); + MimeMapping.AddMimeMapping(".cdf", "application/x-cdf"); + MimeMapping.AddMimeMapping(".cat", "application/vndms-pkiseccat"); + MimeMapping.AddMimeMapping(".crt", "application/x-x509-ca-cert"); + MimeMapping.AddMimeMapping(".c", "text/plain"); + MimeMapping.AddMimeMapping(".css", "text/css"); + MimeMapping.AddMimeMapping(".cer", "application/x-x509-ca-cert"); + MimeMapping.AddMimeMapping(".crl", "application/pkix-crl"); + MimeMapping.AddMimeMapping(".cmx", "image/x-cmx"); + MimeMapping.AddMimeMapping(".csh", "application/x-csh"); + MimeMapping.AddMimeMapping(".cod", "image/cis-cod"); + MimeMapping.AddMimeMapping(".cpio", "application/x-cpio"); + MimeMapping.AddMimeMapping(".clp", "application/x-msclip"); + MimeMapping.AddMimeMapping(".crd", "application/x-mscardfile"); + MimeMapping.AddMimeMapping(".deploy", "application/octet-stream"); + MimeMapping.AddMimeMapping(".dll", "application/x-msdownload"); + MimeMapping.AddMimeMapping(".dot", "application/msword"); + MimeMapping.AddMimeMapping(".doc", "application/msword"); + MimeMapping.AddMimeMapping(".dvi", "application/x-dvi"); + MimeMapping.AddMimeMapping(".dir", "application/x-director"); + MimeMapping.AddMimeMapping(".dxr", "application/x-director"); + MimeMapping.AddMimeMapping(".der", "application/x-x509-ca-cert"); + MimeMapping.AddMimeMapping(".dib", "image/bmp"); + MimeMapping.AddMimeMapping(".dcr", "application/x-director"); + MimeMapping.AddMimeMapping(".disco", "text/xml"); + MimeMapping.AddMimeMapping(".exe", "application/octet-stream"); + MimeMapping.AddMimeMapping(".etx", "text/x-setext"); + MimeMapping.AddMimeMapping(".evy", "application/envoy"); + MimeMapping.AddMimeMapping(".eml", "message/rfc822"); + MimeMapping.AddMimeMapping(".eps", "application/postscript"); + MimeMapping.AddMimeMapping(".flr", "x-world/x-vrml"); + MimeMapping.AddMimeMapping(".fif", "application/fractals"); + MimeMapping.AddMimeMapping(".gtar", "application/x-gtar"); + MimeMapping.AddMimeMapping(".gif", "image/gif"); + MimeMapping.AddMimeMapping(".gz", "application/x-gzip"); + MimeMapping.AddMimeMapping(".hta", "application/hta"); + MimeMapping.AddMimeMapping(".htc", "text/x-component"); + MimeMapping.AddMimeMapping(".htt", "text/webviewhtml"); + MimeMapping.AddMimeMapping(".h", "text/plain"); + MimeMapping.AddMimeMapping(".hdf", "application/x-hdf"); + MimeMapping.AddMimeMapping(".hlp", "application/winhlp"); + MimeMapping.AddMimeMapping(".html", "text/html"); + MimeMapping.AddMimeMapping(".htm", "text/html"); + MimeMapping.AddMimeMapping(".hqx", "application/mac-binhex40"); + MimeMapping.AddMimeMapping(".isp", "application/x-internet-signup"); + MimeMapping.AddMimeMapping(".iii", "application/x-iphone"); + MimeMapping.AddMimeMapping(".ief", "image/ief"); + MimeMapping.AddMimeMapping(".ivf", "video/x-ivf"); + MimeMapping.AddMimeMapping(".ins", "application/x-internet-signup"); + MimeMapping.AddMimeMapping(".ico", "image/x-icon"); + MimeMapping.AddMimeMapping(".jpg", "image/jpeg"); + MimeMapping.AddMimeMapping(".jfif", "image/pjpeg"); + MimeMapping.AddMimeMapping(".jpe", "image/jpeg"); + MimeMapping.AddMimeMapping(".jpeg", "image/jpeg"); + MimeMapping.AddMimeMapping(".js", "application/x-javascript"); + MimeMapping.AddMimeMapping(".lsx", "video/x-la-asf"); + MimeMapping.AddMimeMapping(".latex", "application/x-latex"); + MimeMapping.AddMimeMapping(".lsf", "video/x-la-asf"); + MimeMapping.AddMimeMapping(".manifest", "application/x-ms-manifest"); + MimeMapping.AddMimeMapping(".mhtml", "message/rfc822"); + MimeMapping.AddMimeMapping(".mny", "application/x-msmoney"); + MimeMapping.AddMimeMapping(".mht", "message/rfc822"); + MimeMapping.AddMimeMapping(".mid", "audio/mid"); + MimeMapping.AddMimeMapping(".mpv2", "video/mpeg"); + MimeMapping.AddMimeMapping(".man", "application/x-troff-man"); + MimeMapping.AddMimeMapping(".mvb", "application/x-msmediaview"); + MimeMapping.AddMimeMapping(".mpeg", "video/mpeg"); + MimeMapping.AddMimeMapping(".m3u", "audio/x-mpegurl"); + MimeMapping.AddMimeMapping(".mdb", "application/x-msaccess"); + MimeMapping.AddMimeMapping(".mpp", "application/vnd.ms-project"); + MimeMapping.AddMimeMapping(".m1v", "video/mpeg"); + MimeMapping.AddMimeMapping(".mpa", "video/mpeg"); + MimeMapping.AddMimeMapping(".me", "application/x-troff-me"); + MimeMapping.AddMimeMapping(".m13", "application/x-msmediaview"); + MimeMapping.AddMimeMapping(".movie", "video/x-sgi-movie"); + MimeMapping.AddMimeMapping(".m14", "application/x-msmediaview"); + MimeMapping.AddMimeMapping(".mpe", "video/mpeg"); + MimeMapping.AddMimeMapping(".mp2", "video/mpeg"); + MimeMapping.AddMimeMapping(".mov", "video/quicktime"); + MimeMapping.AddMimeMapping(".mp3", "audio/mpeg"); + MimeMapping.AddMimeMapping(".mpg", "video/mpeg"); + MimeMapping.AddMimeMapping(".ms", "application/x-troff-ms"); + MimeMapping.AddMimeMapping(".nc", "application/x-netcdf"); + MimeMapping.AddMimeMapping(".nws", "message/rfc822"); + MimeMapping.AddMimeMapping(".oda", "application/oda"); + MimeMapping.AddMimeMapping(".ods", "application/oleobject"); + MimeMapping.AddMimeMapping(".pmc", "application/x-perfmon"); + MimeMapping.AddMimeMapping(".p7r", "application/x-pkcs7-certreqresp"); + MimeMapping.AddMimeMapping(".p7b", "application/x-pkcs7-certificates"); + MimeMapping.AddMimeMapping(".p7s", "application/pkcs7-signature"); + MimeMapping.AddMimeMapping(".pmw", "application/x-perfmon"); + MimeMapping.AddMimeMapping(".ps", "application/postscript"); + MimeMapping.AddMimeMapping(".p7c", "application/pkcs7-mime"); + MimeMapping.AddMimeMapping(".pbm", "image/x-portable-bitmap"); + MimeMapping.AddMimeMapping(".ppm", "image/x-portable-pixmap"); + MimeMapping.AddMimeMapping(".pub", "application/x-mspublisher"); + MimeMapping.AddMimeMapping(".pnm", "image/x-portable-anymap"); + MimeMapping.AddMimeMapping(".png", "image/png"); + MimeMapping.AddMimeMapping(".pml", "application/x-perfmon"); + MimeMapping.AddMimeMapping(".p10", "application/pkcs10"); + MimeMapping.AddMimeMapping(".pfx", "application/x-pkcs12"); + MimeMapping.AddMimeMapping(".p12", "application/x-pkcs12"); + MimeMapping.AddMimeMapping(".pdf", "application/pdf"); + MimeMapping.AddMimeMapping(".pps", "application/vnd.ms-powerpoint"); + MimeMapping.AddMimeMapping(".p7m", "application/pkcs7-mime"); + MimeMapping.AddMimeMapping(".pko", "application/vndms-pkipko"); + MimeMapping.AddMimeMapping(".ppt", "application/vnd.ms-powerpoint"); + MimeMapping.AddMimeMapping(".pmr", "application/x-perfmon"); + MimeMapping.AddMimeMapping(".pma", "application/x-perfmon"); + MimeMapping.AddMimeMapping(".pot", "application/vnd.ms-powerpoint"); + MimeMapping.AddMimeMapping(".prf", "application/pics-rules"); + MimeMapping.AddMimeMapping(".pgm", "image/x-portable-graymap"); + MimeMapping.AddMimeMapping(".qt", "video/quicktime"); + MimeMapping.AddMimeMapping(".ra", "audio/x-pn-realaudio"); + MimeMapping.AddMimeMapping(".rgb", "image/x-rgb"); + MimeMapping.AddMimeMapping(".ram", "audio/x-pn-realaudio"); + MimeMapping.AddMimeMapping(".rmi", "audio/mid"); + MimeMapping.AddMimeMapping(".ras", "image/x-cmu-raster"); + MimeMapping.AddMimeMapping(".roff", "application/x-troff"); + MimeMapping.AddMimeMapping(".rtf", "application/rtf"); + MimeMapping.AddMimeMapping(".rtx", "text/richtext"); + MimeMapping.AddMimeMapping(".sv4crc", "application/x-sv4crc"); + MimeMapping.AddMimeMapping(".spc", "application/x-pkcs7-certificates"); + MimeMapping.AddMimeMapping(".setreg", "application/set-registration-initiation"); + MimeMapping.AddMimeMapping(".snd", "audio/basic"); + MimeMapping.AddMimeMapping(".stl", "application/vndms-pkistl"); + MimeMapping.AddMimeMapping(".setpay", "application/set-payment-initiation"); + MimeMapping.AddMimeMapping(".stm", "text/html"); + MimeMapping.AddMimeMapping(".shar", "application/x-shar"); + MimeMapping.AddMimeMapping(".sh", "application/x-sh"); + MimeMapping.AddMimeMapping(".sit", "application/x-stuffit"); + MimeMapping.AddMimeMapping(".spl", "application/futuresplash"); + MimeMapping.AddMimeMapping(".sct", "text/scriptlet"); + MimeMapping.AddMimeMapping(".scd", "application/x-msschedule"); + MimeMapping.AddMimeMapping(".sst", "application/vndms-pkicertstore"); + MimeMapping.AddMimeMapping(".src", "application/x-wais-source"); + MimeMapping.AddMimeMapping(".sv4cpio", "application/x-sv4cpio"); + MimeMapping.AddMimeMapping(".tex", "application/x-tex"); + MimeMapping.AddMimeMapping(".tgz", "application/x-compressed"); + MimeMapping.AddMimeMapping(".t", "application/x-troff"); + MimeMapping.AddMimeMapping(".tar", "application/x-tar"); + MimeMapping.AddMimeMapping(".tr", "application/x-troff"); + MimeMapping.AddMimeMapping(".tif", "image/tiff"); + MimeMapping.AddMimeMapping(".txt", "text/plain"); + MimeMapping.AddMimeMapping(".texinfo", "application/x-texinfo"); + MimeMapping.AddMimeMapping(".trm", "application/x-msterminal"); + MimeMapping.AddMimeMapping(".tiff", "image/tiff"); + MimeMapping.AddMimeMapping(".tcl", "application/x-tcl"); + MimeMapping.AddMimeMapping(".texi", "application/x-texinfo"); + MimeMapping.AddMimeMapping(".tsv", "text/tab-separated-values"); + MimeMapping.AddMimeMapping(".ustar", "application/x-ustar"); + MimeMapping.AddMimeMapping(".uls", "text/iuls"); + MimeMapping.AddMimeMapping(".vcf", "text/x-vcard"); + MimeMapping.AddMimeMapping(".wps", "application/vnd.ms-works"); + MimeMapping.AddMimeMapping(".wav", "audio/wav"); + MimeMapping.AddMimeMapping(".wrz", "x-world/x-vrml"); + MimeMapping.AddMimeMapping(".wri", "application/x-mswrite"); + MimeMapping.AddMimeMapping(".wks", "application/vnd.ms-works"); + MimeMapping.AddMimeMapping(".wmf", "application/x-msmetafile"); + MimeMapping.AddMimeMapping(".wcm", "application/vnd.ms-works"); + MimeMapping.AddMimeMapping(".wrl", "x-world/x-vrml"); + MimeMapping.AddMimeMapping(".wdb", "application/vnd.ms-works"); + MimeMapping.AddMimeMapping(".wsdl", "text/xml"); + MimeMapping.AddMimeMapping(".xap", "application/x-silverlight-app"); + MimeMapping.AddMimeMapping(".xml", "text/xml"); + MimeMapping.AddMimeMapping(".xlm", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xaf", "x-world/x-vrml"); + MimeMapping.AddMimeMapping(".xla", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xls", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xof", "x-world/x-vrml"); + MimeMapping.AddMimeMapping(".xlt", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xlc", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xsl", "text/xml"); + MimeMapping.AddMimeMapping(".xbm", "image/x-xbitmap"); + MimeMapping.AddMimeMapping(".xlw", "application/vnd.ms-excel"); + MimeMapping.AddMimeMapping(".xpm", "image/x-xpixmap"); + MimeMapping.AddMimeMapping(".xwd", "image/x-xwindowdump"); + MimeMapping.AddMimeMapping(".xsd", "text/xml"); + MimeMapping.AddMimeMapping(".z", "application/x-compress"); + MimeMapping.AddMimeMapping(".zip", "application/x-zip-compressed"); + MimeMapping.AddMimeMapping(".*", "application/octet-stream"); + } + } + + + +} diff --git a/Yi.Framework/Yi.Framework.Core/MakeJwt.cs b/Yi.Framework/Yi.Framework.Core/MakeJwt.cs index f1ad675c..841351a2 100644 --- a/Yi.Framework/Yi.Framework.Core/MakeJwt.cs +++ b/Yi.Framework/Yi.Framework.Core/MakeJwt.cs @@ -37,7 +37,7 @@ namespace Yi.Framework.Core claims.Add(new Claim(JwtRegisteredClaimNames.Exp, $"{new DateTimeOffset(DateTime.Now.AddMinutes(30)).ToUnixTimeSeconds()}")); claims.Add(new Claim(ClaimTypes.Name, _user.user.username)); claims.Add(new Claim(ClaimTypes.Sid, _user.user.id.ToString())); - foreach (var k in _user.menuIds) + foreach (var k in _user?.menuIds) { claims.Add(new Claim("menuIds",k.id.ToString())); } diff --git a/Yi.Framework/Yi.Framework.Service/MenuService.cs b/Yi.Framework/Yi.Framework.Service/MenuService.cs index 3fba9f09..293202c1 100644 --- a/Yi.Framework/Yi.Framework.Service/MenuService.cs +++ b/Yi.Framework/Yi.Framework.Service/MenuService.cs @@ -32,7 +32,7 @@ namespace Yi.Framework.Service public async Task GetMenuInMould() { var menu_data= await _DbRead.Set().Include(u=>u.mould) - .Include(u => u.children).ThenInclude(u => u.mould) + .Include(u => u.children).ThenInclude(u => u.mould).OrderByDescending(u => u.sort) .Include(u=>u.children).ThenInclude(u => u.children).ThenInclude(u => u.mould) .Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.mould) .Include(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.children).ThenInclude(u => u.mould)