Merge remote-tracking branch 'origin/master'

Author: LemonNoCry

Blog.Core.Api/Blog.Core.xml

@@ -0,0 +1,61 @@
+using System.Text;
+using Blog.Core.Common.DB.Extension;
+using Blog.Core.Controllers;
+using Blog.Core.Model;
+using Blog.Core.Model.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+
+namespace Blog.Core.Api.Controllers;
+
+/// <summary>
+/// SqlSugar 相关测试
+/// </summary>
+[Route("api/[controller]/[action]")]
+[ApiController]
+[AllowAnonymous]
+public class SqlSugarTestController(ISqlSugarClient db) : BaseApiController
+{
+    /// <summary>
+    /// 测试建表后，SqlSugar缓存
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    public MessageModel ClearDbTableCache()
+    {
+        var tableName = "BlogArticle_Test";
+
+        //先删除表
+        try
+        {
+            db.DbMaintenance.DropTable(tableName);
+            db.ClearDbTableCache();
+        }
+        catch
+        {
+            //Ignore
+        }
+
+        StringBuilder sb = new StringBuilder();
+
+        //提前检查表是否存在，测试缓存
+        sb.AppendLine($"表{tableName} 是否存在：{db.DbMaintenance.IsAnyTable(tableName)}");
+
+        //创建表
+        db.CodeFirst.As<BlogArticle>(tableName).InitTables<BlogArticle>();
+        sb.AppendLine($"表{tableName} 创建成功");
+
+        //检查表是否存在
+        sb.AppendLine($"表{tableName} 是否存在：{db.DbMaintenance.IsAnyTable(tableName)}");
+
+        //清除缓存
+        db.ClearDbTableCache();
+        sb.AppendLine($"清除缓存后");
+
+        //检查表是否存在
+        sb.AppendLine($"表{tableName} 是否存在：{db.DbMaintenance.IsAnyTable(tableName)}");
+
+        return Success(sb.ToString());
+    }
+}

Blog.Core.Api/Controllers/SqlSugarTestController.cs

@@ -0,0 +1,75 @@
+using System.ComponentModel;
+using Blog.Core.Controllers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Blog.Core.Api.Controllers.Test;
+
+/// <summary>
+/// 枚举测试
+/// </summary>
+[Route("api/[Controller]/[Action]")]
+[AllowAnonymous]
+public class EnumTestController : BaseApiController
+{
+    /// <summary>
+    /// 获取学生信息
+    /// </summary>
+    /// <param name="studentType">学生类型</param>
+    /// <param name="studentType2"></param>
+    /// <param name="studentTypes"></param>
+    /// <returns>学生信息</returns>
+    [HttpGet]
+    public Student GetStudent( StudentType studentType, StudentType? studentType2,  List<StudentType> studentTypes)
+    {
+        return new Student
+        {
+            Name = "张三",
+            Age  = 20,
+            Type = studentType
+        };
+    }
+}
+
+/// <summary>
+/// 学生类型
+/// </summary>
+[Description("学生类型")]
+public enum StudentType
+{
+    /// <summary>
+    /// 小学生
+    /// </summary>
+    [Description("小学生")]
+    PrimarySchool = 1,
+
+    /// <summary>
+    /// 中学生
+    /// </summary>
+    [Description("中学生")]
+    MiddleSchool = 2,
+
+    /// <summary>
+    /// 大学生
+    /// </summary>
+    [Description("大学生")]
+    University = 3
+}
+
+public class Student
+{
+    /// <summary>
+    /// 学生姓名
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 学生年龄
+    /// </summary>
+    public int Age { get; set; }
+
+    /// <summary>
+    /// 学生类型
+    /// </summary>
+    public StudentType Type { get; set; }
+}

Blog.Core.Api/Controllers/Test/EnumTestController.cs

@@ -48,14 +48,17 @@ public class ValuesController : BaseApiController
         private readonly SeqOptions _seqOptions;
         private readonly ICaching _cache;
 
-        public ValuesController(IBlogArticleServices blogArticleServices, IMapper mapper, IAdvertisementServices advertisementServices, Love love,
-            IRoleModulePermissionServices roleModulePermissionServices, IUser user, IPasswordLibServices passwordLibServices,
-            IHttpPollyHelper httpPollyHelper, IRabbitMQPersistentConnection persistentConnection, IOptions<SeqOptions> seqOptions, ICaching caching)
+        public ValuesController(IBlogArticleServices blogArticleServices, IMapper mapper,
+            IAdvertisementServices advertisementServices, Love love,
+            IRoleModulePermissionServices roleModulePermissionServices, IUser user,
+            IPasswordLibServices passwordLibServices,
+            IHttpPollyHelper httpPollyHelper, IRabbitMQPersistentConnection persistentConnection,
+            IOptions<SeqOptions> seqOptions, ICaching caching)
         {
             // 测试 Authorize 和 mapper
-            _mapper = mapper;
-            _advertisementServices = advertisementServices;
-            _love = love;
+            _mapper                       = mapper;
+            _advertisementServices        = advertisementServices;
+            _love                         = love;
             _roleModulePermissionServices = roleModulePermissionServices;
             // 测试 Httpcontext
             _user = user;
@@ -66,10 +69,10 @@ public ValuesController(IBlogArticleServices blogArticleServices, IMapper mapper
             // 测试redis消息队列
             _blogArticleServices = blogArticleServices;
             // httpPolly
-            _httpPollyHelper = httpPollyHelper;
+            _httpPollyHelper      = httpPollyHelper;
             _persistentConnection = persistentConnection;
-            _cache = caching;
-            _seqOptions = seqOptions.Value;
+            _cache                = caching;
+            _seqOptions           = seqOptions.Value;
         }
 
         /// <summary>
@@ -84,7 +87,8 @@ public IActionResult TestRabbitMqPublish()
                 _persistentConnection.TryConnect();
             }
 
