前端联调接口

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);

Yi.Framework.Net6/Yi.Framework.Interface/IArticleService.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface IArticleService:IBaseService<ArticleEntity>
+    {
+        Task<PageModel<List<ArticleEntity>>> SelctPageList(ArticleEntity eneity, PageParModel page);
+    }
+}

Yi.Framework.Net6/Yi.Framework.Interface/IServiceTemplate/IArticleService.cs

@@ -0,0 +1,9 @@
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Interface
+{
+   public partial interface IArticleService:IBaseService<ArticleEntity>
+    {   
+    }
+}

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/ArticleEntity.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Serialization;
+using SqlSugar;
+namespace Yi.Framework.Model.Models
+{
+    /// <summary>
+    /// 文章表
+    ///</summary>
+    [SugarTable("Article")]
+    public partial class ArticleEntity:IBaseModelEntity
+    {
+        public ArticleEntity()
+        {
+            this.CreateTime = DateTime.Now;
+        }
+        [JsonConverter(typeof(ValueToStringConverter))]
+        [SugarColumn(ColumnName="Id" ,IsPrimaryKey = true   )]
+         public long Id { get; set; }
+        /// <summary>
+        /// 文章标题 
+        ///</summary>
+         [SugarColumn(ColumnName="Title"    )]
+         public string Title { get; set; }
+        /// <summary>
+        /// 文章内容 
+        ///</summary>
+         [SugarColumn(ColumnName="Content"    )]
+         public string Content { get; set; }
+        /// <summary>
+        /// 用户id 
+        ///</summary>
+         [SugarColumn(ColumnName="UserId"    )]
+         public long? UserId { get; set; }
+        /// <summary>
+        /// 创建者 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateUser"    )]
+         public long? CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间 
+        ///</summary>
+         [SugarColumn(ColumnName="CreateTime"    )]
+         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 修改者 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyUser"    )]
+         public long? ModifyUser { get; set; }
+        /// <summary>
+        /// 修改时间 
+        ///</summary>
+         [SugarColumn(ColumnName="ModifyTime"    )]
+         public DateTime? ModifyTime { get; set; }
+        /// <summary>
+        /// 是否删除 
+        ///</summary>
+         [SugarColumn(ColumnName="IsDeleted"    )]
+         public bool? IsDeleted { get; set; }
+        /// <summary>
+        /// 租户Id 
+        ///</summary>
+         [SugarColumn(ColumnName="TenantId"    )]
+         public long? TenantId { get; set; }
+        /// <summary>
+        /// 排序字段 
+        ///</summary>
+         [SugarColumn(ColumnName="OrderNum"    )]
+         public int? OrderNum { get; set; }
+        /// <summary>
+        /// 描述 
+        ///</summary>
+         [SugarColumn(ColumnName="Remark"    )]
+         public string Remark { get; set; }
+        /// <summary>
+        /// 图片列表 
+        ///</summary>
+         [SugarColumn(ColumnName="Images",IsJson = true)]
+         public List<string> Images { get; set; }
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/ArticleService.cs

@@ -0,0 +1,28 @@
+using SqlSugar;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Yi.Framework.Common.Models;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class ArticleService : BaseService<ArticleEntity>, IArticleService
+    {
+        public async Task<PageModel<List<ArticleEntity>>> SelctPageList(ArticleEntity entity, PageParModel page)
+        {
+            RefAsync<int> total = 0;
+            var data = await _repository._DbQueryable
+                       //.WhereIF(!string.IsNullOrEmpty(config.ConfigName), u => u.ConfigName.Contains(config.ConfigName))
+                       //.WhereIF(!string.IsNullOrEmpty(config.ConfigKey), u => u.ConfigKey.Contains(config.ConfigKey))
+                       .WhereIF(page.StartTime is not null && page.EndTime is not null, u => u.CreateTime >= page.StartTime && u.CreateTime <= page.EndTime)
+                     .WhereIF(entity.IsDeleted is not null, u => u.IsDeleted == entity.IsDeleted)
+                    .OrderBy(u => u.CreateTime, OrderByType.Desc)
+                          .ToPageListAsync(page.PageNum, page.PageSize, total);
+
+            return new PageModel<List<ArticleEntity>>(data, total);
+        }
+
+    }
+}

Yi.Framework.Net6/Yi.Framework.Service/ServiceTemplate/ArticleService.cs

@@ -0,0 +1,14 @@
+using SqlSugar;
+using Yi.Framework.Interface;
+using Yi.Framework.Model.Models;
+using Yi.Framework.Repository;
+
+namespace Yi.Framework.Service
+{
+    public partial class ArticleService : BaseService<ArticleEntity>, IArticleService
+    {
+        public ArticleService(IRepository<ArticleEntity> repository) : base(repository)
+        {
+        }
+    }
+}

Yi.Framework.Net6/Yi.Framework.WebCore/CommonExtend/HttpContextExtend.cs

@@ -37,7 +37,12 @@ namespace Yi.Framework.WebCore
         public static long GetUserIdInfo(this HttpContext httpContext)
         {
             var p = httpContext;
-            return Convert.ToInt64(httpContext.User.Claims.FirstOrDefault(u => u.Type == JwtRegisteredClaimNames.Sid).Value);
+            var value = httpContext.User.Claims.FirstOrDefault(u => u.Type == JwtRegisteredClaimNames.Sid)?.Value;
+            if (value is not null)
+            {
+                return Convert.ToInt64(value);
+            }
+            return 0;
         }
 
         /// <summary>