Update main.yml

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.101'
+        dotnet-version: '5.0.0'
     - name: Build
       run: dotnet build
   

Attributes/YYAuthAttribute.cs

@@ -41,7 +41,7 @@ namespace YYApi.Attributes
                 throw new YYApiException(401);
             }
             //检测用户类型
-            if (!Types.Contains(loginInfo.Type))
+            if (Types.Intersect(loginInfo.Type).Count() == 0)
             {
                 throw new YYApiException(403);
             }

Communications/YYLoginItem.cs

@@ -9,6 +9,6 @@ namespace YYApi.Communications
         //登录用户的ID
         public int Id { get; set; }
         //登录用户来源
-        public string Type { get; set; }
+        public string[] Type { get; set; }
     }
 }

Extensions.cs

@@ -112,7 +112,11 @@ namespace YYApi
         /// <returns></returns>
         public static IApplicationBuilder UseYYUpload(this IApplicationBuilder builder)
         {
-            return builder.UseStaticFiles();
+            return builder.UseStaticFiles(new StaticFileOptions
+            {
+                DefaultContentType = "application/x-msdownload",
+                ServeUnknownFileTypes = true
+            });
         }
 
         /// <summary>

Helpers/YYAuth.cs

@@ -23,9 +23,23 @@ namespace YYApi.Helpers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        public string Set(int id, string type = "user")
+        public string Login(int id, string type = "user", string token = null)
         {
-            var uuid = Guid.NewGuid().ToString();
+            return Login(id, new[] { type }, token);
+        }
+
+        /// <summary>
+        /// 产生一个Token并记录用户ID角色[多角色]
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public string Login(int id, string[] type, string uuid = null)
+        {
+            if (uuid == null)
+            {
+                uuid = Guid.NewGuid().ToString();
+            }
             var loginItem = new YYLoginItem
             {
                 Id = id,
@@ -35,5 +49,14 @@ namespace YYApi.Helpers
             return uuid;
         }
 
+        /// <summary>
+        /// 退出登陆
+        /// </summary>
+        /// <param name="uuid">登陆标识</param>
+        public void Logout(string uuid)
+        {
+            Cache.Remove(uuid);
+        }
+
     }
 }

Helpers/YYUpload.cs

@@ -33,6 +33,12 @@ namespace YYApi.Helpers
             Env = env;
         }
 
+        public class YYUploadInfo
+        {
+            public string Path { get; set; }
+            public int Size { get; set; }
+        }
+
         /// <summary>
         /// 保存base64文件,如果有标头按照标头自动识别
         /// </summary>
@@ -41,7 +47,7 @@ namespace YYApi.Helpers
         /// <param name="path">存放路径</param>
         /// <param name="fileName">文件名</param>
         /// <returns></returns>
-        public string SaveFile(string base64, string ext = null, string path = null, string fileName = null)
+        public YYUploadInfo SaveFile(string base64, string ext = null, string path = null, string fileName = null)
         {
             byte[] bt;
             var filePath = FilePath + path;
@@ -68,15 +74,30 @@ namespace YYApi.Helpers
             {
                 bt = Convert.FromBase64String(base64);
             }
+            var fn = fileName + (string.IsNullOrEmpty(ext) ? string.Empty : $".{ext}");
+            return WriteFile(filePath, fn, bt);
+        }
 
+        /// <summary>
+        /// 把数据写入文件
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <param name="fileName"></param>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public YYUploadInfo WriteFile(string filePath, string fileName, byte[] data)
+        {
             var realPath = Directory.GetCurrentDirectory() + "/wwwroot" + filePath;
             if (!Directory.Exists(realPath))
             {
                 Directory.CreateDirectory(realPath);
             }
-            var fn = fileName + (string.IsNullOrEmpty(ext) ? string.Empty : $".{ext}");
-            File.WriteAllBytes(realPath + fn, bt);
-            return filePath + fn;
+            File.WriteAllBytes(realPath + fileName, data);
+            return new YYUploadInfo
+            {
+                Path = filePath + fileName,
+                Size = data.Length
+            };
         }
     }
 }

README.md

@@ -61,4 +61,8 @@ app.UseYYAuth();
 ```C#
 #Startup.cs
 app.UseYYException();
-```
+```
+
+
+### TODO:
+1. 增加HANGFIRE 支持redis和sqlite 存储, 支持 基于其他系统的TOKEN认证和独立账号密码认证

YYApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Library</OutputType>
     <PackOnBuild>true</PackOnBuild>
     <Version>0.2.3</Version>
@@ -23,12 +23,12 @@
     <Folder Include="Exceptions\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0" />
-    <PackageReference Include="HangFire.Core" Version="1.7.9" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.9" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.5.1" />
+    <PackageReference Include="HangFire.Core" Version="1.7.11" />
+    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.11" />
     <PackageReference Include="Hangfire.Console" Version="1.4.2" />
-    <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.1" />
+    <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.4" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>