11

gx_api/GxPress/Api/GxPress.Api/AppControllers/UserController.cs

@@ -43,9 +43,10 @@ namespace GxPress.Api.AppControllers
         private readonly IUserService _userService;
         private readonly IFileLibraryRepository fileLibraryRepository;
         private readonly IDistributedCache _cache;
+        private readonly IUserLoginRepository userLoginRepository;
         public UserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<UserController> logger, IDepartmentRepository departmentRepository, ILoginContext loginContext,
-            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache)
+            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository)
         {
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
@@ -55,6 +56,7 @@ namespace GxPress.Api.AppControllers
             _loginContext = loginContext;
             this.fileLibraryRepository = fileLibraryRepository;
             _cache = cache;
+            this.userLoginRepository = userLoginRepository;
         }
         /// <summary>
         /// 登录
@@ -66,6 +68,8 @@ namespace GxPress.Api.AppControllers
         public async Task<UserSignInResult> SignIn(UserSignInRequest request)
         {
             var result = await _userRepository.SignInAsync(request);
+            //记录登录
+            await userLoginRepository.InsertAsync(new UserLogin { UserId = result.UserId });
             var claims = new[]
             {
                 new Claim(ClaimTypes.NameIdentifier, result.UserId.ToString()),
@@ -118,7 +122,7 @@ namespace GxPress.Api.AppControllers
         /// <returns></returns>
         [HttpGet("sendSmsCode")]
         [AllowAnonymous]
-        public async Task<bool> SendSmsCode([FromQuery] [Required] [Mobile] string phone)
+        public async Task<bool> SendSmsCode([FromQuery][Required][Mobile] string phone)
         {
             var user = await _userRepository.GetByPhoneAsync(phone);
             //用户不存在
@@ -149,7 +153,7 @@ namespace GxPress.Api.AppControllers
         /// <param name="phone"></param>
         /// <returns></returns>
         [HttpGet("send-sms-code")]
-        public async Task<bool> SendSmsCodeReplace([FromQuery] [Required] [Mobile] string phone)
+        public async Task<bool> SendSmsCodeReplace([FromQuery][Required][Mobile] string phone)
         {
             var user = await _userRepository.GetByPhoneAsync(phone);
             if (user != null)

gx_api/GxPress/Api/GxPress.Api/ExceptionMiddleware.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using GxPress.Common.Exceptions;
+using GxPress.Repository.Interface;
+using GxPress.Service.Interface;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+
+
+namespace GxPress.Api
+{
+    /// <summary>
+    /// 自定义异常中间件
+    /// </summary>
+    public class ExceptionMiddleware
+    {
+        private readonly RequestDelegate _next;
+        private readonly ILogger<ExceptionMiddleware> _logger;
+        private readonly IHttpContextAccessor _contextAccessor;
+        private readonly IApiLogService _apiLogService;
+        public ExceptionMiddleware(RequestDelegate next, ILogger<ExceptionMiddleware> logger, IHttpContextAccessor contextAccessor, IApiLogService _apiLogService)
+        {
+            _next = next;
+            this._apiLogService = _apiLogService;
+            _logger = logger;
+            _contextAccessor = contextAccessor;
+        }
+
+        public async Task Invoke(HttpContext context)
+        {
+            try
+            {
+                //
+                var watch = new Stopwatch();
+                watch.Start();
+                await _next.Invoke(context);
+                if (context.User != null)
+                {
+                    var ty = _contextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.Role);
+                    if (!ty.Value.Equals("Admin"))
+                    {
+                        _apiLogService.DataSave(context, watch.ElapsedMilliseconds, 2);
+                    }
+
+                }
+            }
+            catch (BusinessException be)
+            {
+                _logger.LogDebug(be.Message);
+                await HandleBusinessException(context, be);
+            }
+            catch (System.Exception ex)
+            {
+                _logger.LogError(ex, ex.Message);
+                await HandleSystemException(context, ex);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 处理业务异常
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="be"></param>
+        /// <returns></returns>
+        private Task HandleBusinessException(HttpContext context, BusinessException be)
+        {
+            context.Response.StatusCode = (int)HttpStatusCode.BadRequest;
+            context.Response.ContentType = "application/json;charset=utf-8";
+            return context.Response.WriteAsync(JsonConvert.SerializeObject(new
+            {
+                be.Message,
+                be.StackTrace
+            }));
+        }
+
+        /// <summary>
+        /// 处理系统异常
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="ex"></param>
+        /// <returns></returns>
+        private Task HandleSystemException(HttpContext context, Exception ex)
+        {
+            context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+            context.Response.ContentType = "application/json;charset=utf-8";
+            return context.Response.WriteAsync(JsonConvert.SerializeObject(ex));
+        }
+
+    }
+}

gx_api/GxPress/Api/GxPress.Api/GxPress.Api.csproj

@@ -33,6 +33,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="5.0.0-rc4" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.14" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Infrastructure\GxPress.Auth\GxPress.Auth.csproj" />

gx_api/GxPress/Api/GxPress.Api/GxPress.Api.sln

@@ -0,0 +1,17 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GxPress.Api", "GxPress.Api.csproj", "{33F6D523-B939-4DA5-8121-8291FA3E386B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{33F6D523-B939-4DA5-8121-8291FA3E386B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33F6D523-B939-4DA5-8121-8291FA3E386B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33F6D523-B939-4DA5-8121-8291FA3E386B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33F6D523-B939-4DA5-8121-8291FA3E386B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

gx_api/GxPress/Api/GxPress.Api/Startup.cs

@@ -3,6 +3,10 @@ using GxPress.Api.ServiceExtensions;
 using GxPress.Common.AppOptions;
 using GxPress.Common.Middleware;
 using GxPress.Common.Tools;
+using GxPress.Repository.Implement;
+using GxPress.Repository.Interface;
+using GxPress.Service.Implement;
+using GxPress.Service.Interface;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -16,12 +20,14 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Quartz;
 using Quartz.Impl;
+using SqlSugar;
 
 namespace GxPress.Api
 {
     public class Startup
     {
         public IConfiguration Configuration { get; }
+
         public Startup(IConfiguration configuration)
         {
             Configuration = configuration;
@@ -31,8 +37,18 @@ namespace GxPress.Api
         // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddSingleton(new SqlSugarClient(new ConnectionConfig
+            {
+                ConnectionString = "server=47.95.221.96;uid=root;pwd=siteservercms88;database=ccpph_tede;MultipleActiveResultSets=true",//必填, 数据库连接字符串
+                DbType = DbType.SqlServer,         //必填, 数据库类型
+                IsAutoCloseConnection = true,       //默认false, 时候知道关闭数据库连接, 设置为true无需使用using或者Close操作
+                InitKeyType = InitKeyType.SystemTable    //默认SystemTable, 字段信息读取, 如：该属性是不是主键，是不是标识列等等信息
+            }));
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             services.AddSingleton<ISchedulerFactory, StdSchedulerFactory>();
+            // services.AddSingleton<IUserService, UserService>();
+            services.AddSingleton<IApiLogService, ApiLogService>();
+
             services.AddControllers().AddNewtonsoftJson(options =>
             {
                 options.SerializerSettings.ContractResolver = new DefaultContractResolver();

gx_api/GxPress/Infrastructure/GxPress.Common/Middleware/ExceptionMiddleware.cs

@@ -1,32 +1,47 @@
 using System;
 using System.Net;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using GxPress.Common.Exceptions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
+
 namespace GxPress.Common.Middleware
 {
     /// <summary>
     /// 自定义异常中间件
     /// </summary>
-    public class ExceptionMiddleware
+    public class ExceptionMiddlewareDto
     {
         private readonly RequestDelegate _next;
-        private readonly ILogger<ExceptionMiddleware> _logger;
+        private readonly ILogger<ExceptionMiddlewareDto> _logger;
+        private readonly IHttpContextAccessor _contextAccessor;
 
-        public ExceptionMiddleware(RequestDelegate next, ILogger<ExceptionMiddleware> logger)
+        //private readonly IUserService userService;
+        public ExceptionMiddlewareDto(RequestDelegate next, ILogger<ExceptionMiddlewareDto> logger, IHttpContextAccessor contextAccessor)
         {
             _next = next;
             _logger = logger;
+            _contextAccessor = contextAccessor;
         }
 
         public async Task Invoke(HttpContext context)
         {
             try
             {
+                //
+
                 await _next.Invoke(context);
+                if (context.User != null)
+                {
+                    var ty = _contextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.Role);
+                    if (!ty.Value.Equals("Admin"))
+                    {
+                          
+                    }
+                }
             }
             catch (BusinessException be)
             {

gx_api/GxPress/Model/GxPress.Entity/Thesaurus.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Datory;
 using Datory.Annotations;
 
 namespace GxPress.Entity

gx_api/GxPress/Model/GxPress.Entity/User.cs

@@ -220,5 +220,10 @@ namespace GxPress.Entity
         /// <value></value>
         [DataColumn]
         public bool IsFreeze { get; set; }
+        /// <summary>
+        /// 登录时间
+        /// </summary>
+        /// <value></value>
+        public DateTime LoginTime { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/UserLogin.cs

@@ -0,0 +1,98 @@
+using System;
+using Datory.Annotations;
+
+namespace GxPress.Entity
+{
+    /// <summary>
+    /// 用户登录
+    /// </summary>
+    [DataTable("tede_user_login")]
+    public class UserLogin : Datory.Entity
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int UserId { get; set; }
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:False
+        /// </summary>        
+        [DataColumn]
+        public int ALgID { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>        
+        [DataColumn]
+        public string ClientIP { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [DataColumn]
+        public long ResponseTime { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [DataColumn]
+        public string AccessToken { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [DataColumn]
+        public DateTime AccessTime { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [DataColumn]
+        public string AccessApiUrl { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [DataColumn]
+        public string AccessAction { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [DataColumn]
+        public string QueryString { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        [DataColumn]
+        public string Body { get; set; }
+
+        /// <summary>
+        /// Desc:
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [DataColumn]
+        public int HttpStatus { get; set; }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/UserLoginRepository.cs

@@ -0,0 +1,40 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Datory;
+using GxPress.Common.AppOptions;
+using GxPress.Common.Tools;
+using GxPress.Entity;
+using GxPress.Repository.Interface;
+using Microsoft.Extensions.Options;
+
+namespace GxPress.Repository.Implement
+{
+    public class UserLoginRepository : IUserLoginRepository
+    {
+        private readonly Repository<UserLogin> _repository;
+        public UserLoginRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor)
+        {
+            var databaseType =
+            StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
+            //_connectionString = dbOptionsAccessor.CurrentValue.ConnectionString;
+            var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
+            _repository = new Repository<UserLogin>(database);
+        }
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public async Task<int> InsertAsync(UserLogin model)
+        {
+            return await _repository.InsertAsync(model);
+        }
+        public async Task<UserLogin> GetUserAsync(int userId)
+        {
+            return await _repository.GetAsync(Q.Where(nameof(UserLogin.UserId), userId).OrderByDesc(nameof(UserLogin.CreatedDate)));
+        }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -312,6 +312,9 @@ namespace GxPress.Repository.Implement
                 result.UserId = user.Id;
                 result.DepartmentId = user.DepartmentId;
                 result.User = _mapper.Map<UserResult>(user);
+                //修改登录时间
+                user.LoginTime = DateTime.Now;
+                await _repository.UpdateAsync(user);
                 return result;
             }
             catch (System.Exception)

gx_api/GxPress/Repository/GxPress.Repository.Interface/IUserLoginRepository.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+using Datory;
+using GxPress.Entity;
+
+namespace GxPress.Repository.Interface
+{
+    public interface IUserLoginRepository : IRepository
+    {
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<int> InsertAsync(UserLogin model);
+        Task<UserLogin> GetUserAsync(int userId);
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/ApiLogService.cs

@@ -0,0 +1,54 @@
+using System;
+using System.IO;
+using GxPress.Entity;
+using GxPress.Service.Interface;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using SqlSugar;
+
+namespace GxPress.Service.Implement
+{
+    public class ApiLogService : IApiLogService
+    {
+        private readonly IConfiguration _configuration;
+        private readonly SqlSugarClient _dbContext;
+
+        public ApiLogService(IConfiguration configuration, SqlSugarClient dbContext)
+        {
+            _configuration = configuration;
+            _dbContext = dbContext;
+        }
+
+        public void DataSave(HttpContext context, long responseTime,int userId)
+        {
+            var isLog = _configuration.GetValue<bool>("ApiLog:IsEnable");
+            if (isLog)
+            {
+                var requestMethod = context.Request.Method;
+                var requestURL = $"{context.Request.Scheme}://{context.Request.Host}{context.Request.Path}";
+                //var accessToken = context.GetTokenAsync("access_token").Result;//添加身份验证的项目可以使用此方法获取到access_toekn
+                var accessToken = string.Empty;
+                var requestBody = string.Empty;
+                if (requestMethod == "POST")
+                {
+                    context.Request.Body.Seek(0, SeekOrigin.Begin);
+                    var _reader = new StreamReader(context.Request.Body);
+                    requestBody = _reader.ReadToEnd();
+                }
+                _dbContext.Insertable(new UserLogin
+                {
+                    AccessToken = accessToken,
+                    AccessTime = DateTime.Now,
+                    AccessAction = requestMethod,
+                    AccessApiUrl = requestURL,
+                    QueryString = context.Request.QueryString.ToString(),
+                    Body = requestBody,
+                    HttpStatus = context.Response.StatusCode,
+                    ClientIP = context.Connection.RemoteIpAddress.ToString(),
+                    ResponseTime = responseTime,
+                    UserId=userId
+                }).ExecuteCommand();
+            }
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/GxPress.Service.Implement.csproj

@@ -12,6 +12,7 @@
     <PackageReference Include="EPPlus" Version="4.5.3.2" />
     <PackageReference Include="Spire.Doc" Version="8.2.9" />
     <PackageReference Include="Aspose.Words" Version="20.2.0" />
+    <PackageReference Include="sqlSugarCore" Version="5.0.0.14" />
   </ItemGroup>
 
   <ItemGroup>

gx_api/GxPress/Service/GxPress.Service.Interface/IApiLogService.cs

@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Http;
+
+namespace GxPress.Service.Interface
+{
+    public interface IApiLogService
+    {
+       void  DataSave(HttpContext context, long responseTime,int userId);
+    }
+}