wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2025-10-16 15:34:24 +08:00
commit d8e380f744
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
APT.MicroApi/APT.FM.WebApi/Startup.cs
View File

@ -43,8 +43,8 @@ namespace APT.FM.WebApi
var repository = LogManager.GetRepository var repository = LogManager.GetRepository
(System.Reflection.Assembly.GetEntryAssembly()); (System.Reflection.Assembly.GetEntryAssembly());
var fileInfo = new FileInfo("log4net.config"); var fileInfo = new FileInfo("log4net.config");
if(!fileInfo.Exists) if (!fileInfo.Exists)
fileInfo=new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config")); fileInfo = new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
XmlConfigurator.Configure(repository, fileInfo); XmlConfigurator.Configure(repository, fileInfo);
ConfigurationManager.Register(configuration); ConfigurationManager.Register(configuration);
InitUtils.Init(); InitUtils.Init();
@ -69,8 +69,9 @@ namespace APT.FM.WebApi
services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder => services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder =>
{ {
builder.AllowAnyOrigin() builder.AllowAnyOrigin()
.AllowAnyMethod() .AllowAnyHeader() // 允许任何头
.AllowAnyHeader(); .AllowAnyMethod() // 允许任何方法
;
})); }));
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>(); services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();

2
APT.MicroApi/APT.PF.WebApi/Controllers/Api/LoginController.cs
View File

@ -325,7 +325,7 @@ namespace APT.PF.WebApiControllers.Api.PF
var userFilter = new BaseFilter(orgId); var userFilter = new BaseFilter(orgId);
//userFilter.IgnoreOrgRule = true; //userFilter.IgnoreOrgRule = true;
//userFilter.IsMultipleDb = true;//多库查询 //userFilter.IsMultipleDb = true;//多库查询
user.ORG_ID = orgId; userFilter.OrgId = orgId;
userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" }; userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" };
user = this.GetEntity<T_FM_USER>(expression, userFilter); user = this.GetEntity<T_FM_USER>(expression, userFilter);
if (user == null) if (user == null)