diff --git a/apihost/Tnb.API.Entry/Configurations/Cors.json b/apihost/Tnb.API.Entry/Configurations/Cors.json index 3984f7ba..0e26fc64 100644 --- a/apihost/Tnb.API.Entry/Configurations/Cors.json +++ b/apihost/Tnb.API.Entry/Configurations/Cors.json @@ -1,7 +1,7 @@ { "CorsAccessorSettings": { "PolicyName": "JNPFCorsAccessor", - "WithOrigins": [ "http://localhost:3000", "http://localhost:8080" ], + "WithOrigins": [ "http://localhost:9230", "http://localhost:8080" ], "WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ] } } \ No newline at end of file diff --git a/apihost/Tnb.API.Entry/Configurations/Logging.json b/apihost/Tnb.API.Entry/Configurations/Logging.json index 3cb6d9f0..5ea0b1fb 100644 --- a/apihost/Tnb.API.Entry/Configurations/Logging.json +++ b/apihost/Tnb.API.Entry/Configurations/Logging.json @@ -1,16 +1,17 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - }, - "File": { - "Enabled": true, // 启用文件日志 - "FileName": "logs/{0:yyyyMMdd}.log", // 日志文件 - "Append": true, // 追加覆盖 - // "MinimumLevel": "Information", // 日志级别 - "FileSizeLimitBytes": 10485760, // 10M=10*1024*1024 - "MaxRollingFiles": 30 // 只保留30个文件 - } + "Logging": { + "LogLevel": { + "Default": "Debug", + "Microsoft.AspNetCore": "Warning", + "Microsoft.Extensions.Http": "Warning" + }, + "File": { + "Enabled": true, // 启用文件日志 + "FileName": "logs/{0:yyyyMMdd}.log", // 日志文件 + "Append": true, // 追加覆盖 + // "MinimumLevel": "Information", // 日志级别 + "FileSizeLimitBytes": 10485760, // 10M=10*1024*1024 + "MaxRollingFiles": 30 // 只保留30个文件 } + } } \ No newline at end of file diff --git a/common/Tnb.Common.Core/Manager/User/UserManager.cs b/common/Tnb.Common.Core/Manager/User/UserManager.cs index b12faf7a..3f9c44d5 100644 --- a/common/Tnb.Common.Core/Manager/User/UserManager.cs +++ b/common/Tnb.Common.Core/Manager/User/UserManager.cs @@ -206,7 +206,7 @@ public class UserManager : IUserManager, IScoped UserAgent userAgent = new UserAgent(_httpContext); var data = new UserInfoModel(); var ipAddress = NetHelper.Ip; - var ipAddressName = await NetHelper.GetLocation(ipAddress); + //var ipAddressName = await NetHelper.GetLocation(ipAddress); var userDataScope = await GetUserDataScopeAsync(UserId); var sysConfigInfo = await _repository.AsSugarClient().Queryable().FirstAsync(s => s.Category.Equals("SysConfig") && s.Key.ToLower().Equals("tokentimeout")); data = await _repository.AsQueryable().Where(it => it.Id == UserId) @@ -252,8 +252,8 @@ public class UserManager : IUserManager, IScoped data.loginTime = DateTime.Now; data.prevLogin = (await _repository.AsSugarClient().Queryable().FirstAsync(x => x.Category.Equals("SysConfig") && x.Key.ToLower().Equals("lastlogintimeswitch"))).Value.ParseToInt(); data.loginIPAddress = ipAddress; - data.loginIPAddressName = ipAddressName; - data.prevLoginIPAddressName = await NetHelper.GetLocation(data.prevLoginIPAddress); + //data.loginIPAddressName = ipAddressName; + //data.prevLoginIPAddressName = await NetHelper.GetLocation(data.prevLoginIPAddress); data.loginPlatForm = userAgent.RawValue; data.subsidiary = await GetSubsidiaryAsync(data.organizeId, data.isAdministrator); data.subordinates = await this.GetSubordinatesAsync(UserId);