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

Compare commits

base: wyw:51064548fc454cbd7d735d5f37cacee040e96487
Branches Tags
wyw:master
..
compare: wyw:1839d30ff35873b149886f83cd101da183b3da27
Branches Tags
wyw:master

No commits in common. "51064548fc454cbd7d735d5f37cacee040e96487" and "1839d30ff35873b149886f83cd101da183b3da27" have entirely different histories.
51064548fc ... 1839d30ff3

2 changed files with 12 additions and 13 deletions
Show Stats 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
(System.Reflection.Assembly.GetEntryAssembly());
var fileInfo = new FileInfo("log4net.config");
if (!fileInfo.Exists)
fileInfo = new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
if(!fileInfo.Exists)
fileInfo=new FileInfo(Path.Combine(System.AppContext.BaseDirectory, "log4net.config"));
XmlConfigurator.Configure(repository, fileInfo);
ConfigurationManager.Register(configuration);
InitUtils.Init();
@ -69,9 +69,8 @@ namespace APT.FM.WebApi
services.AddCors(o => o.AddPolicy("AllowAllPolicy", builder =>
{
builder.AllowAnyOrigin()
.AllowAnyHeader() // 允许任何头
.AllowAnyMethod() // 允许任何方法
;
.AllowAnyMethod()
.AllowAnyHeader();
}));
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);
//userFilter.IgnoreOrgRule = true;
//userFilter.IsMultipleDb = true;//多库查询
userFilter.OrgId = orgId;
user.ORG_ID = orgId;
userFilter.SelectField = new string[] { "CODE", "Nav_ProdutionUnit.Nav_Enums.VALUE", "DEPARTMENT_ID" };
user = this.GetEntity<T_FM_USER>(expression, userFilter);
if (user == null)