wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

不自动获取用户具体地址

Browse Source
This commit is contained in:
潘飞
2023-03-16 17:28:01 +08:00
parent 658466063d
commit 754ff29209
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apihost/Tnb.API.Entry/Configurations/Cors.json
View File

@@ -1,7 +1,7 @@
{ {
"CorsAccessorSettings": { "CorsAccessorSettings": {
"PolicyName": "JNPFCorsAccessor", "PolicyName": "JNPFCorsAccessor",
"WithOrigins": [ "http://localhost:3000", "http://localhost:8080" ], "WithOrigins": [ "http://localhost:9230", "http://localhost:8080" ],
"WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ] "WithExposedHeaders": [ "access-token", "x-access-token", "Content-Disposition" ]
} }
} }

27
apihost/Tnb.API.Entry/Configurations/Logging.json
View File

@@ -1,16 +1,17 @@
{ {
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default": "Information", "Default": "Debug",
"Microsoft.AspNetCore": "Warning" "Microsoft.AspNetCore": "Warning",
}, "Microsoft.Extensions.Http": "Warning"
"File": { },
"Enabled": true, // 启用文件日志 "File": {
"FileName": "logs/{0:yyyyMMdd}.log", // 日志文件 "Enabled": true, // 启用文件日志
"Append": true, // 追加覆盖 "FileName": "logs/{0:yyyyMMdd}.log", // 日志文件
// "MinimumLevel": "Information", // 日志级别 "Append": true, // 追加覆盖
"FileSizeLimitBytes": 10485760, // 10M=10*1024*1024 // "MinimumLevel": "Information", // 日志级别
"MaxRollingFiles": 30 // 只保留30个文件 "FileSizeLimitBytes": 10485760, // 10M=10*1024*1024
} "MaxRollingFiles": 30 // 只保留30个文件
} }
}
} }

6
common/Tnb.Common.Core/Manager/User/UserManager.cs
View File

@@ -206,7 +206,7 @@ public class UserManager : IUserManager, IScoped
UserAgent userAgent = new UserAgent(_httpContext); UserAgent userAgent = new UserAgent(_httpContext);
var data = new UserInfoModel(); var data = new UserInfoModel();
var ipAddress = NetHelper.Ip; var ipAddress = NetHelper.Ip;
var ipAddressName = await NetHelper.GetLocation(ipAddress); //var ipAddressName = await NetHelper.GetLocation(ipAddress);
var userDataScope = await GetUserDataScopeAsync(UserId); var userDataScope = await GetUserDataScopeAsync(UserId);
var sysConfigInfo = await _repository.AsSugarClient().Queryable<SysConfigEntity>().FirstAsync(s => s.Category.Equals("SysConfig") && s.Key.ToLower().Equals("tokentimeout")); var sysConfigInfo = await _repository.AsSugarClient().Queryable<SysConfigEntity>().FirstAsync(s => s.Category.Equals("SysConfig") && s.Key.ToLower().Equals("tokentimeout"));
data = await _repository.AsQueryable().Where(it => it.Id == UserId) data = await _repository.AsQueryable().Where(it => it.Id == UserId)
@@ -252,8 +252,8 @@ public class UserManager : IUserManager, IScoped
data.loginTime = DateTime.Now; data.loginTime = DateTime.Now;
data.prevLogin = (await _repository.AsSugarClient().Queryable<SysConfigEntity>().FirstAsync(x => x.Category.Equals("SysConfig") && x.Key.ToLower().Equals("lastlogintimeswitch"))).Value.ParseToInt(); data.prevLogin = (await _repository.AsSugarClient().Queryable<SysConfigEntity>().FirstAsync(x => x.Category.Equals("SysConfig") && x.Key.ToLower().Equals("lastlogintimeswitch"))).Value.ParseToInt();
data.loginIPAddress = ipAddress; data.loginIPAddress = ipAddress;
data.loginIPAddressName = ipAddressName; //data.loginIPAddressName = ipAddressName;
data.prevLoginIPAddressName = await NetHelper.GetLocation(data.prevLoginIPAddress); //data.prevLoginIPAddressName = await NetHelper.GetLocation(data.prevLoginIPAddress);
data.loginPlatForm = userAgent.RawValue; data.loginPlatForm = userAgent.RawValue;
data.subsidiary = await GetSubsidiaryAsync(data.organizeId, data.isAdministrator); data.subsidiary = await GetSubsidiaryAsync(data.organizeId, data.isAdministrator);
data.subordinates = await this.GetSubordinatesAsync(UserId); data.subordinates = await this.GetSubordinatesAsync(UserId);