-            _persistentConnection.PublishMessage("Hello, RabbitMQ!", exchangeName: "blogcore", routingKey: "myRoutingKey");
+            _persistentConnection.PublishMessage("Hello, RabbitMQ!", exchangeName: "blogcore",
+                routingKey: "myRoutingKey");
             return Ok();
         }
 
@@ -104,7 +108,8 @@ public IActionResult TestRabbitMqSubscribe()
             return Ok();
         }
 
-        private async Task<bool> Dealer(string exchange, string routingKey, byte[] msgBody, IDictionary<string, object> headers)
+        private async Task<bool> Dealer(string exchange, string routingKey, byte[] msgBody,
+            IDictionary<string, object> headers)
         {
             await Task.CompletedTask;
             Console.WriteLine("我是消费者，这里消费了一条信息是：" + Encoding.UTF8.GetString(msgBody));
@@ -120,7 +125,7 @@ public MessageModel<List<ClaimDto>> MyClaims()
                 response = (_user.GetClaimsIdentity().ToList()).Select(d =>
                     new ClaimDto
                     {
-                        Type = d.Type,
+                        Type  = d.Type,
                         Value = d.Value
                     }
                 ).ToList()
@@ -194,9 +199,9 @@ await _blogArticleServices.QuerySql(
 
             // 测试多个异步执行时间
             var roleModuleTask = _roleModulePermissionServices.Query();
-            var listTask = _advertisementServices.Query();
-            var ad = await roleModuleTask;
-            var list = await listTask;
+            var listTask       = _advertisementServices.Query();
+            var ad             = await roleModuleTask;
+            var list           = await listTask;
 
 
             // 测试service层返回异常
@@ -290,8 +295,8 @@ public MessageModel<List<string>> GetUserInfo(string ClaimType = "jti")
             var getUserInfoByToken = _user.GetUserInfoFromToken(ClaimType);
             return new MessageModel<List<string>>()
             {
-                success = _user.IsAuthenticated(),
-                msg = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录",
+                success  = _user.IsAuthenticated(),
+                msg      = _user.IsAuthenticated() ? _user.Name.ObjToString() : "未登录",
                 response = _user.GetClaimValueByType(ClaimType)
             };
         }
@@ -353,11 +358,11 @@ public object TestPostPara(string name)
         public async Task<object> TestMutiDBAPI()
         {
             // 从主库中，操作blogs
-            var blogs = await _blogArticleServices.Query(d => d.bID == 1);
+            var blogs   = await _blogArticleServices.Query(d => d.bID == 1);
             var addBlog = await _blogArticleServices.Add(new BlogArticle() { });
 
             // 从从库中，操作pwds
-            var pwds = await _passwordLibServices.Query(d => d.PLID > 0);
+            var pwds   = await _passwordLibServices.Query(d => d.PLID > 0);
             var addPwd = await _passwordLibServices.Add(new PasswordLib() { });
 
             return new
@@ -494,6 +499,18 @@ public async Task<MessageModel<string>> TestCacheAsync()
 
             return Success<string>("");
         }
+
+        /// <summary>
+        /// 雪花Id To DateTime
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public DateTime SnowflakeIdToDateTime(long id)
+        {
+            return YitterSnowflakeHelper.GetDateTime(IdGeneratorUtility.GetOptions(), id);
+        }
     }
 
     public class ClaimDto

Blog.Core.Api/Controllers/ValuesController.cs

@@ -78,7 +78,8 @@
     "SeedDBDataEnabled": true, //生成表,并初始化数据
     "Author": "Blog.Core",
     "SvcName": "", // /svc/blog
-    "UseLoadTest": false
+    "UseLoadTest": false,
+    "CacheDbEnabled": false
   },
 
   //优化DB配置、不会再区分单库多库

Blog.Core.Api/appsettings.json

@@ -30,10 +30,11 @@
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.3" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SnowflakeId.AutoRegister" Version="1.0.1" />
-    <PackageReference Include="SnowflakeId.AutoRegister.SqlServer" Version="1.0.0" />
-    <PackageReference Include="SnowflakeId.AutoRegister.StackExchangeRedis" Version="1.0.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.8.0" />
+    <PackageReference Include="SnowflakeId.AutoRegister" Version="1.0.4" />
+    <PackageReference Include="SnowflakeId.AutoRegister.SqlServer" Version="1.0.5" />
+    <PackageReference Include="SnowflakeId.AutoRegister.StackExchangeRedis" Version="1.0.2" />
+    <PackageReference Include="StackExchange.Redis" Version="2.8.22" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
     <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />