移除 OAMethodLib下的LoginLib

更改LoginController的Login方法

OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -12,12 +12,12 @@ namespace OASystem.API.Controllers
     /// </summary>
     public class AuthController : ControllerBase
     {
+        private readonly IMapper _mapper;
         private readonly IConfiguration _config;
         private readonly LoginRepository _loginRep;
-        private readonly IMapper _mapper;
-        private IDatabase _redis;
-        private RedisHelper _redisHelper;
-        public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper, RedisHelper client)
+        //private IDatabase _redis;
+        //private RedisHelper _redisHelper;
+        public AuthController(IConfiguration config, LoginRepository loginRep, IMapper mapper)
         {
             _config = config;
             _loginRep = loginRep;
@@ -37,7 +37,7 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> LoginAsync(LoginDto dto)
         {
             #region 校验用户信息，假设此处我们已经校验成功
-            var userData = OAMethodLib.LoginLib.Api_Login(_loginRep,dto);
+            var userData = _loginRep.Login(_loginRep,dto);
             if (userData.Result.Code != 0)
             {
                 if (userData.Result.Code != 0) { return Ok(JsonView(false, userData.Result.Message)); }
@@ -66,11 +66,11 @@ namespace OASystem.API.Controllers
 
 
             // 往Redis里面存入数据
-            _redis.StringSet(authorId, view.Token);
+            //_redis.StringSet(authorId, view.Token);
 
 
             // 从Redis里面取数据
-            string name = _redis.StringGet(authorId);
+            //string name = _redis.StringGet(authorId);
 
             return Ok(JsonView(view));
         }

OASystem/OASystem.Api/OAMethodLib/LoginLib.cs

@@ -1,30 +0,0 @@
-using AutoMapper;
-using OASystem.Domain;
-using OASystem.Domain.Dtos;
-using OASystem.Infrastructure.Repositories.Login;
-
-namespace OASystem.API.OAMethodLib
-{
-    public static class LoginLib
-    {
-        public static async Task<Result> Api_Login(LoginRepository _loginRep,LoginDto loginDto)
-        {
-            Result result = new Result();
-            string SQLWhere = string.Format("Where Number='{0}' And Password='{1}'", loginDto.Number,loginDto.Password);
-            string sql = string.Format("Select * From S_Users With(NoLock) {0}", SQLWhere);
-            var _entity = await _loginRep.GetSingleInfoBySqlWithNolockAsync(sql);
-            if (_entity == null) 
-            {
-                result.Code = -2;
-                result.Message = "暂无该账号信息!";
-
-                return result;
-            }
-            result.Code = 0;
-            result.Message = "成功!";
-            result.Data = _entity;
-            return result;
-
-        }
-    }
-}

OASystem/OASystem.Api/Program.cs

@@ -24,7 +24,7 @@ string _connectionString = section.GetSection("Connection").Value;
 string _instanceName = section.GetSection("InstanceName").Value;
 //ĬÈÏÊý¾Ý¿â 
 int _defaultDB = int.Parse(section.GetSection("DefaultDB").Value ?? "0");
-builder.Services.AddSingleton(new RedisHelper1(_connectionString+",password=123456", _instanceName, _defaultDB));
+builder.Services.AddSingleton(new RedisHelper(_connectionString+",password=123456", _instanceName, _defaultDB));
 
 #endregion
 

OASystem/OASystem.Infrastructure/Repositories/Login/LoginRepository.cs

@@ -1,4 +1,6 @@
 
+using OASystem.Domain;
+using OASystem.Domain.Dtos;
 using OASystem.Domain.Entities.System;
 
 namespace OASystem.Infrastructure.Repositories.Login
@@ -9,8 +11,31 @@ namespace OASystem.Infrastructure.Repositories.Login
         {
         }
 
+        /// <summary>
+        /// 用户登录
+        /// 返回Token
+        /// </summary>
+        /// <param name="_loginRep"></param>
+        /// <param name="loginDto"></param>
+        /// <returns></returns>
+        public async Task<Result> Login(LoginRepository _loginRep, LoginDto loginDto)
+        {
+            Result result = new Result();
+            string SQLWhere = string.Format("Where Number='{0}' And Password='{1}'", loginDto.Number, loginDto.Password);
+            string sql = string.Format("Select * From Sys_Users With(NoLock) {0}", SQLWhere);
+            var _entity = await _loginRep.GetSingleInfoBySqlWithNolockAsync(sql);
+            if (_entity == null)
+            {
+                result.Code = -2;
+                result.Message = "暂无该账号信息!";
 
+                return result;
+            }
+            result.Code = 0;
+            result.Message = "成功!";
+            result.Data = _entity;
+            return result;
 
-
+        }
     }
 }

OASystem/OASystem.Infrastructure/Tools/RedisHelper.cs

@@ -11,12 +11,8 @@ using System.Text;
 
 namespace OASystem.Infrastructure.Tools
 {
-    public class RedisHelper { 
-    
-    }
-
 
-    public class RedisHelper1 : IDisposable
+    public class RedisHelper : IDisposable
     {
         //连接字符串
         private string _connectionString;
@@ -26,7 +22,7 @@ namespace OASystem.Infrastructure.Tools
         private int _defaultDB;
 
         private ConcurrentDictionary<string, ConnectionMultiplexer> _connections;
-        public RedisHelper1(string connectionString, string instanceName, int defaultDB = 0)
+        public RedisHelper(string connectionString, string instanceName, int defaultDB = 0)
         {
             _connectionString = connectionString;
             _instanceName = instanceName;