前端联调接口

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml

@@ -67,6 +67,21 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ArticleController.PageList(Yi.Framework.Model.Models.ArticleEntity,Yi.Framework.Common.Models.PageParModel)">
+            <summary>
+            动态条件分页查询
+            </summary>
+            <param name="entity"></param>
+            <param name="page"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.ArticleController.Add(Yi.Framework.Model.Models.ArticleEntity)">
+            <summary>
+            添加
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:Yi.Framework.ApiMicroservice.Controllers.BaseCrudController`1">
             <summary>
             Json To Sql 类比模式，通用模型

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ArticleController.cs

@@ -0,0 +1,51 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+using Yi.Framework.WebCore;
+using Yi.Framework.WebCore.AttributeExtend;
+using Yi.Framework.WebCore.AuthorizationPolicy;
+
+namespace Yi.Framework.ApiMicroservice.Controllers
+{
+    [ApiController]
+    [Route("api/[controller]/[action]")]
+    public class ArticleController : BaseSimpleCrudController<ArticleEntity>
+    {
+        private IArticleService _iArticleService;
+        public ArticleController(ILogger<ArticleEntity> logger, IArticleService iArticleService) : base(logger, iArticleService)
+        {
+            _iArticleService = iArticleService;
+        }
+
+        /// <summary>
+        /// 动态条件分页查询
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="page"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Result> PageList([FromQuery] ArticleEntity entity, [FromQuery] PageParModel page)
+        {
+            return Result.Success().SetData(await _iArticleService.SelctPageList(entity, page));
+        }
+
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        public override Task<Result> Add(ArticleEntity entity)
+        {
+            entity.UserId=HttpContext.GetUserIdInfo();
+            return base.Add(entity);
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/FileController.cs

@@ -4,9 +4,11 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Yi.Framework.Common.Enum;
 using Yi.Framework.Common.Models;
 using Yi.Framework.Interface;
 using Yi.Framework.WebCore;
@@ -39,10 +41,15 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <param name="type"></param>
         /// <param name="fileName"></param>
         /// <returns></returns>
-        [Route("/api/{type}/{fileName}")]
+        [Route("/api/file/{type}/{fileName}")]
         [HttpGet]
         public IActionResult Get(string type, string fileName)
         {
+            type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(type.ToLower());
+            if (!Enum.IsDefined(typeof(PathEnum), type))
+            {
+                return new NotFoundResult();
+            }
             try
             {
                 var path = Path.Combine($"wwwroot/{type}", fileName);
@@ -64,8 +71,13 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [Route("/api/Upload/{type}")]
         [HttpPost]
-        public async Task<Result> Upload(string type, IFormFile file)
+        public async Task<Result> Upload(string type,IFormFile file)
         {
+            type = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(type.ToLower());
+            if (!Enum.IsDefined(typeof(PathEnum), type))
+            {
+                return Result.Error("上传失败！文件类型不存在！");
+            }
             try
             {
                 string filename = Guid.NewGuid().ToString() + Path.GetExtension(file.FileName);