remove hangfire

Controllers/YYBaseController.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System.Linq;
 using YYApi.Exceptions;
+using YYApi.Attributes;
 
 namespace YYApi.Controllers
 {
@@ -77,22 +78,14 @@ namespace YYApi.Controllers
         }
 
         /// <summary>
-        /// 错误回馈页面
+        /// 上传文件
         /// </summary>
-        /// <param name="code">错误代码</param>
         /// <returns></returns>
-        [HttpGet("exception/{code:int}")]
-        [ApiExplorerSettings(IgnoreApi = true)]
-        public YYBaseResponse ExceptionHandler(int code)
-        {
-            var response = new YYBaseResponse();
-            response.SetCode(code);
-            return response;
-        }
-
         protected YYBaseResponse<string> UploadFile()
         {
             return new YYBaseResponse<string>();
         }
+
+        
     }
 }

Controllers/YYCommonController.cs

@@ -0,0 +1,60 @@
+using System;
+using Microsoft.AspNetCore.Mvc;
+using YYApi.Attributes;
+using YYApi.Communications;
+using YYApi.Helpers;
+
+namespace YYApi.Controllers
+{
+    public class YYCommonController : YYBaseController
+    {
+        private YYAuth Auth { get; }
+
+        public YYCommonController(YYAuth auth)
+        {
+            Auth = auth;
+        }
+
+        /// <summary>
+        /// 错误回馈页面
+        /// </summary>
+        /// <param name="code">错误代码</param>
+        /// <returns></returns>
+        [HttpGet("exception/{code:int}")]
+        [ApiExplorerSettings(IgnoreApi = true)]
+        public YYBaseResponse ExceptionHandler(int code)
+        {
+            var response = new YYBaseResponse();
+            response.SetCode(code);
+            return response;
+        }
+
+        /// <summary>
+        /// 检测用户登陆的控制器
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("/auth/check"), YYDoc("认证", "检测登陆")]
+        public YYBaseResponse<int> CheckLogin()
+        {
+            ErrorWhenNull(LoginInfo, 401);
+            return new YYBaseResponse<int> { Data = LoginInfo.Id };
+        }
+
+        /// <summary>
+        /// 退出登陆
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("/auth/logout"), YYDoc("认证", "退出登陆")]
+        public YYBaseResponse Logout()
+        {
+            string token = null;
+
+            if (Request.Headers.ContainsKey("Token"))
+            {
+                token = Request.Headers["Token"];
+            }
+            Auth.Logout(token);
+            return new YYBaseResponse();
+        }
+    }
+}

Helpers/YYAuth.cs

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

JobService/YYHFDashboardAuth.cs

