From e6ba4f63f7f11250f1eaec0f32ad860096327714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 08:57:25 +0800 Subject: [PATCH 01/14] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 6ebb0626..d2dd7cc1 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -39,7 +39,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport if (num == 2) { startIndex = i; - + Console.WriteLine($"i={i}"); break; } @@ -50,6 +50,8 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport linesRef.RemoveRange(0, startIndex+1); var result = string.Join(Environment.NewLine, linesRef); + Console.WriteLine($"处理前内容：{x.Content}"); + Console.WriteLine($"处理后内容:{result}"); f.Content = result; return f; }); From 791ec9132aeb5366e49113a68f3367f5e8bb079f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 09:25:02 +0800 Subject: [PATCH 02/14] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 5 +---- Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index d2dd7cc1..93dacd07 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -39,7 +39,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport if (num == 2) { startIndex = i; - Console.WriteLine($"i={i}"); break; } @@ -50,8 +49,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport linesRef.RemoveRange(0, startIndex+1); var result = string.Join(Environment.NewLine, linesRef); - Console.WriteLine($"处理前内容：{x.Content}"); - Console.WriteLine($"处理后内容:{result}"); f.Content = result; return f; }); diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs index 428bf158..2379373f 100644 --- a/Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs +++ b/Yi.Abp.Net8/src/Yi.Abp.Web/Program.cs @@ -2,7 +2,7 @@ using Serilog; using Serilog.Events; using Yi.Abp.Web; -//־,ʹ{SourceContext}¼ +//创建日志,可使用{SourceContext}记录 Log.Logger = new LoggerConfiguration() .MinimumLevel.Debug() .MinimumLevel.Override("Microsoft", LogEventLevel.Information) @@ -15,7 +15,7 @@ Log.Logger = new LoggerConfiguration() try { - Log.Information("Yi-Abp.vNext"); + Log.Information("Yi框架-Abp.vNext，启动！"); var builder = WebApplication.CreateBuilder(args); builder.WebHost.UseUrls(builder.Configuration["App:SelfUrl"]); @@ -28,7 +28,7 @@ try } catch (Exception ex) { - Log.Fatal(ex, "Yi-Abp.vNextը"); + Log.Fatal(ex, "Yi框架-Abp.vNext，爆炸！"); } finally { From 52db51ce103083117d9a8d3005629bbdfda699eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 09:44:34 +0800 Subject: [PATCH 03/14] =?UTF-8?q?style:=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArticleImport/AbstractArticleImport.cs | 8 ++- .../ArticleImport/VuePressArticleImport.cs | 55 +++++++++++-------- .../Managers/ForumManager.cs | 4 +- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs index c39b5dec..48d497bc 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Yi.Framework.Bbs.Domain.Entities; using Yi.Framework.Bbs.Domain.Shared.Model; @@ -10,7 +11,12 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { public abstract class AbstractArticleImport { - public virtual List Import(Guid discussId,Guid articleParentId, List fileObjs) + public void SetLogger(ILoggerFactory loggerFactory) + { + LoggerFactory = loggerFactory; + } + protected ILoggerFactory LoggerFactory { get; set; } + public virtual List Import(Guid discussId, Guid articleParentId, List fileObjs) { var articles = Convert(fileObjs); articles.ForEach(article => diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 93dacd07..48507e0b 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Microsoft.Extensions.Logging; using Yi.Framework.Bbs.Domain.Entities; using Yi.Framework.Bbs.Domain.Shared.Model; @@ -12,6 +13,8 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { public override List Convert(List fileObjs) { + var logger = LoggerFactory.CreateLogger(); + //排序及处理目录名称 var fileNameHandler = fileObjs.OrderBy(x => x.FileName).Select(x => { @@ -24,34 +27,38 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport //处理内容 - var fileContentHandler= fileNameHandler.Select(x => - { - var f = new FileObject { FileName = x.FileName }; - var lines = x.Content.SplitToLines(); + var fileContentHandler = fileNameHandler.Select(x => + { + logger.LogError($"老的值：{x.Content}"); + var f = new FileObject { FileName = x.FileName }; + var lines = x.Content.SplitToLines(); - var num = 0; - var startIndex = 0; - for (int i = 0; i < lines.Length; i++) - { - if (lines[i] == "---") - { - num++; - if (num == 2) - { - startIndex = i; - break; - } + var num = 0; + var startIndex = 0; + for (int i = 0; i < lines.Length; i++) + { + if (lines[i] == "---") + { + num++; + if (num == 2) + { + startIndex = i; + logger.LogError($"startIndex={startIndex}"); + break; + } - } + } - } - var linesRef = lines.ToList(); + } + var linesRef = lines.ToList(); - linesRef.RemoveRange(0, startIndex+1); - var result = string.Join(Environment.NewLine, linesRef); - f.Content = result; - return f; - }); + linesRef.RemoveRange(0, startIndex + 1); + + var result = string.Join(Environment.NewLine, linesRef); + logger.LogError($"新的值:{result}"); + f.Content = result; + return f; + }); var output = fileContentHandler.Select(x => new ArticleEntity() { Content = x.Content, Name = x.FileName }).ToList(); diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs index 8e57f5b4..2d6dab58 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs @@ -57,7 +57,7 @@ namespace Yi.Framework.Bbs.Domain.Managers AbstractArticleImport abstractArticleImport = default; switch (importType) { - case ArticleImportTypeEnum.Default: + case ArticleImportTypeEnum.Defalut: abstractArticleImport = new DefaultArticleImport(); break; @@ -67,7 +67,7 @@ namespace Yi.Framework.Bbs.Domain.Managers default: abstractArticleImport = new DefaultArticleImport(); break; } - + abstractArticleImport.SetLogger(LoggerFactory); var articleHandled = abstractArticleImport.Import(discussId, articleParentId, fileObjs); await _articleRepository.InsertManyAsync(articleHandled); From 1126419e2eb0e9086da48006c5fb9f1f34c4a77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 09:46:29 +0800 Subject: [PATCH 04/14] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs index 2d6dab58..8dc50597 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ForumManager.cs @@ -57,7 +57,7 @@ namespace Yi.Framework.Bbs.Domain.Managers AbstractArticleImport abstractArticleImport = default; switch (importType) { - case ArticleImportTypeEnum.Defalut: + case ArticleImportTypeEnum.Default: abstractArticleImport = new DefaultArticleImport(); break; From cb07b0466405f5e7437c78fafef240c4a5c0e1af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:17:13 +0800 Subject: [PATCH 05/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 48507e0b..526b01af 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -37,13 +37,13 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport var startIndex = 0; for (int i = 0; i < lines.Length; i++) { - if (lines[i] == "---") + //编码问题 + if (lines[i] == "---" || lines[i]== "---") { num++; if (num == 2) { startIndex = i; - logger.LogError($"startIndex={startIndex}"); break; } @@ -52,10 +52,11 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport } var linesRef = lines.ToList(); - linesRef.RemoveRange(0, startIndex + 1); - + if (startIndex != 0) + { + linesRef.RemoveRange(0, startIndex + 1); + } var result = string.Join(Environment.NewLine, linesRef); - logger.LogError($"新的值:{result}"); f.Content = result; return f; }); From 6253fed3bbc93f65eb9862a6fbfe6dbd9df61f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:24:58 +0800 Subject: [PATCH 06/14] =?UTF-8?q?style=EF=BC=9B=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 526b01af..6942fcff 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -38,7 +38,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport for (int i = 0; i < lines.Length; i++) { //编码问题 - if (lines[i] == "---" || lines[i]== "---") + if (lines[i] == "---") { num++; if (num == 2) @@ -56,6 +56,11 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { linesRef.RemoveRange(0, startIndex + 1); } + else + { + //去除头部 + linesRef.RemoveRange(0,6); + } var result = string.Join(Environment.NewLine, linesRef); f.Content = result; return f; From d3c989036a15b4c0c83ecbe88696cf9cefa3d224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:28:01 +0800 Subject: [PATCH 07/14] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 6942fcff..34613bee 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -38,6 +38,7 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport for (int i = 0; i < lines.Length; i++) { //编码问题 + logger.LogError($"输出行:{lines[i]}"); if (lines[i] == "---") { num++; From 72d1dcd75cd8fae3ecfe9b935d4823bbd76e1a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:36:07 +0800 Subject: [PATCH 08/14] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/ArticleImport/VuePressArticleImport.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 34613bee..6942fcff 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -38,7 +38,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport for (int i = 0; i < lines.Length; i++) { //编码问题 - logger.LogError($"输出行:{lines[i]}"); if (lines[i] == "---") { num++; From 8fa19b3190e2aba8093028b3c9eb7691f9d7568f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:47:36 +0800 Subject: [PATCH 09/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87?= =?UTF-8?q?=E7=AB=A0=E5=AF=BC=E5=85=A5=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs | 5 +++++ .../Managers/ArticleImport/AbstractArticleImport.cs | 3 +++ .../Managers/ArticleImport/VuePressArticleImport.cs | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs index 21652fc6..a46c8cb4 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Entities/ArticleEntity.cs @@ -33,6 +33,11 @@ namespace Yi.Framework.Bbs.Domain.Entities public Guid? LastModifierId { get; set; } public DateTime? LastModificationTime { get; set; } + + /// + /// 排序 + /// + public int OrderNum { get; set; } = 0; } public static class ArticleEntityExtensions diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs index 48d497bc..85de471d 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/AbstractArticleImport.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Yi.Framework.Bbs.Domain.Entities; using Yi.Framework.Bbs.Domain.Shared.Model; +using Yi.Framework.Core.Data; namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport { @@ -19,10 +20,12 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport public virtual List Import(Guid discussId, Guid articleParentId, List fileObjs) { var articles = Convert(fileObjs); + var orderNum = 0; articles.ForEach(article => { article.DiscussId = discussId; article.ParentId = articleParentId; + article.OrderNum = ++orderNum; }); return articles; } diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs index 6942fcff..e6186748 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/ArticleImport/VuePressArticleImport.cs @@ -65,7 +65,6 @@ namespace Yi.Framework.Bbs.Domain.Managers.ArticleImport f.Content = result; return f; }); - var output = fileContentHandler.Select(x => new ArticleEntity() { Content = x.Content, Name = x.FileName }).ToList(); return output; From 0bc5d865b03fc6f186aaedab3b4b2ac5f3eb9ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:50:20 +0800 Subject: [PATCH 10/14] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/ArticleRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs index ea3e47f4..1b0a200c 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.SqlSugarCore/Repositories/ArticleRepository.cs @@ -15,7 +15,7 @@ namespace Yi.Framework.Bbs.SqlSugarCore.Repositories public async Task> GetTreeAsync(Expression> where) { - return await _DbQueryable.Where(where).OrderBy(x=>x.CreationTime).ToTreeAsync(x => x.Children, x => x.ParentId, Guid.Empty); + return await _DbQueryable.Where(where).OrderBy(x=>x.OrderNum).OrderBy(x=>x.CreationTime).ToTreeAsync(x => x.Children, x => x.ParentId, Guid.Empty); } } } From 5bc2abb0dfbd176e67b05b66766c094dd9ea248d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <454313500@qq.com> Date: Fri, 5 Jan 2024 10:54:07 +0800 Subject: [PATCH 11/14] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E5=96=84dto?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dtos/Discuss/DiscussUpdateInputVo.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Discuss/DiscussUpdateInputVo.cs b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Discuss/DiscussUpdateInputVo.cs index 5afefc8b..ec5df132 100644 --- a/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Discuss/DiscussUpdateInputVo.cs +++ b/Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application.Contracts/Dtos/Discuss/DiscussUpdateInputVo.cs @@ -7,8 +7,6 @@ namespace Yi.Framework.Bbs.Application.Contracts.Dtos.Discuss public string Title { get; set; } public string? Types { get; set; } public string? Introduction { get; set; } - public int AgreeNum { get; set; } - public int SeeNum { get; set; } public string Content { get; set; } public string? Color { get; set; } From 3313689799dc5c724d1d92e1516fb230fedaae2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 5 Jan 2024 06:07:31 +0000 Subject: [PATCH 12/14] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 橙子 <454313500@qq.com> --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2537318f..7a35f5a7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

