now simapiauth can use , for role

.github/workflows/main.yml

@@ -1,21 +0,0 @@
-name: PublishNugetPackage
-
-on: [create]
-
-jobs:
-  publish:
-    name: Publish Project to Nuget
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.100'
-    - name: Publish
-      run: |
-        version=`git describe --tags`
-        dotnet build --configuration release -p:PackageVersion=$version
-        dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${NUGET_APIKEY} -s https://www.nuget.org/api/v2/package
-      env:
-        NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}

.github/workflows/nuget-publish.yml

@@ -0,0 +1,24 @@
+name: PublishNugetPackage
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  publish:
+    name: Publish Project to Nuget
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "6.0.100"
+      - name: Publish
+        run: |
+          version=`git describe --tags`
+          dotnet build --configuration release -p:PackageVersion=$version
+          dotnet nuget push bin/release/Simcu.SimApi.$version.nupkg -k ${NUGET_APIKEY} -s https://www.nuget.org/api/v2/package
+        env:
+          NUGET_APIKEY: ${{ secrets.NUGET_APIKEY }}

Attributes/SimApiAuthAttribute.cs

@@ -19,13 +19,16 @@ namespace SimApi.Attributes
         //默认是user登录类型
         public SimApiAuthAttribute()
         {
-            Types = new[] { "user" };
+            Types = new[]
+            {
+                "user"
+            };
         }
 
         //只检测一种用户类型的快捷方式
         public SimApiAuthAttribute(string type)
         {
-            Types = new[] { type };
+            Types = type.Split(",");
         }
 
         //设定特定类型的检测
@@ -37,7 +40,10 @@ namespace SimApi.Attributes
         //只检测一种用户类型的快捷方式
         public SimApiAuthAttribute(string type, string url)
         {
-            Types = new[] { type };
+            Types = new[]
+            {
+                type
+            };
             new HttpPostAttribute(url);
         }
 

Communications/SimApiBaseRequest.cs

@@ -10,6 +10,14 @@ namespace SimApi.Communications
         public int Id { get; set; }
     }
 
+    /// <summary>
+    /// 只有ID的请求(字符串)
+    /// </summary>
+    public class SimApiStringIdOnlyRequest
+    {
+        public string Id { get; set; }
+    }
+
     /// <summary>
     /// 动态类型单字段请求
     /// </summary>
@@ -25,6 +33,7 @@ namespace SimApi.Communications
     public class SimApiBasePageRequest
     {
         public int Page { get; set; }
+
         public int Count { get; set; }
     }
 }

Communications/SimApiLoginItem.cs

@@ -1,4 +1,5 @@
 using System;
+
 namespace SimApi.Communications
 {
     /// <summary>
@@ -7,7 +8,8 @@ namespace SimApi.Communications
     public class SimApiLoginItem
     {
         //登录用户的ID
-        public int Id { get; set; }
+        public string Id { get; set; }
+
         //登录用户来源
         public string[] Type { get; set; }
     }

Configurations/SimApiOptions.cs

@@ -4,15 +4,62 @@ namespace SimApi.Configs
 {
     public class SimApiOptions
     {
+        /// <summary>
+        /// 启用全部Cors，对于开发前后分离的时候很有用。
+        /// default: true
+        /// </summary>
         public bool EnableCors { get; set; } = true;
+
+        /// <summary>
+        /// 启用SimapiAuth，一个简单的基于Header Token的认证方式。
+        /// default: false
+        /// </summary>
         public bool EnableSimApiAuth { get; set; } = false;
-        public bool EnableSimApiDoc { get; set; } = true;
+
+        /// <summary>
+        /// 启用在线文档，启用后 访问 /swagger 可以查看对应的api文档。
+        /// default: false
+        /// </summary>
+        public bool EnableSimApiDoc { get; set; } = false;
+
+        /// <summary>
+        /// 启用异常拦截,启用后，所有的异常将被通过json反馈。
+        /// default: true
+        /// </summary>
         public bool EnableSimApiException { get; set; } = true;
+
+        /// <summary>
+        /// 开启S3兼容的存储系统。
+        /// default: false
+        /// </summary>
         public bool EnableSimApiStorage { get; set; } = false;
+
+        /// <summary>
+        /// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
+        /// default: true
+        /// </summary>
         public bool EnableForwardHeaders { get; set; } = true;
+
+        /// <summary>
+        /// 将所有的url都格式化为小写字母
+        /// default: true
+        /// </summary>
         public bool EnableLowerUrl { get; set; } = true;
-        public bool EnableLogger { get; set; } = true;
+
+        /// <summary>
+        /// 启用格式化的 Console Logger
+        /// default: false
+        /// </summary>
+        public bool EnableLogger { get; set; } = false;
+
+        /// <summary>
+        /// Swagger文档相关配置，需要启用 EnableSimApiDoc
+        /// </summary>
         public SimApiDocOptions SimApiDocOptions { get; set; } = new SimApiDocOptions();
+
+        /// <summary>
+        /// S3兼容的存储系统配置，需要启用 EnableSimApiStorage
+        /// </summary>
         public SimApiStorageOptions SimApiStorageOptions { get; set; } = new SimApiStorageOptions();
 
 

Configurations/SimApiStorageOptions.cs

@@ -2,10 +2,23 @@ namespace SimApi.Configs
 {
     public class SimApiStorageOptions
     {
+        /// <summary>
+        /// S3 服务器入口地址
+        /// </summary>
         public string Endpoint { get; set; }
+
+        /// <summary>
+        /// S3 服务器文件访问地址
+        /// </summary>
         public string ServeUrl { get; set; }
+
+        /// <summary>
+        /// S3服务 Bucket
+        /// </summary>
         public string Bucket { get; set; }
+
         public string AccessKey { get; set; }
+
         public string SecretKey { get; set; }
     }
 }

Controllers/SimApiBaseController.cs

@@ -85,7 +85,5 @@ namespace SimApi.Controllers
         {
             return new SimApiBaseResponse<string>();
         }
-
-
     }
 }

Controllers/SimApiCommonController.cs

@@ -35,10 +35,13 @@ namespace SimApi.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost("/auth/check"), SimApiDoc("认证", "检测登陆")]
-        public SimApiBaseResponse<int> CheckLogin()
+        public SimApiBaseResponse<string> CheckLogin()
         {
             ErrorWhenNull(LoginInfo, 401);
-            return new SimApiBaseResponse<int> {Data = LoginInfo.Id};
+            return new SimApiBaseResponse<string>
+            {
+                Data = LoginInfo.Id
+            };
         }
 
         /// <summary>

Helpers/SimApiAuth.cs

@@ -23,7 +23,7 @@ namespace SimApi.Helpers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public string Login(int id, string type = "user", string token = null)
+        public string Login(string id, string type = "user", string token = null)
         {
             return Login(id, new[] { type }, token);
         }
@@ -34,7 +34,7 @@ namespace SimApi.Helpers
         /// <param name="id"></param>
         /// <param name="type"></param>
         /// <returns></returns>
-        public string Login(int id, string[] type, string uuid = null)
+        public string Login(string id, string[] type, string uuid = null)
         {
             if (uuid == null)
             {

Helpers/SimApiStorage.cs

@@ -14,7 +14,9 @@ namespace SimApi.Helpers
         public MinioClient Client => Mc;
 
         private string ServeUrl { get; }
-        private string Bucket { get; }
+
+        public string Bucket { get; }
+
         private IHttpContextAccessor HttpContextAccessor { get; }
 
         public SimApiStorage(SimApiOptions apiOptions, IHttpContextAccessor httpContextAccessor)
@@ -22,7 +24,7 @@ namespace SimApi.Helpers
             var options = apiOptions.SimApiStorageOptions;
             HttpContextAccessor = httpContextAccessor;
             var useSsl = false;
-            var endpoint = string.Empty;
+            string endpoint;
             if (options.Endpoint.StartsWith("http://"))
             {
                 endpoint = options.Endpoint.Replace("http://", string.Empty);
@@ -39,40 +41,57 @@ namespace SimApi.Helpers
 
             ServeUrl = options.ServeUrl;
             Bucket = options.Bucket;
+            var mcb = new MinioClient().WithEndpoint(endpoint)
+                .WithCredentials(options.AccessKey, options.SecretKey);
             if (useSsl)
             {
-                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey).WithSSL();
+                mcb = mcb.WithSSL();
-            }
-            else
-            {
-                Mc = new MinioClient(endpoint, options.AccessKey, options.SecretKey);
             }
+            Mc = mcb.Build();
 
-            bool found = Mc.BucketExistsAsync(Bucket).Result;
+            var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
             if (!found)
             {
-                Mc.MakeBucketAsync(Bucket).Wait();
+                Mc.MakeBucketAsync(new MakeBucketArgs().WithBucket(Bucket)).Wait();
             }
         }
 
-        public string UploadFile(string path, Stream stream)
+        /// <summary>
+        /// 获取上传的URL
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="expire"></param>
+        /// <returns></returns>
+        public string GetUploadUrl(string path, int expire = 7200)
         {
-            try
+            return Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
+                .WithObject(path).WithExpiry(expire)).Result;
+        }
+
+        /// <summary>
+        /// 获取下载的URL
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="expire"></param>
+        /// <returns></returns>
+        public string GetDownloadUrl(string path, int expire = 600)
         {
-                Mc.PutObjectAsync(Bucket, path, stream, stream.Length).Wait();
+            return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
+                .WithExpiry(expire)).Result;
+        }
+
+
+        public string UploadFile(string path, Stream stream, string contentType = "image/png")
+        {
+            Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
+                .WithStreamData(stream).WithContentType(contentType)).Wait();
             return null;
         }
-            catch (MinioException e)
-            {
-                Console.WriteLine("Error occurred: " + e);
-                return e.Message;
-            }
-        }
 
         public string FullUrl(string path)
         {
-            var httpRequest = HttpContextAccessor.HttpContext.Request;
+            var httpRequest = HttpContextAccessor.HttpContext?.Request;
-            var url = $"{httpRequest.Scheme}://{httpRequest.Host}";
+            var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
             if (string.IsNullOrEmpty(path))
             {
                 return path;

Helpers/SimApiUtil.cs

@@ -1,12 +1,31 @@
 using System;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
 using System.Text.RegularExpressions;
+using System.Text.Unicode;
 
 namespace SimApi.Helpers
 {
     public static class SimApiUtil
     {
+        /// <summary>
+        /// 当前CST时间
+        /// </summary>
+        public static DateTime CstNow
+        {
+            get => DateTime.UtcNow.AddHours(8);
+        }
+
+        /// <summary>
+        /// 当前秒级时间戳
+        /// </summary>
+        public static double TimestampNow
+        {
+            get => (DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0)).TotalSeconds;
+        }
+
         /// <summary>
         /// 检测手机号是否正确
         /// </summary>
@@ -14,7 +33,7 @@ namespace SimApi.Helpers
         /// <returns></returns>
         public static bool CheckCell(string cell)
         {
-            var regex = new Regex("^1[34578]\\d{9}$");
+            var regex = new Regex("^1[3456789]\\d{9}$");
             return regex.IsMatch(cell);
         }
 
@@ -38,11 +57,17 @@ namespace SimApi.Helpers
             return strbul.ToString();
         }
 
-        public static void Log(string message, string type = "Information")
+        /// <summary>
+        /// 将对象序列化成JSON （控制台输出中文不会被编码）
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static string Json(object obj)
         {
-            Console.WriteLine($"[ SimApi ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {type} ]");
+            return JsonSerializer.Serialize(obj, new JsonSerializerOptions
-            Console.WriteLine(message);
+            {
-            Console.WriteLine("");
+                Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+            });
         }
     }
 }

Logger/SimApiLogger.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.Extensions.Logging;
+using SimApi.Helpers;
 
 namespace SimApi.Logger
 {
@@ -12,15 +13,9 @@ namespace SimApi.Logger
             Name = name;
         }
 
-        public IDisposable BeginScope<TState>(TState state)
+        public IDisposable BeginScope<TState>(TState state) => default!;
-        {
-            return null;
-        }
 
-        public bool IsEnabled(LogLevel logLevel)
+        public bool IsEnabled(LogLevel logLevel) => true;
-        {
-            return true;
-        }
 
         public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
             Func<TState, Exception, string> formatter)
@@ -36,7 +31,7 @@ namespace SimApi.Logger
                 _ => defautColor
             };
             Console.WriteLine(
-                $"[ {Name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
+                $"[ {Name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]");
             Console.ForegroundColor = defautColor;
             Console.WriteLine($"{state}");
             if (exception != null)

Logger/SimApiLoggerConfiguration.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+
+namespace SimApi.Logger;
+
+public class SimApiLoggerConfiguration
+{
+    public int EventId { get; set; }
+
+    public Dictionary<LogLevel, ConsoleColor> LogLevels { get; set; } = new()
+    {
+        [LogLevel.Information] = ConsoleColor.Green
+    };
+}

Models/SimApiBaseModel.cs

@@ -1,23 +1,36 @@
 using System;
 using System.Linq;
 using System.Text.Json;