@@ -1,124 +0,0 @@
-using System;
-using Hangfire.Dashboard;
-using Microsoft.Extensions.Configuration;
-using Microsoft.AspNetCore.Http;
-using StackExchange.Redis;
-using System.Collections.Generic;
-using System.Text;
-using System.Security.Cryptography;
-
-namespace YYApi.JobService
-{
-    /// <summary>
-    /// Redis缓存Key定义
-    /// </summary>
-    public struct CacheKey
-    {
-        public const string HangfireDashboardAuthPrefix = "{hangfire}:dashboard:auth:";
-    }
-
-    /// <summary>
-    /// HangFire Dashboard Digest认证.
-    /// </summary>
-    public class YYHFDashboardAuth : IDashboardAuthorizationFilter
-    {
-        private IConfiguration _config { get; }
-        private IDatabase _redis { get; }
-        public YYHFDashboardAuth(IConfiguration config, IDatabase redis)
-        {
-            _redis = redis;
-            _config = config;
-        }
-
-        public bool Authorize(DashboardContext context)
-        {
-            var http = context.GetHttpContext();
-            if (http.Request.Headers.ContainsKey("Authorization"))
-            {
-                var authObj = _processAuthHeader(http.Request.Headers["Authorization"].ToString());
-                if (http.Request.QueryString.ToString().Contains("logout"))
-                {
-                    _redis.KeyDelete(CacheKey.HangfireDashboardAuthPrefix + authObj["opaque"]);
-                    _redirect(http);
-                    return true;
-                }
-                if (authObj["username"] == _config["Hangfire:User"])
-                {
-                    var a1 = _md5(string.Format("{0}:Need Login:{1}", authObj["username"], _config["Hangfire:Pass"]));
-                    var a2 = _md5(string.Format("{0}:{1}", http.Request.Method, authObj["uri"]));
-                    var nonce = _redis.StringGet(CacheKey.HangfireDashboardAuthPrefix + authObj["opaque"]);
-                    var validCode = _md5(string.Format("{0}:{1}:{2}:{3}:{4}:{5}", a1, nonce, authObj["nc"], authObj["cnonce"], authObj["qop"], a2));
-                    if (authObj["response"] == validCode)
-                    {
-                        _redis.StringSet(CacheKey.HangfireDashboardAuthPrefix + authObj["opaque"], nonce, new TimeSpan(0, 5, 0));
-                        return true;
-                    }
-                }
-            }
-            _challenge(http);
-            return false;
-        }
-
-        /// <summary>
-        /// 生成401认证header
-        /// </summary>
-        /// <returns>The challenge.</returns>
-        private void _challenge(HttpContext http)
-        {
-            var response = http.Response;
-            var guid = Guid.NewGuid().ToString();
-            var opaque = _md5(guid);
-            _redis.StringSet(CacheKey.HangfireDashboardAuthPrefix + opaque, guid, new TimeSpan(0, 0, 30));
-            response.StatusCode = 401;
-            response.Headers.Add("WWW-Authenticate", string.Format("Digest realm=\"Need Login\",qop=\"auth\",nonce=\"{0}\",opaque=\"{1}\"", guid, opaque));
-        }
-
-        /// <summary>
-        /// 跳转到页面不附加参数
-        /// </summary>
-        /// <param name="http">Http.</param>
-        private void _redirect(HttpContext http)
-        {
-            var response = http.Response;
-            response.StatusCode = 302;
-            response.Headers.Add("Location", (http.Request.PathBase + http.Request.Path).ToString());
-        }
-
-        /// <summary>
-        /// 处理DigestHeader中的参数为字典
-        /// </summary>
-        /// <returns>The auth header.</returns>
-        /// <param name="authData">Auth data.</param>
-        private Dictionary<string, string> _processAuthHeader(string authData)
-        {
-            var authDataArray = authData.Replace("Digest ", string.Empty).Replace("\"", string.Empty).Split(", ");
-            var authDic = new Dictionary<string, string>();
-            foreach (var item in authDataArray)
-            {
-                var tmp = item.Split("=", 2);
-                authDic.Add(tmp[0], tmp[1]);
-            }
-            return authDic;
-        }
-
-        /// <summary>
-        /// 计算字符串32位MD5
-        /// </summary>
-        /// <returns>The md5.</returns>
-        /// <param name="source">Source.</param>
-        private string _md5(string source)
-        {
-            byte[] sor = Encoding.UTF8.GetBytes(source);
-            var md5 = MD5.Create();
-            byte[] result = md5.ComputeHash(sor);
-            StringBuilder strbul = new StringBuilder(40);
-            for (int i = 0; i < result.Length; i++)
-            {
-                strbul.Append(result[i].ToString("x2"));//加密结果"x2"结果为32位,"x3"结果为48位,"x4"结果为64位
-
-            }
-            return strbul.ToString();
-
-        }
-    }
-}

JobService/YYJobDashboardConfig.cs

@@ -1,10 +0,0 @@
-using System;
-namespace YYApi.JobService
-{
-    public class JobDashboardConfig
-    {
-        public string Path { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-    }
-}

JobService/YYJobStorage.cs

@@ -1,10 +0,0 @@
-using System;
-namespace YYApi.JobService
-{
-    public class JobStorage
-    {
-        public JobStorage()
-        {
-        }
-    }
-}

README.md

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

YYApi.csproj

@@ -17,18 +17,13 @@
     <Folder Include="Helpers\" />
     <Folder Include="Communications\" />
     <Folder Include="Controllers\" />
-    <Folder Include="JobService\" />
     <Folder Include="Middlewares\" />
     <Folder Include="Attributes\" />
     <Folder Include="Exceptions\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.1.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.1.0" />
-    <PackageReference Include="HangFire.Core" Version="1.7.9" />
-    <PackageReference Include="Hangfire.AspNetCore" Version="1.7.9" />
-    <PackageReference Include="Hangfire.Console" Version="1.4.2" />
-    <PackageReference Include="Hangfire.Redis.StackExchange" Version="1.8.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.5.1" />
   </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>