From 464b768c55273ed8742b83a6b4a3f86e75ccad77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 16 Oct 2022 13:18:07 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=96=87=E7=AB=A0=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 00ca4cc5bde2c320287d0840f845ea3a2971a276.
---
 .../Controllers/ArticleController.cs          |  6 ++-
 .../Yi - Backup.Framework.Template.csproj     | 50 -------------------
 .../Yi.Framework.Template.csproj              |  8 +++
 3 files changed, 12 insertions(+), 52 deletions(-)
 delete mode 100644 Yi.Framework.Net6/Yi.Framework.Template/Yi - Backup.Framework.Template.csproj

diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs
index 96ebf38c..269c8dc9 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs
@@ -38,8 +38,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpGet]
         public async Task<Result> PageList([FromQuery] ArticleEntity entity, [FromQuery] PageParModel page)
         {
-           var pageData= await _iArticleService.SelctPageList(entity, page);
-            return Result.Success().SetData(new PageModel() { Data = _mapper.Map<List<ArticleVo>>(pageData.Data), Total = pageData.Total }) ;
+            var pageData = await _iArticleService.SelctPageList(entity, page);
+            return Result.Success().SetData(new PageModel() { Data = _mapper.Map<List<ArticleVo>>(pageData.Data), Total = pageData.Total });
         }
 
         /// <summary>
@@ -49,6 +49,8 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         public override Task<Result> Add(ArticleEntity entity)
         {
+            //如果标题为空，默认为内容的前20个字符
+            entity.Title = entity.Title ?? entity.Content.Substring(0, 20);
             entity.UserId = HttpContext.GetUserIdInfo();
             return base.Add(entity);
         }
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Yi - Backup.Framework.Template.csproj b/Yi.Framework.Net6/Yi.Framework.Template/Yi - Backup.Framework.Template.csproj
deleted file mode 100644
index 2a3b0053..00000000
--- a/Yi.Framework.Net6/Yi.Framework.Template/Yi - Backup.Framework.Template.csproj	
+++ /dev/null
@@ -1,50 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="vue3-ruoyi\view.vue">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>view.tt</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="vue3-ruoyi\view.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>view.tt</DependentUpon>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="vue3-ruoyi\view.tt">
-      <LastGenOutput>view.vue</LastGenOutput>
-      <Generator>TextTemplatingFileGenerator</Generator>
-    </None>
-    <None Update="vue3-ruoyi\api.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>api.js</LastGenOutput>
-    </None>
-    <None Update="vue3-ruoyi\api.js">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>api.tt</DependentUpon>
-    </None>
-    <None Update="vue3-ruoyi\view.vue">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>view.tt</DependentUpon>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
-  </ItemGroup>
-
-</Project>
diff --git a/Yi.Framework.Net6/Yi.Framework.Template/Yi.Framework.Template.csproj b/Yi.Framework.Net6/Yi.Framework.Template/Yi.Framework.Template.csproj
index 825a36cd..2a3b0053 100644
--- a/Yi.Framework.Net6/Yi.Framework.Template/Yi.Framework.Template.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Template/Yi.Framework.Template.csproj
@@ -6,6 +6,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="vue3-ruoyi\view.vue">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>view.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="vue3-ruoyi\view.cs">
       <DesignTime>True</DesignTime>