Yi框架

+

Yi框架

一套以用户体验出发的.Net8 Web开源框架

支持Abp.vNext 版本原生版本、Furion版本，前端后台接入Ruoyi Vue3.0

集大成者，终究轮子

@@ -59,12 +59,11 @@ Rbac演示地址：https://ccnetcore.com:1000 （用户cc、密码123456） **** ### 详细到爆炸的Yi框架教程导航： -（既然选择开源，就本该怀揣着最纯粹分享的内心，我们全套打包分享，开源包括且不仅仅是：文档、框架代码、模块代码、运维CICD等，希望能够帮助到您） 1. [框架快速开始教程](https://ccnetcore.com/article/aaa00329-7f35-d3fe-d258-3a0f8380b742)(已完成) 2. [框架功能模块教程](https://ccnetcore.com/article/8c464ab3-8ba5-2761-a4b0-3a0f83a9f312)(已完成) 3. [实战演练开发教程](https://ccnetcore.com/article/e89c9593-f337-ada7-d108-3a0f83ae48e6) -4. [橙子运维CICD教程](https://ccnetcore.com/article/6b80ed42-50cd-db15-c073-3a0fa8f7fd77)(已完成) + **** ### 它的理念: From 073a2d548751e43b466da33d52adcf7506069214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 5 Jan 2024 06:08:05 +0000 Subject: [PATCH 13/14] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 橙子 <454313500@qq.com> --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 7a35f5a7..f5e5d8be 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,6 @@

集大成者，终究轮子

[English](README-en.md) | 简体中文 - -![sdk](https://img.shields.io/badge/sdk-8.0.0-d.svg)![License MIT](https://img.shields.io/badge/license-Apache-blue.svg?style=flat-square) - **** ### 简介: YiFramework是一个基于.Net8+Abp.vNext+SqlSugar的DDD领域驱动设计后端开源框架 From a1199a52af1bb3d1eca4383594c648eb66d4f62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Fri, 5 Jan 2024 06:09:25 +0000 Subject: [PATCH 14/14] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 橙子 <454313500@qq.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5e5d8be..868ac601 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

Yi框架

+

Yi框架

一套以用户体验出发的.Net8 Web开源框架

支持Abp.vNext 版本原生版本、Furion版本，前端后台接入Ruoyi Vue3.0

集大成者，终究轮子