+using SimApi.Helpers;
 
 namespace SimApi.Models
 {
     public class SimApiBaseModel
     {
-        protected virtual string[] MapperIgnoreField { get; set; } = {"Id", "CreatedAt", "UpdatedAt"};
+        protected virtual string[] MapperIgnoreField { get; set; } =
+        {
+            "Id", "CreatedAt", "UpdatedAt"
+        };
+
         protected virtual string UpdatedTimeField { get; set; } = "UpdatedAt";
 
         public void MapData<TS>(TS source, bool mapAll = false)
         {
             //获取要赋值的源数据不为null的项目
             var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
-                .Select(x => new {x.Name, x.PropertyType})
+                .Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
 
             //获取目标对象的属性信息
-            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+            var targetProps = GetType().GetProperties().Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
             foreach (var sp in sourceProps)
             {
@@ -37,11 +50,19 @@ namespace SimApi.Models
         {
             //获取要赋值的源数据不为null的项目
             var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
-                .Select(x => new {x.Name, x.PropertyType})
+                .Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
 
             //获取目标对象的属性信息
-            var targetProps = GetType().GetProperties().Select(x => new {x.Name, x.PropertyType})
+            var targetProps = GetType().GetProperties().Select(x => new
+                {
+                    x.Name,
+                    x.PropertyType
+                })
                 .ToDictionary(x => x.Name, x => x.PropertyType);
             foreach (var sp in sourceProps)
             {
@@ -63,7 +84,7 @@ namespace SimApi.Models
         /// <returns></returns>
         public void UpdateTime()
         {
-            GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
+            GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
         }
     }
 }

Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true
   },
   "profiles": {
-    "YYApi": {
+    "SimApi": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

SimApi.csproj

@@ -14,10 +14,9 @@
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageVersion>5.0.2</PackageVersion>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(RunConfiguration)' == 'YYApi' " />
   <ItemGroup>
     <Folder Include="Helpers\" />
     <Folder Include="Communications\" />
@@ -28,9 +27,9 @@
     <Folder Include="Configurations\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Minio" Version="3.1.13" />
+    <PackageReference Include="Minio" Version="4.0.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.1.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.3.1" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>

SimApiExtensions.cs

@@ -22,8 +22,15 @@ namespace SimApi
         {
             var simApiOptions = new SimApiOptions();
             options?.Invoke(simApiOptions);
-
+            if (simApiOptions.EnableLogger)
-            // 是否使用SIMAUTH
+            {
+                builder.AddLogging(logger =>
+                {
+                    logger.ClearProviders();
+                    logger.AddProvider(new SimApiLoggerProvider());
+                });
+            }
+            // 是否使用 AUTH
             if (simApiOptions.EnableSimApiAuth)
             {
                 builder.AddScoped<SimApiAuth>();
@@ -43,7 +50,11 @@ namespace SimApi
                 {
                     foreach (var group in docOptions.ApiGroups)
                     {
-                        x.SwaggerDoc(group.Id, new OpenApiInfo {Title = group.Name, Description = group.Description});
+                        x.SwaggerDoc(group.Id, new OpenApiInfo
+                        {
+                            Title = group.Name,
+                            Description = group.Description
+                        });
                     }
 
                     x.EnableAnnotations();
@@ -61,9 +72,15 @@ namespace SimApi
                                         new OpenApiSecurityScheme
                                         {
                                             Reference = new OpenApiReference
-                                                {Type = ReferenceType.SecurityScheme, Id = "HeaderToken"}
+                                            {
+                                                Type = ReferenceType.SecurityScheme,
+                                                Id = "HeaderToken"
+                                            }
                                         },
-                                        new[] {"readAccess", "writeAccess"}
+                                        new[]
+                                        {
+                                            "readAccess", "writeAccess"
+                                        }
                                     }
                                 });
                                 haveSimApiAuth = true;
@@ -121,9 +138,15 @@ namespace SimApi
                                 new OpenApiSecurityScheme
                                 {
                                     Reference = new OpenApiReference
-                                        {Type = ReferenceType.SecurityScheme, Id = "oauth2"}
+                                    {
+                                        Type = ReferenceType.SecurityScheme,
+                                        Id = "oauth2"
+                                    }
                                 },
-                                new[] {"SimApiAuth"}
+                                new[]
+                                {
+                                    "SimApiAuth"
+                                }
                             }
                         });
                     }
@@ -131,7 +154,11 @@ namespace SimApi
                     if (haveSimApiAuth)
                     {
                         x.AddSecurityDefinition("HeaderToken",
-                            new OpenApiSecurityScheme {Name = "Token", In = ParameterLocation.Header});
+                            new OpenApiSecurityScheme
+                            {
+                                Name = "Token",
+                                In = ParameterLocation.Header
+                            });
                     }
                 });
             }
@@ -139,17 +166,17 @@ namespace SimApi
             // 使用Header转发，应对代理后获取真实ip
             if (simApiOptions.EnableForwardHeaders)
             {
-                builder.Configure<ForwardedHeadersOptions>(options =>
+                builder.Configure<ForwardedHeadersOptions>(fwOptions =>
                 {
-                    options.ForwardedHeaders = ForwardedHeaders.All;
+                    fwOptions.ForwardedHeaders = ForwardedHeaders.All;
-                    options.KnownNetworks.Clear();
+                    fwOptions.KnownNetworks.Clear();
-                    options.KnownProxies.Clear();
+                    fwOptions.KnownProxies.Clear();
                 });
             }
 
             if (simApiOptions.EnableLowerUrl)
             {
-                builder.AddRouting(options => options.LowercaseUrls = true);
+                builder.AddRouting(rOptions => rOptions.LowercaseUrls = true);
             }
 
             if (simApiOptions.EnableSimApiStorage)
@@ -169,13 +196,9 @@ namespace SimApi
         /// <returns></returns>
         public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
         {
-            var options = builder.ApplicationServices.GetService<SimApiOptions>();
+            var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>();
-            if (options.EnableLogger)
-            {
-                builder.ApplicationServices.GetService<ILoggerFactory>().AddProvider(new SimApiLoggerProvider());
-            }
 
-            var logger = builder.ApplicationServices.GetService<ILogger>();
+            var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
 
             if (options.EnableForwardHeaders)
             {