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] =?UTF-8?q?style:=20=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=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<ArticleEntity> Import(Guid discussId,Guid articleParentId, List<FileObject> fileObjs)
+        public void SetLogger(ILoggerFactory loggerFactory)
+        {
+            LoggerFactory = loggerFactory;
+        }
+        protected ILoggerFactory LoggerFactory { get; set; }
+        public virtual List<ArticleEntity> Import(Guid discussId, Guid articleParentId, List<FileObject> 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<ArticleEntity> Convert(List<FileObject> fileObjs)
         {
+            var logger = LoggerFactory.CreateLogger<VuePressArticleImport>();
+
             //排序及处理目录名称
             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);